Changeset 1317 for trunk/NEMO/OPA_SRC/DIA

Timestamp:

2009-02-17T17:31:42+01:00 (15 years ago)

Author:

smasson

Message:

nwrite = modulo referenced to nit000 in all ouputs, see ticket:339

Location:

trunk/NEMO/OPA_SRC/DIA

Files:

• diagap.F90 (modified) (3 diffs)
• diaptr.F90 (modified) (3 diffs)
• diawri.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DIA/diagap.F90

@@ -198 +198 @@
       ! ----------------------
 
-      IF( MOD( kt, ngap ) == 0 ) THEN
+      it = kt - nit000 + 1       ! define time axis
+      IF( MOD( it, ngap ) == 0 ) THEN
 
          ! initialization
@@ -239 +240 @@
           ! ----------------------------======
 
-          IF( MOD( kt, nprg ) == 0 ) THEN
+          IF( MOD( it, nprg ) == 0 ) THEN
               IF(lwp) THEN
                   WRITE(numout,*) 'dia_gap: time step = ', kt, 'model - data'
@@ -259 +260 @@
 
           IF (lwp ) THEN   ! Ok even in mpp after the call to mpp_sum
-             it = kt - nit000 + 1       ! define time axis
              CALL histwrite( numgap, "motempda", it, tdtag, jpk, ndex )
              CALL histwrite( numgap, "mosalida", it, sdtag, jpk, ndex )

trunk/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -245 +245 @@
       !!----------------------------------------------------------------------
 
-      IF( kt == nit000 .OR. MOD( kt, nf_ptr ) == 0 )   THEN
+      IF( kt == nit000 .OR. MOD( kt - nit000 + 1, nf_ptr ) == 0 )   THEN
 
          zsverdrup = 1.e-6
@@ -551 +551 @@
          ENDIF
          
-
          CALL histend( numptr )
 
       ENDIF
 
-      IF( MOD( kt, nf_ptr ) == 0 ) THEN
+      IF( MOD( it, nf_ptr ) == 0 ) THEN
 
          IF(lwp) THEN
@@ -565 +564 @@
          ENDIF
 
-         ! define time axis
-         it= kt - nit000 + 1
          ndex(1) = 0
          CALL histwrite( numptr, "zotemglo", it, tn_jk    , jpj*jpk, ndex )

trunk/NEMO/OPA_SRC/DIA/diawri.F90

@@ -406 +406 @@
       ! donne le nombre d'elements, et ndex la liste des indices a sortir
 
-      IF( lwp .AND. MOD( kt, nwrite ) == 0 ) THEN 
+      IF( lwp .AND. MOD( it, nwrite ) == 0 ) THEN 
          WRITE(numout,*) 'dia_wri : write model outputs in NetCDF files at ', kt, 'time-step'
          WRITE(numout,*) '~~~~~~ '
@@ -513 +513 @@
       ! 3. Synchronise and close all files
       ! ---------------------------------------
-      IF( MOD( kt, nwrite ) == 0 .OR. kindic < 0 ) THEN
+      IF( MOD( it, nwrite ) == 0 .OR. kindic < 0 ) THEN
          CALL histsync( nid_T )
          CALL histsync( nid_U )