Changeset 3028 for branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90

Timestamp:

2011-10-31T09:42:39+01:00 (12 years ago)

Author:

cetlod

Message:

branch dev_LOCEAN_2011 : minor changes in TOP component relative to the management of additional diagnostics

File:

• branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) (4 diffs)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90

@@ -96 +96 @@
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE wrk_nemo, ONLY:   zatmbc14 => wrk_2d_1
-      USE wrk_nemo, ONLY:   zw3d     => wrk_3d_1
+      USE wrk_nemo, ONLY:   zdecay   => wrk_3d_1
       !
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
@@ -251 +251 @@
             ! cumulation of surface flux at each time step
             qint_c14(ji,jj) = qint_c14(ji,jj) + qtr_c14(ji,jj) * rdt
-
-            !                                        ! Save 2D diagnostics
-            IF( .NOT.lk_iomput .AND. ln_diatrc ) THEN
-               trc2d(ji,jj,jp_c14b0_2d    ) = qtr_c14 (ji,jj)
-               trc2d(ji,jj,jp_c14b0_2d + 1) = qint_c14(ji,jj)
-            ENDIF 
             !
          END DO
@@ -266 +260 @@
             DO ji = 1, jpi
 #if defined key_degrad
-               ztra = trn(ji,jj,jk,jpc14) * ( 1. - EXP( -xlambda * rdt * facvol(ji,jj,jk) ) )
+               zdecay(ji,jj,jk) = trn(ji,jj,jk,jpc14) * ( 1. - EXP( -xlambda * rdt * facvol(ji,jj,jk) ) )
 #else
-               ztra = trn(ji,jj,jk,jpc14) * xaccum
+               zdecay(ji,jj,jk) = trn(ji,jj,jk,jpc14) * xaccum
 #endif
-               tra(ji,jj,jk,jpc14) = tra(ji,jj,jk,jpc14) - ztra / rdt
-               !                                     ! save 3D diag : radioactive decay
-               IF( ln_diatrc ) THEN
-                  IF( lk_iomput ) THEN   ;   zw3d(ji,jj,jk)               = ztra
-                  ELSE                   ;   trc3d(ji,jj,jk,jp_c14b0_3d ) = ztra
-                  ENDIF
-               ENDIF
+               tra(ji,jj,jk,jpc14) = tra(ji,jj,jk,jpc14) - zdecay(ji,jj,jk) / rdt
                !
             END DO
@@ -282 +270 @@
       END DO
 
-      IF( lk_iomput ) THEN
-         CALL iom_put( "qtrC14b"  , qtr_c14  )
-         CALL iom_put( "qintC14b" , qint_c14 )
-         CALL iom_put( "fdecay"   , zw3d     )
+      IF( ln_diatrc ) THEN
+         IF( lk_iomput ) THEN
+            CALL iom_put( "qtrC14b"  , qtr_c14  )
+            CALL iom_put( "qintC14b" , qint_c14 )
+            CALL iom_put( "fdecay"   , zdecay   )
+          ELSE
+            trc2d(:,:  ,jp_c14b0_2d     ) = qtr_c14 (:,:)
+            trc2d(:,:  ,jp_c14b0_2d + 1 ) = qint_c14(:,:)
+            trc3d(:,:,:,jp_c14b0_3d     ) = zdecay  (:,:,:)
+          ENDIF
       ENDIF