Changeset 1317 for trunk/NEMO/OPA_SRC/TRD

Timestamp:

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

Author:

smasson

Message:

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

Location:

trunk/NEMO/OPA_SRC/TRD

Files:

• trdmld.F90 (modified) (5 diffs)
• trdvor.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/TRD/trdmld.F90

@@ -389 +389 @@
       smltrd(:,:,:) = smltrd(:,:,:) * ucf   !  is no longer used, and is reset to 0. at next time step)
       
-      MODULO_NTRD : IF( MOD( kt, ntrd ) == 0 ) THEN        ! nitend MUST be multiple of ntrd
+      it = kt - nit000 + 1
+
+      MODULO_NTRD : IF( MOD( it, ntrd ) == 0 ) THEN        ! nitend MUST be multiple of ntrd
          !
          ztmltot (:,:) = 0.e0   ;   zsmltot (:,:) = 0.e0   ! reset arrays to zero
@@ -574 +576 @@
 #if defined key_dimgout
 
-      IF( MOD( kt, ntrd ) == 0 ) THEN
+      IF( MOD( it, ntrd ) == 0 ) THEN
          iyear =  ndastp/10000
          imon  = (ndastp-iyear*10000)/100
@@ -591 +593 @@
       ! ----------------------------------
 
-      IF( lwp .AND. MOD( kt , ntrd ) == 0 ) THEN
+      IF( lwp .AND. MOD( it , ntrd ) == 0 ) THEN
          WRITE(numout,*) ' '
          WRITE(numout,*) 'trd_mld : write trends in the NetCDF file :'
@@ -600 +602 @@
       END IF
          
-      it = kt - nit000 + 1
-
       !-- Write the trends for T/S instantaneous diagnostics 
       IF( ln_trdmld_instant ) THEN           
@@ -683 +683 @@
 #endif
 
-      IF( MOD( kt , ntrd ) == 0 ) THEN
+      IF( MOD( it, ntrd ) == 0 ) THEN
          !
          ! III.5 Reset cumulative arrays to zero

trunk/NEMO/OPA_SRC/TRD/trdvor.F90

@@ -405 +405 @@
       !  =============================================
 
-      IF( MOD( kt - nit000+1, ntrd ) == 0 ) THEN
+      ! define time axis
+      it= kt - nit000 + 1
+
+      IF( MOD( it, ntrd ) == 0 ) THEN
 
          ! III.1 compute total trend
@@ -452 +455 @@
       IF( kt >=  nit000+1 ) THEN
 
-         ! define time axis
-         it= kt-nit000+1
-         IF( lwp .AND. MOD( kt, ntrd ) == 0 ) THEN
+         IF( lwp .AND. MOD( it, ntrd ) == 0 ) THEN
             WRITE(numout,*) ''
             WRITE(numout,*) 'trd_vor : write trends in the NetCDF file at kt = ', kt
@@ -481 +482 @@
       ENDIF
       !
-      IF( MOD( kt - nit000+1, ntrd ) == 0 ) rotot(:,:)=0
+      IF( MOD( it, ntrd ) == 0 ) rotot(:,:)=0
       !
       IF( kt == nitend )   CALL histclo( nidvor )