Changeset 3244 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2012-01-04T11:31:09+01:00 (12 years ago)

Author:

cetlod

Message:

dev_NEMO_MERGE_2011 : Minor reorganisation of initialisation phase of TOP ; needed to get calendar information before the use of fldread

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -77 +77 @@
 
       CALL trc_nam                  ! read passive tracers namelists
-      !                                                              ! masked grid volume
-      IF( lk_offline )  THEN
-         IF( ln_rsttr ) THEN
-            neuler = 1   ! Set time-step indicator at nit000 (leap-frog)
-         ELSE
-            neuler = 0                  ! Set time-step indicator at nit000 (euler)
-            CALL day_init               ! set calendar
+      !
+      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
+        !
+      ENDIF
+      IF(lwp) WRITE(numout,*)
+                                                              ! masked grid volume
       !                                                              ! masked grid volume
       DO jk = 1, jpk
@@ -94 +101 @@
       areatot = glob_sum( cvol(:,:,:) )
 
-      IF( lk_lobster ) THEN   ;   CALL trc_ini_lobster      ! LOBSTER bio-model
-      ELSE                    ;   IF(lwp) WRITE(numout,*) '          LOBSTER not used'
-      ENDIF
-      
-      IF( lk_pisces  ) THEN   ;   CALL trc_ini_pisces       ! PISCES  bio-model
-      ELSE                    ;   IF(lwp) WRITE(numout,*) '          PISCES not used'
-      ENDIF
-      
-      IF( lk_cfc     ) THEN   ;   CALL trc_ini_cfc          ! CFC     tracers
-      ELSE                    ;   IF(lwp) WRITE(numout,*) '          CFC not used'
-      ENDIF
-
-      IF( lk_c14b    ) THEN   ;   CALL trc_ini_c14b         ! C14 bomb  tracer
-      ELSE                    ;   IF(lwp) WRITE(numout,*) '          C14 not used'
-      ENDIF
-      
-      IF( lk_my_trc  ) THEN   ;   CALL trc_ini_my_trc       ! MY_TRC  tracers
-      ELSE                    ;   IF(lwp) WRITE(numout,*) '          MY_TRC not used'
-      ENDIF
+      IF( lk_lobster )       CALL trc_ini_lobster      ! LOBSTER bio-model
+      IF( lk_pisces  )       CALL trc_ini_pisces       ! PISCES  bio-model
+      IF( lk_cfc     )       CALL trc_ini_cfc          ! CFC     tracers
+      IF( lk_c14b    )       CALL trc_ini_c14b         ! C14 bomb  tracer
+      IF( lk_my_trc  )       CALL trc_ini_my_trc       ! MY_TRC  tracers
 
       IF( lwp ) THEN
@@ -120 +113 @@
       ENDIF
 
-      IF( ln_trcdta )             CALL trc_dta_init
+      IF( ln_trcdta )      CALL trc_dta_init
+
 
       IF( ln_rsttr ) THEN
@@ -173 +167 @@
          WRITE(numout,*)
       ENDIF
-      WRITE(numout,*)
+      IF(lwp) WRITE(numout,*)
       IF(ln_ctl) THEN            ! print mean trends (used for debugging)
          CALL prt_ctl_trc_init