Changeset 1254 for trunk/NEMO/TOP_SRC/trcrst.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/trcrst.F90 (modified) (13 diffs)

trunk/NEMO/TOP_SRC/trcrst.F90

@@ -19 +19 @@
    USE sms_pisces          ! PISCES variables
    USE trcsms_cfc          ! CFC variables
+   USE trcsms_c14b         ! C14 variables
+   USE trcsms_my_trc       ! MY_TRC variables
    USE trctrp_lec   
    USE lib_mpp
@@ -30 +32 @@
    PUBLIC   trc_rst_wri       ! called by ???
    
-   LOGICAL, PUBLIC ::   lrst_trc         !: logical to control the trc restart write 
    INTEGER, PUBLIC ::   numrtr, numrtw   !: logical unit for trc restart (read and write)
 
@@ -73 +74 @@
          ! create the file
          IF(lwp) WRITE(numout,*)
-         clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_restart_trc"
+         clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_"//TRIM(cn_trcrst_out)
          IF(lwp) WRITE(numout,*) '             open trc restart.output NetCDF file: '//clname
          CALL iom_open( clname, numrtw, ldwrt = .TRUE., kiolib = jprstlib )
@@ -122 +123 @@
       END SELECT
 
-      CALL iom_open( 'restart_trc', numrtr, kiolib = jprstlib )
+      CALL iom_open( cn_trcrst_in, numrtr, kiolib = jprstlib )
 
       CALL iom_get( numrtr, 'kt'   , zkt    )
@@ -165 +166 @@
 #if defined key_cfc
       DO jn = jp_cfc0, jp_cfc1
-         CALL iom_get( numrtr, jpdom_autoglo, 'qint'//ctrcnm(jn), qint(:,:,jn) ) 
-         CALL iom_get( numrtr, jpdom_autoglo, 'qtr'//ctrcnm(jn) , qtr( :,:,jn) ) 
-      END DO
-#endif
+         CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) ) 
+      END DO
+#endif
+
+#if defined key_c14b
+      CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn) , qint_c14(:,:) ) 
+#endif
+
+#if defined key_my_trc
+#endif
+
 
       CALL iom_close( numrtr )
@@ -222 +230 @@
 #if defined key_cfc
       DO jn = jp_cfc0, jp_cfc1
-         CALL iom_rstput( kt, nitrst, numrtw, 'qint'//ctrcnm(jn), qint(:,:,jn) )
-         CALL iom_rstput( kt, nitrst, numrtw, 'qtr'//ctrcnm(jn) , qtr (:,:,jn) )
-      END DO
-#endif
+         CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) )
+      END DO
+#endif
+
+#if defined key_c14b
+      CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_c14(:,:) )
+#endif
+
+#if defined key_my_trc
+#endif
+
 
        IF( kt == nitrst ) THEN
@@ -252 +267 @@
          siomean = 91.51      ! mean value of silicate
       
-      REAL(wp) ::   ztrasum
+      REAL(wp) ::   zvol, ztrasum
       REAL(wp) ::   caralk, bicarb, co3
 
@@ -266 +281 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  ztrasum = ztrasum + trn(ji,jj,jk,jptal) * tmask(ji,jj,jk) * tmask_i(ji,jj)  &
+                  zvol = cvol(ji,jj,jk)
 #  if defined key_off_degrad
-                     &              * facvol(ji,jj,jk)   &
+                  zvol = zvol * facvol(ji,jj,jk)
 #  endif
-                     &              * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk)
+                  ztrasum = ztrasum + trn(ji,jj,jk,jptal) * zvol
                END DO
             END DO
@@ -285 +300 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  ztrasum = ztrasum + trn(ji,jj,jk,jppo4) * tmask(ji,jj,jk) * tmask_i(ji,jj)  &
+                  zvol = cvol(ji,jj,jk)
 #  if defined key_off_degrad
-                     &              * facvol(ji,jj,jk)   &
+                  zvol = zvol * facvol(ji,jj,jk)
 #  endif
-                     &              * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk)
+                  ztrasum = ztrasum + trn(ji,jj,jk,jppo4) * zvol
                END DO
             END DO
@@ -304 +319 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  ztrasum = ztrasum + trn(ji,jj,jk,jpno3) * tmask(ji,jj,jk) * tmask_i(ji,jj)  &
+                  zvol = cvol(ji,jj,jk)
 #  if defined key_off_degrad
-                     &              * facvol(ji,jj,jk)   &
+                  zvol = zvol * facvol(ji,jj,jk)
 #  endif
-                     &              * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk)
+                  ztrasum = ztrasum + trn(ji,jj,jk,jpno3) * zvol
                END DO
             END DO
@@ -323 +338 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  ztrasum = ztrasum + trn(ji,jj,jk,jpsil) * tmask(ji,jj,jk) * tmask_i(ji,jj)   &
+                  zvol = cvol(ji,jj,jk)
 #  if defined key_off_degrad
-                     &              * facvol(ji,jj,jk)   &
+                  zvol = zvol * facvol(ji,jj,jk)
 #  endif
-                     &              * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk)
+                  ztrasum = ztrasum + trn(ji,jj,jk,jpsil) * zvol
                END DO
             END DO
@@ -374 +389 @@
       INTEGER  :: ji, jj, jk, jn
       REAL(wp) :: zdiag_var, zdiag_varmin, zdiag_varmax, zdiag_tot
-      REAL(wp) :: zder
+      REAL(wp) :: zder, zvol
       !!----------------------------------------------------------------------
 
@@ -392 +407 @@
             DO jj = 1, jpj
                DO jk = 1,jpk
-                  zdiag_var = zdiag_var + trn(ji,jj,jk,jn) * tmask(ji,jj,jk) * tmask_i(ji,jj)   &
-#if defined key_off_degrad
-                     &   * facvol(ji,jj,jk)   &
-#endif
-                     &   * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk)
+                  zvol = cvol(ji,jj,jk)
+#  if defined key_off_degrad
+                  zvol = zvol * facvol(ji,jj,jk)
+#  endif
+                  zdiag_var = zdiag_var + trn(ji,jj,jk,jn) * zvol
                END DO
             END DO