Changeset 8200 for branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2017-06-21T14:27:02+02:00 (7 years ago)

Author:

frrh

Message:

Merge branches/UKMO/dev_r5518_GC3_couple_pkg@7985 using command:

svn merge -r 6574:7985 ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GC3_couple_pkg

File:

• branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

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

@@ -370 +370 @@
                                CALL ctl_stop( 'step: indic < 0' )
                                CALL dia_wri_state( 'output.abort', kstp )
+                               CALL ctl_stop('STOP','NEMO failure in stp')
       ENDIF
       IF( kstp == nit000   )   THEN
@@ -380 +381 @@
       ! 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