Changeset 4152 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcini.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/trcini.F90 (modified) (2 diffs)

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

@@ -75 +75 @@
          &  CALL ctl_stop( ' Cross Land Advection not yet implemented with passive tracer ; nn_cla must be 0' )
 
-      CALL trc_nam                  ! read passive tracers namelists
-      !
-      IF(lwp) WRITE(numout,*)
-      IF( ln_rsttr ) THEN
-        !
-        IF( lk_offline )  neuler = 1   ! Set time-step indicator at nit000 (leap-frog)
-        CALL trc_rst_cal( nittrc000, 'READ' )   ! calendar
-        !
-      ELSE
-        IF( lk_offline )  THEN
-           neuler = 0                  ! Set time-step indicator at nit000 (euler)
-           CALL day_init               ! set calendar
-        ENDIF
-        !
-      ENDIF
+      CALL trc_nam      ! read passive tracers namelists
+      !
+      IF(lwp) WRITE(numout,*)
+      !
+      IF( ln_rsttr .AND. .NOT. lk_offline ) CALL trc_rst_cal( nit000, 'READ' )   ! calendar
+      !
       IF(lwp) WRITE(numout,*)
                                                               ! masked grid volume
@@ -107 +98 @@
       IF( lwp ) THEN
          !
-         CALL ctl_opn( numstr, 'tracer.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea )
+         CALL ctl_opn( numstr, 'tracer.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp , narea )
          !
       ENDIF