Changeset 6548

Timestamp:

2016-05-17T16:37:02+02:00 (8 years ago)

Author:

frrh

Message:

Merge fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_cplseq
from refvision 5572 to 5646 inclusive i.e. all changes post NEMO 3.6 trunk
upgrade to source branch.

Location:

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC

Files:

• SBC/sbcice_cice.F90 (modified) (2 diffs)
• SBC/sbcmod.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -286 +286 @@
       ! In coupled mode get extra fields from CICE for passing back to atmosphere
  
-      IF ( ksbc == jp_cpl ) CALL cice_sbc_hadgam(nit000)
+      IF ( ksbc == jp_purecpl ) CALL cice_sbc_hadgam(nit000)
       ! 
       IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init')
@@ -712 +712 @@
       IF( nn_timing == 1 )  CALL timing_start('cice_sbc_hadgam')
       !
-      IF( kt == nit000 )  THEN
-         IF(lwp) WRITE(numout,*)'cice_sbc_hadgam'
-         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
-      ENDIF
-
       !                                         ! =========================== !
       !                                         !   Prepare Coupling fields   !

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -265 +265 @@
       ENDIF
       !
-      IF( lk_oasis )   CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step
-      !                                                     !                                            (2) the use of nn_fsbc
+      IF( lk_oasis ) THEN
+         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )         
+         CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step
+                                      !                                            (2) the use of nn_fsbc
+      ENDIF
 
 !     nn_fsbc initialization if OPA-SAS coupling via OASIS

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -166 +166 @@
             CALL Agrif_Step( stp )           ! AGRIF: time stepping
 #else
-            IF (lk_cpl) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
+            IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
        CALL stp( istp )
             ! We don't couple on the final timestep because