Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcini.F90

Timestamp:

2010-08-02T12:57:40+02:00 (14 years ago)

Author:

cetlod

Message:

Apply the merge to passive tracers, see ticket:693

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcini.F90 (modified) (6 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcini.F90

@@ -18 +18 @@
    USE oce_trc
    USE trc
-   USE trp_trc
    USE trcrst
-   USE trcctl
-   USE trclec
+   USE trcnam          ! Namelist read
    USE trcini_cfc      ! CFC      initialisation
    USE trcini_lobster  ! LOBSTER  initialisation
@@ -28 +26 @@
    USE trcini_my_trc   ! MY_TRC   initialisation
    USE trcdta   
-#if defined key_off_tra 
+#if defined key_offline
    USE daymod
 #endif
-   USE zpshde_trc      ! partial step: hor. derivative 
+   USE zpshde          ! partial step: hor. derivative   (zps_hde_trc routine)
    USE in_out_manager  ! I/O manager
    USE prtctl_trc      ! Print control passive tracers (prt_ctl_trc_init routine)
@@ -78 +76 @@
 
       ! total volume of the ocean
-#if ! defined key_off_degrad
+#if ! defined key_degrad
       areatot = SUM( cvol(:,:,:) )
 #else
-      areatot = SUM( cvol(:,:,:) * facvol(:,:,:) ) ! degrad option: reduction by facvol
+      areatot = SUM( cvol(:,:,:) * facvol(:,:,:) )  ! degrad option: reduction by facvol
 #endif
-      IF( lk_mpp )   CALL mpp_sum( areatot )     ! sum over the global domain  
+      IF( lk_mpp )   CALL mpp_sum( areatot )        ! sum over the global domain  
 
-                                  CALL trc_lec      ! READ passive tracers namelists
+                                  CALL trc_nam      ! read passive tracers namelists
 
-                                  CALL trc_ctl      ! control consistency between parameters, cpp key
+      ! restart for passive tracer (input)
+      IF( ln_rsttr ) THEN
+         IF(lwp) WRITE(numout,*) '       read a restart file for passive tracer : ', cn_trcrst_in
+         IF(lwp) WRITE(numout,*) ' '
+      ELSE
+         IF(lwp) WRITE(numout,*)
+         DO jn = 1, jptra
+            IF( lwp .AND. lutini(jn) )  &                  ! open input FILE only IF lutini(jn) is true
+            &  WRITE(numout,*) '        read an initial file  for passive tracer number :', jn, ' traceur : ', ctrcnm(jn) 
+         END DO
+      ENDIF
 
       IF( lk_lobster ) THEN   ;   CALL trc_ini_lobster      ! LOBSTER bio-model
@@ -110 +118 @@
 
       IF( .NOT. ln_rsttr ) THEN 
-#if defined key_off_tra
+#if defined key_offline
          CALL day_init      ! calendar
 #endif
@@ -130 +138 @@
       
       IF( ln_zps .AND. .NOT. lk_trc_c1d )   &              ! Partial steps: before horizontal gradient of passive
-      &                     CALL zps_hde_trc( nittrc000, trb, gtru, gtrv )       ! tracers at the bottom ocean level
+      &                     CALL zps_hde_trc( nittrc000, jptra, trb, gtru, gtrv )       ! tracers at the bottom ocean level
 
 
@@ -136 +144 @@
       trai = 0.e0
       DO jn = 1, jptra
-#if ! defined key_off_degrad
+#if ! defined key_degrad
          trai = trai + SUM( trn(:,:,:,jn) * cvol(:,:,:) )
 #else