Changeset 3320 for trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90

Timestamp:

2012-03-05T17:37:52+01:00 (12 years ago)

Author:

cetlod

Message:

trunk:bugfix on trends diagnostics in the mixed-layer, see ticket#928 and ticket #930

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90

@@ -60 +60 @@
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
-      INTEGER ::   jnt, jn
+      INTEGER ::   jnt, jn, jl
       CHARACTER (len=25) :: charout
+      REAL(wp), POINTER, DIMENSION(:,:,:,:)  :: ztrdpis
       !!---------------------------------------------------------------------
       !
@@ -68 +69 @@
       IF( ln_pisdmp .AND. MOD( kt - nn_dttrc, nn_pisdmp ) == 0 )   CALL trc_sms_pisces_dmp( kt )  ! Relaxation of some tracers
                                                                    CALL trc_sms_pisces_mass_conserv( kt ) ! Mass conservation checking
+      IF( l_trdtrc )  THEN
+         CALL wrk_alloc( jpi, jpj, jpk, jp_pisces, ztrdpis ) 
+         DO jn = 1, jp_pisces
+            jl = jn + jp_pcs0 - 1
+            ztrdpis(:,:,:,jn) = trn(:,:,:,jl)
+         ENDDO
+      ENDIF
 
       IF( ndayflxtr /= nday_year ) THEN      ! New days
@@ -82 +90 @@
       ENDIF
 
+
       DO jnt = 1, nrdttrc          ! Potential time splitting if requested
          !
@@ -87 +96 @@
          CALL p4z_sed (kt, jnt)    ! compute soft tissue remineralisation
          !
-         trb(:,:,:,:) = trn(:,:,:,:)
+         DO jn = jp_pcs0, jp_pcs1
+            trb(:,:,:,jn) = trn(:,:,:,jn)
+         ENDDO
          !
       END DO
+
+      IF( l_trdtrc )  THEN
+         DO jn = 1, jp_pisces
+            jl = jn + jp_pcs0 - 1
+            ztrdpis(:,:,:,jn) = ( ztrdpis(:,:,:,jn) - trn(:,:,:,jl) ) * rfact2r
+         ENDDO
+      ENDIF
 
       CALL p4z_lys( kt )             ! Compute CaCO3 saturation
@@ -101 +119 @@
 
       IF( l_trdtrc ) THEN
-          DO jn = jp_pcs0, jp_pcs1
-            CALL trd_mod_trc( tra(:,:,:,jn), jn, jptra_trd_sms, kt )   ! save trends
+         DO jn = 1, jp_pisces
+            jl = jn + jp_pcs0 - 1
+             ztrdpis(:,:,:,jn) = ztrdpis(:,:,:,jn) + tra(:,:,:,jl)
+             CALL trd_mod_trc( ztrdpis(:,:,:,jn), jn, jptra_trd_sms, kt )   ! save trends
           END DO
+          CALL wrk_dealloc( jpi, jpj, jpk, jp_pisces, ztrdpis ) 
       END IF