Changeset 4496 for branches/2013/dev_MERGE_2013

Timestamp:

2014-02-11T10:55:27+01:00 (10 years ago)

Author:

jchanut

Message:

Fix misplaced call to ts_rst
o-This line, and those below, will be ignored--

M NEMO/OPA_SRC/DYN/dynspg.F90
M NEMO/OPA_SRC/DYN/dynspg_ts.F90

Location:

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

• dynspg.F90 (modified) (1 diff)
• dynspg_ts.F90 (modified) (2 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -235 +235 @@
          IF( dynspg_oce_alloc() /= 0 )   CALL ctl_stop('STOP', 'dyn_spg_init: failed to allocate dynspg_oce arrays')
          IF( dyn_spg_ts_alloc() /= 0 )   CALL ctl_stop('STOP', 'dyn_spg_init: failed to allocate dynspg_ts  arrays')
+         IF ((neuler/=0).AND.(ln_bt_fw)) CALL ts_rst( nit000, 'READ' )
       ENDIF
 

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -52 +52 @@
    PUBLIC dyn_spg_ts_alloc  !    "      "     "    "
    PUBLIC dyn_spg_ts_init   !    "      "     "    "
+   PUBLIC ts_rst            !    "      "     "    "
 
    INTEGER, SAVE :: icycle  ! Number of barotropic sub-steps for each internal step nn_baro <= 2.5 nn_baro
@@ -1142 +1143 @@
       ENDIF
       !
-      IF ((neuler/=0).AND.(ln_bt_fw)) CALL ts_rst( nit000, 'READ' ) 
-      !
       CALL wrk_dealloc( jpi, jpj, zcu )
       !