Changeset 6252

Timestamp:

2016-01-14T13:27:20+01:00 (8 years ago)

Author:

frrh

Message:

Merge branches/UKMO/dev_r5107_hadgem3_cplseq@5646

Again this was not at all straightforward because it reported
conflicts in:
DOC/TexFiles/Chapters/Chap_STO.tex
DOC/TexFiles/Namelist/namcfg_orca1
and
DOC/TexFiles/Namelist/namsbc_isf

I dont care about those for the purposes of this so I've run
fcm conflicts and in each case selected (y) to "accept the local delete"!

Location:

branches/UKMO/nemo_v3_6_STABLE_pkg/NEMOGCM

Files:

• CONFIG/makenemo (modified) (1 diff)
• NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (1 diff)
• NEMO/OPA_SRC/nemogcm.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/step.F90 (modified) (1 diff)

branches/UKMO/nemo_v3_6_STABLE_pkg/NEMOGCM/CONFIG/makenemo

@@ -75 +75 @@
 # ==========
 #
-# $Id$
+# $Id: makenemo 5092 2015-02-17 17:30:01Z nicolasmartin $
 #
 #

branches/UKMO/nemo_v3_6_STABLE_pkg/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -194 +194 @@
       ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init)
 #endif
-      ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) )
+      !ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) )
+      ! Hardwire only two models as nn_cplmodel has not been read in
+      ! from the namelist yet.
+      ALLOCATE( xcplmask(jpi,jpj,0:2) , STAT=ierr(3) )   
       !
       sbc_cpl_alloc = MAXVAL( ierr )
@@ -293 +296 @@
 
       !                                   ! allocate sbccpl arrays
-      IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
+      !IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
      
       ! ================================ !

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

@@ -302 +302 @@
       CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 )
       !
+      ! In coupled mode get extra fields from CICE for passing back to atmosphere
+ 
+      IF ( ksbc == jp_purecpl ) CALL cice_sbc_hadgam(nit000)
+      ! 
       IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init')
       !
@@ -734 +738 @@
       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/nemo_v3_6_STABLE_pkg/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -266 +266 @@
       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/nemo_v3_6_STABLE_pkg/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -68 +68 @@
    USE icbini          ! handle bergs, initialisation
    USE icbstp          ! handle bergs, calving, themodynamics and transport
+   USE sbccpl 
    USE cpl_oasis3      ! OASIS3 coupling
    USE c1d             ! 1D configuration
@@ -165 +166 @@
             CALL Agrif_Step( stp )           ! AGRIF: time stepping
 #else
-            CALL stp( istp )                 ! standard time stepping
+            IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
+       CALL stp( istp )
+            ! We don't couple on the final timestep because
+            ! our restart file has already been written
+            ! and contains all the necessary data for a
+            ! restart. sbc_cpl_snd could be called here
+            ! but it would require
+            ! a) A test to ensure it was not performed
+            !    on the very last time-step
+            ! b) the presence of another call to
+            !    sbc_cpl_snd call prior to the main DO loop
+            ! This solution produces identical results
+            ! with fewer lines of code. 
 #endif
             istp = istp + 1

branches/UKMO/nemo_v3_6_STABLE_pkg/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -357 +357 @@
       ! Coupled mode
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      IF( lk_oasis         )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges
+      !IF( lk_oasis         )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges
       !
 #if defined key_iomput