Changeset 5504 for trunk/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

Timestamp:

2015-06-29T14:37:35+02:00 (9 years ago)

Author:

cetlod

Message:

bugfix: computation of the meskmask from coordinate/bathymetry if needed in offline mode, see ticket #1545

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -226 +226 @@
             &   CALL ctl_stop( ' ===>>>> : problem with nittrc000 for the restart',                 &
             &                  ' verify the restart file or rerun with nn_rsttr = 0 (namelist)' )
-         IF( lk_offline ) THEN      ! set the date in offline mode
-            ! Check dynamics and tracer time-step consistency and force Euler restart if changed
-            IF( iom_varid( numrtr, 'rdttrc1', ldstop = .FALSE. ) > 0 )   THEN
-               CALL iom_get( numrtr, 'rdttrc1', zrdttrc1 )
-               IF( zrdttrc1 /= rdt * nn_dttrc )   neuler = 0
-            ENDIF
-            !                          ! define ndastp and adatrj
-            IF( nn_rsttr == 2 ) THEN
+         IF( lk_offline ) THEN    
+            !                                          ! set the date in offline mode
+            IF( ln_rsttr .AND. nn_rsttr == 2 ) THEN
                CALL iom_get( numrtr, 'ndastp', zndastp ) 
                ndastp = NINT( zndastp )
                CALL iom_get( numrtr, 'adatrj', adatrj  )
-            ELSE
+             ELSE
                ndastp = ndate0 - 1     ! ndate0 read in the namelist in dom_nam
                adatrj = ( REAL( nittrc000-1, wp ) * rdttra(1) ) / rday
@@ -250 +245 @@
             ENDIF
             !
+            IF( ln_rsttr )  THEN   ;    neuler = 1
+            ELSE                   ;    neuler = 0
+            ENDIF
+            !
             CALL day_init          ! compute calendar
             !