Changeset 1254 for trunk/NEMO/TOP_SRC/trcini.F90

Timestamp:

2009-01-13T10:58:39+01:00 (15 years ago)

Author:

cetlod

Message:

update parameter files to take into account the new C14 bomb tracer model, see ticket:298

File:

• trunk/NEMO/TOP_SRC/trcini.F90 (modified) (5 diffs)

trunk/NEMO/TOP_SRC/trcini.F90

@@ -21 +21 @@
    USE trcctl
    USE trclec
-   USE trcini_cfc      ! CFC     initialisation
-   USE trcini_lobster  ! LOBSTER initialisation
-   USE trcini_pisces   ! PISCES  initialisation
-   USE trcini_my_trc   ! MY_TRC  initialisation
+   USE trcini_cfc      ! CFC      initialisation
+   USE trcini_lobster  ! LOBSTER  initialisation
+   USE trcini_pisces   ! PISCES   initialisation
+   USE trcini_c14b     ! C14 bomb initialisation
+   USE trcini_my_trc   ! MY_TRC   initialisation
    USE trcdta          ! 
    USE trdmld_trc_oce
@@ -61 +62 @@
       !!---------------------------------------------------------------------
       INTEGER ::   jk, jn    ! dummy loop indices
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zbt   ! workspace: masked grid volume
       CHARACTER (len=25) :: charout
 
@@ -72 +72 @@
       !                 ! masked grid volume
       DO jk = 1, jpk
-         zbt(:,:,jk) = e1t(:,:) * e2t(:,:) * fse3t(:,:,jk) * tmask(:,:,jk) * tmask_i(:,:)
+         cvol(:,:,jk) = e1t(:,:) * e2t(:,:) * fse3t(:,:,jk) * tmask(:,:,jk) * tmask_i(:,:)
       END DO
-#if defined key_off_degrad
-      DO jk = 1, jpk
-         zbt(:,:,:) = zbt(:,:,:) * facvol(:,:,jk)      ! degrad option: reduction by facvol
-      ENDDO
+
+      ! total volume of the ocean
+#if ! defined key_off_degrad
+      areatot = SUM( cvol(:,:,:) )
+#else
+      areatot = SUM( cvol(:,:,:) * facvol(:,:,:) ) ! degrad option: reduction by facvol
 #endif
-
-      !                 ! total volume of the ocean
-      areatot = SUM( zbt(:,:,:) )
       IF( lk_mpp )   CALL mpp_sum( areatot )     ! sum over the global domain  
 
@@ -98 +97 @@
       IF( lk_cfc     ) THEN   ;   CALL trc_ini_cfc          ! CFC     tracers
       ELSE                    ;   IF(lwp) WRITE(numout,*) '          CFC not used'
+      ENDIF
+
+      IF( lk_c14b    ) THEN   ;   CALL trc_ini_c14b         ! C14 bomb  tracer
+      ELSE                    ;   IF(lwp) WRITE(numout,*) '          C14 not used'
       ENDIF
       
@@ -126 +129 @@
       trai = 0.e0
       DO jn = 1, jptra
-         trai = trai + SUM( trn(:,:,:,jn) * zbt(:,:,:) )
+#if ! defined key_off_degrad
+         trai = trai + SUM( trn(:,:,:,jn) * cvol(:,:,:) )
+#else
+         trai = trai + SUM( trn(:,:,:,jn) * cvol(:,:,:) * facvol(:,:,:) ) ! degrad option: reduction by facvol
+#endif
       END DO      
       IF( lk_mpp )   CALL mpp_sum( trai )     ! sum over the global domain