Changeset 3451 for branches

Timestamp:

2012-08-11T20:08:15+02:00 (12 years ago)

Author:

cetlod

Message:

banch:2012/dev_r3438_LOCEAN15_PISLOB : minor bug corrections, see ticket #972

Location:

branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z

Files:

• p4zsbc.F90 (modified) (2 diffs)
• p4zsms.F90 (modified) (5 diffs)

branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90

@@ -224 +224 @@
       sn_ndepo    = FLD_N( 'ndeposition',   -12     ,  'ndep'     ,  .false.   , .true.  ,   'yearly'  , ''       , ''         )
       sn_ironsed  = FLD_N( 'ironsed'    ,   -12     ,  'bathy'    ,  .false.   , .true.  ,   'yearly'  , ''       , ''         )
-      sn_hydrofe  = FLD_N( 'hydrofe'    ,   -12     ,  'epsdb'    ,  .false.   , .true.  ,   'yearly'  , ''       , ''         )
+      sn_hydrofe  = FLD_N( 'hydrofe'    ,   -12     ,  'hydro'    ,  .false.   , .true.  ,   'yearly'  , ''       , ''         )
 
       REWIND( numnatp )                     ! read numnatp
@@ -483 +483 @@
          CALL iom_close( numhydro )
          !
-         hydrofe(:,:,:) = hydrofe(:,:,:) * hratio / cvol(:,:,:) * ryyss / fse3t(:,:,:)
+         hydrofe(:,:,:) = ( hydrofe(:,:,:) * hratio ) / ( cvol(:,:,:) * ryyss + rtrn ) / fse3t(:,:,:)
+         !
       ENDIF
       ! 

branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90

@@ -41 +41 @@
    INTEGER ::  numalk  !: logical unit for talk budget
    INTEGER ::  numsil  !: logical unit for Si budget
+   INTEGER ::  numfer  !: logical unit for Fer budget
 
    !!----------------------------------------------------------------------
@@ -346 +347 @@
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
-      REAL(wp) :: zalkbudget, zno3budget, zsilbudget
+      REAL(wp) :: zalkbudget, zno3budget, zsilbudget, zferbudget
       !
       NAMELIST/nampismass/ ln_check_mass
@@ -361 +362 @@
          ENDIF
 
-         IF( ln_check_mass .AND. lwp) THEN      !   Open budget file of NO3, ALK, Si
+         IF( ln_check_mass .AND. lwp) THEN      !   Open budget file of NO3, ALK, Si, Fer
             CALL ctl_opn( numno3, 'no3.budget' , 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea )
             CALL ctl_opn( numsil, 'sil.budget' , 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea )
             CALL ctl_opn( numalk, 'talk.budget', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea )
+            CALL ctl_opn( numfer, 'iron.budget', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea )
          ENDIF
       ENDIF
 
-      IF( ln_check_mass ) THEN      !   Compute the budget of NO3, ALK, Si
+      IF( ln_check_mass ) THEN      !   Compute the budget of NO3, ALK, Si, Fer
          zno3budget = glob_sum( (   trn(:,:,:,jpno3) + trn(:,:,:,jpnh4)  &
             &                     + trn(:,:,:,jpphy) + trn(:,:,:,jpdia)  &
@@ -381 +383 @@
             &                     + trn(:,:,:,jptal)                     &
             &                     + trn(:,:,:,jpcal) * 2.                ) * cvol(:,:,:)  )
+         ! 
+         zferbudget = glob_sum( (   trn(:,:,:,jpfer) + trn(:,:,:,jpnfe)  &
+            &                     + trn(:,:,:,jpdfe) + trn(:,:,:,jpbfe)  &
+            &                     + trn(:,:,:,jpsfe) +                   &
+            &                     + trn(:,:,:,jpzoo)                     &
+            &                     + trn(:,:,:,jpmes) * ferat3            ) * cvol(:,:,:)  )
 
          IF( lwp ) THEN
@@ -386 +394 @@
             WRITE(numsil,9500) kt,  zsilbudget / areatot
             WRITE(numalk,9500) kt,  zalkbudget / areatot
+            WRITE(numfer,9500) kt,  zferbudget / areatot
          ENDIF
        ENDIF