Changeset 276 for trunk/NEMO/TOP_SRC

Timestamp:

2005-09-14T11:42:17+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_005:RB: move calls to trc_dia and trc_wri from step.F90 to TOP_SRC/TRP/trcstp.F90

File:

• trunk/NEMO/TOP_SRC/TRP/trcstp.F90 (modified) (2 diffs)

trunk/NEMO/TOP_SRC/TRP/trcstp.F90

@@ -13 +13 @@
    USE trctrp           ! passive tracers transport
    USE trcsms           ! passive tracers sources and sinks
+   USE trcdia          ! passive tracer diagnostics        (trc_dia routine)
+   USE trcrst          ! restart for passive tracers
 
    IMPLICIT NONE
@@ -45 +47 @@
       REAL(wp) :: ztra
 
+      !! * local declarations
+      INTEGER ::   indic    ! error indicator if < 0
+      !! ---------------------------------------------------------------------
 
-      ! this ROUTINE is called only every ndttrc time step
-      IF( MOD( kt , ndttrc ) /= 0 ) RETURN
-
-      ! tracers: sink and source 
+      indic = 1                    ! reset to no error condition
 
 
-      CALL trc_sms( kt )
 
-       DO jn = 1, jptra
-         IF(ln_ctl) THEN         ! print mean trends (used for debugging)
-            ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) )
-            WRITE(numout,*) ' trc/sms  - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn)
-            tra_ctl(jn) = ztra
-         ENDIF
-      END DO
+      ! diagnostics init
+
+      IF( kt == nit000 )   CALL trc_dia( kt, indic )
+
+      ! these ROUTINES are called only every ndttrc time step
+      IF( MOD( kt , ndttrc ) == 0 ) THEN
+
+         ! tracers: sink and source 
+
+         CALL trc_sms( kt )
+
+         DO jn = 1, jptra
+            IF(ln_ctl) THEN         ! print mean trends (used for debugging)
+               ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) )
+               WRITE(numout,*) ' trc/sms  - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn)
+               tra_ctl(jn) = ztra
+            ENDIF
+         END DO
 
  
 
-      ! transport of passive tracers
+         ! transport of passive tracers
 
-      CALL trc_trp( kt )
+         CALL trc_trp( kt )
 
-       DO jn = 1, jptra
-         IF(ln_ctl) THEN         ! print mean trends (used for debugging)
-            ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) )
-            WRITE(numout,*) ' trc/trp  - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn)
-            tra_ctl(jn) = ztra
-         ENDIF
-      END DO
+         DO jn = 1, jptra
+            IF(ln_ctl) THEN         ! print mean trends (used for debugging)
+               ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) )
+               WRITE(numout,*) ' trc/trp  - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn)
+               tra_ctl(jn) = ztra
+            ENDIF
+         END DO
+
+      ENDIF
+
+      
+
+      ! outputs
+
+      CALL trc_wri( kt ) 
+
+
+
+      ! diagnostics
+ 
+      CALL trc_dia( kt, indic )