Changeset 4152 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

Timestamp:

2013-11-05T12:59:53+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013 the 2nd development branch dev_r3940_CNRS4_IOCRS, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -197 +197 @@
 
          CALL iom_get ( numrtr, 'kt', zkt )   ! last time-step of previous run
+
          IF(lwp) THEN
             WRITE(numout,*) ' *** Info read in restart : '
@@ -216 +217 @@
             IF( iom_varid( numrtr, 'rdttrc1', ldstop = .FALSE. ) > 0 )   THEN
                CALL iom_get( numrtr, 'rdttrc1', zrdttrc1 )
-               IF( zrdttrc1 /= rdttrc(1) )   neuler = 0
+               IF( zrdttrc1 /= rdt * nn_dttrc )   neuler = 0
             ENDIF
             !                          ! define ndastp and adatrj
-            IF ( nn_rsttr == 2 ) THEN
+            IF( nn_rsttr == 2 ) THEN
                CALL iom_get( numrtr, 'ndastp', zndastp ) 
                ndastp = NINT( zndastp )