Changeset 8470 for branches

Timestamp:

2017-08-29T16:18:37+02:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- 29-08-2017 -- trends bug fix TOT, ZDF, ZDP

Location:

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP

Files:

• trcnxt.F90 (modified) (4 diffs)
• trczdf.F90 (modified) (1 diff)
• trdtrc.F90 (modified) (1 diff)

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90

@@ -130 +130 @@
          ztrdt(:,:,jpk,:) = 0._wp
          IF( ln_trcldf_iso ) THEN                       ! diagnose the "pure" Kz diffusive trend 
-            CALL trd_tra( kt, 'TRC', jn, jptra_zdfp, ztrdt )
+            DO jn = 1, jptra
+               CALL trd_tra( kt, 'TRC', jn, jptra_zdfp, ztrdt(:,:,:,jn) )
+            ENDDO
          ENDIF
          ! total trend for the non-time-filtered variables.
@@ -151 +153 @@
             END DO
          END IF
-         CALL trd_tra( kt, 'TRC', jn, jptra_tot, ztrdt )
+         DO jn = 1, jptra
+            CALL trd_tra( kt, 'TRC', jn, jptra_tot, ztrdt(:,:,:,jn) )
+         ENDDO
          IF( .NOT.lk_vvl )  THEN
             ! Store now fields before applying the Asselin filter 
@@ -172 +176 @@
                                             ! this time step
             ztrdt(:,:,:,:) = 0._wp
-            CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt )
+            DO jn = 1, jptra
+               CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt(:,:,:,jn) )
+            ENDDO
          END IF
 
@@ -191 +197 @@
                ztrdt(:,:,jk,jn) = ( trb(:,:,jk,jn) - ztrdt(:,:,jk,jn) ) * zfact 
             END DO
-            CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt )
+            CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt(:,:,:,jn) )
          END DO
       END IF

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90

@@ -103 +103 @@
             DO jn = 1, jptra
                DO jk = 1, jpkm1
-                  ztrtrd(:,:,jk) = ( ( tra(:,:,jk,jn)*fse3t_a(:,:,jk) - &
-                                        trn(:,:,jk,jn)*fse3t_b(:,:,jk) ) &
-                                      / (fse3t_n(:,:,jk)*r2dtra(jk)) ) - ztrtrd(:,:,jk)
+                  ztrtrd(:,:,jk,jn) = ( ( tra(:,:,jk,jn)*fse3t_a(:,:,jk) - &
+                                          trn(:,:,jk,jn)*fse3t_b(:,:,jk) ) &
+                                       / (fse3t_n(:,:,jk)*r2dtra(jk)) ) - ztrtrd(:,:,jk,jn)
                END DO
             END DO

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90

@@ -187 +187 @@
 
 
-                           IF  (iom_use(cltra)) THEN
+      IF  (iom_use(cltra)) THEN
 # if defined key_debug_medusa
-                              IF(lwp) WRITE(numout,*) ' TREND stats (min, max,sum) kt = ',kt ,' jn = ',kjn
-                              CALL trc_rst_dia_stat( ptrtrd(:,:,1), cltra)
+         IF(lwp) WRITE(numout,*) ' TREND stats (min, max,sum) kt = ',kt ,' jn = ',kjn
+         CALL trc_rst_dia_stat( ptrtrd(:,:,1), cltra)
 # endif
-                              CALL iom_put( cltra,  ptrtrd(:,:,:) )
+         CALL iom_put( cltra,  ptrtrd(:,:,:) )
 # if defined key_debug_medusa
-                           ELSE
-                              IF(lwp) WRITE(numout,*) &
-                              ' TREND -- No output asked for ',cltra,' kt = ',kt,' jn = ',kjn
-                              CALL trc_rst_dia_stat( ptrtrd(:,:,1), cltra)
+      ELSE
+         IF(lwp) WRITE(numout,*) &
+                      ' TREND -- No output asked for ',cltra,' kt = ',kt,' jn = ',kjn
+         CALL trc_rst_dia_stat( ptrtrd(:,:,1), cltra)
 # endif
-                           ENDIF
+      ENDIF
 
    END SUBROUTINE trd_trc_iomput