Changeset 9804 for branches/UKMO/dev_merge_2017_GC_couple_pkg/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2018-06-15T12:13:34+02:00 (6 years ago)

Author:

dancopsey

Message:

Move call to sbc_cpl_snd to correct location.

File:

• branches/UKMO/dev_merge_2017_GC_couple_pkg/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (2 diffs)

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

@@ -179 +179 @@
          !
          DO WHILE( istp <= nitend .AND. nstop == 0 )
+            IF (lk_oasis) THEN
+               CALL sbc_cpl_snd( istp )  ! Coupling to atmos
+            ENDIF
             CALL stp        ( istp ) 
             istp = istp + 1
@@ -186 +189 @@
          !
          DO WHILE( istp <= nitend .AND. nstop == 0 )
-            IF ( .NOT. ln_diurnal_only ) THEN 
-               IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
-               CALL stp( istp )                 ! standard time stepping 
-               ! 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. 
-            ELSE
-               CALL stp_diurnal( istp )   ! time step only the diurnal SST 
-            ENDIF
+            CALL stp_diurnal( istp )   ! time step only the diurnal SST
             istp = istp + 1
          END DO