Changeset 3446 for branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90

Timestamp:

2012-08-10T13:13:55+02:00 (12 years ago)

Author:

cetlod

Message:

branch:2012/dev_r3438_LOCEAN15_PISLOB : 2nd step new PISCES updates from Olivier, see ticket #972

File:

• branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) (4 diffs)

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

@@ -177 +177 @@
          !
          IF( ln_diatrc .AND. lk_iomput .AND. jnt == nrdttrc )   &
-            &   CALL iom_put( "Ironsed", ironsed(:,:,:) * 1.e+3 * fse3t(:,:,:) * tmask(:,:,:) ) ! iron inputs from sediments
+            &   CALL iom_put( "Ironsed", ironsed(:,:,:) * 1.e+3 * tmask(:,:,:) ) ! iron inputs from sediments
       ENDIF
 
@@ -186 +186 @@
          !
          IF( ln_diatrc .AND. lk_iomput .AND. jnt == nrdttrc )   &
-            &   CALL iom_put( "HYDR", hydrofe(:,:,:) * 1.e+3 * fse3t(:,:,:) * tmask(:,:,:) ) ! hydrothermal iron input
+            &   CALL iom_put( "HYDR", hydrofe(:,:,:) * 1.e+3 * tmask(:,:,:) ) ! hydrothermal iron input
       ENDIF
 
@@ -319 +319 @@
                zfact = zlim * rfact2
 #endif
-               ztrfer = trn(ji,jj,jk,jpfer) / ( concfediaz + trn(ji,jj,jk,jpfer) )
-               ztrpo4 = trn(ji,jj,jk,jppo4) / ( concnnh4   + trn(ji,jj,jk,jppo4) ) 
+               ztrfer = biron(ji,jj,jk)       / ( concfediaz + biron(ji,jj,jk)       )
+               ztrpo4 = trn  (ji,jj,jk,jppo4) / ( concnnh4   + trn  (ji,jj,jk,jppo4) ) 
                znitrpot(ji,jj,jk) =  MAX( 0.e0, ( 0.6 * tgfunc(ji,jj,jk) - 2.15 ) * r1_rday )   &
                  &         *  zfact * MIN( ztrfer, ztrpo4 ) * ( 1.- EXP( -etot(ji,jj,jk) / diazolight ) )
@@ -343 +343 @@
       IF( ln_diatrc ) THEN
          zfact = 1.e+3 * rfact2r
-         IF( lk_iomput ) THEN
-            zwork1(:,:)  = znitrpot(:,:,1) * nitrfix * zfact * fse3t(:,:,1) * tmask(:,:,1)
-            zwork4(:,:)  = zwork4(:,:) * zfact * tmask(:,:,1)
-            IF( jnt == nrdttrc ) THEN
-               CALL iom_put( "Nfix"  ,  zwork1 )  ! Nitrate reduction in the sediments
-               CALL iom_put( "Sdenit",  zwork4 )  ! Nitrate reduction in the sediments
-            ENDIF
+         IF( lk_iomput .AND. jnt == nrdttrc ) THEN
+            CALL iom_put( "Nfix"  , znitrpot(:,:,:) * nitrfix * rno3 * zfact * tmask(:,:,:) )  ! nitrogen fixation 
+            CALL iom_put( "Sdenit", zwork4(:,:)               * rno3 * zfact * tmask(:,:,1) )  ! Nitrate reduction in the sediments
          ELSE
             trc2d(:,:,jp_pcs0_2d + 12) = znitrpot(:,:,1) * nitrfix * zfact * fse3t(:,:,1) * tmask(:,:,1)