Changeset 11993 for NEMO/trunk/src/TOP/PISCES/P4Z/p4zflx.F90

Timestamp:

2019-11-28T11:20:53+01:00 (5 years ago)

Author:

cetlod

Message:

trunk : undo bad commit. Oups

File:

• NEMO/trunk/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) (4 diffs)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zflx.F90

@@ -160 +160 @@
             zfld = zfco2 * chemc(ji,jj,1) * zkgco2(ji,jj)  ! (mol/L) * (m/s)
             zflu = zh2co3(ji,jj) * zkgco2(ji,jj)                                   ! (mol/L) (m/s) ?
-            oce_co2(ji,jj) = ( zfld - zflu ) * tmask(ji,jj,1) 
+            oce_co2(ji,jj) = ( zfld - zflu ) * rfact2 * e1e2t(ji,jj) * tmask(ji,jj,1) * 1000.
             ! compute the trend
-            tra(ji,jj,1,jpdic) = tra(ji,jj,1,jpdic) + oce_co2(ji,jj) * rfact2 / e3t_n(ji,jj,1)
+            tra(ji,jj,1,jpdic) = tra(ji,jj,1,jpdic) + ( zfld - zflu ) * rfact2 / e3t_n(ji,jj,1) * tmask(ji,jj,1)
 
             ! Compute O2 flux 
@@ -174 +174 @@
       IF( iom_use("tcflx") .OR. iom_use("tcflxcum") .OR. kt == nitrst   &
          &                 .OR. (ln_check_mass .AND. kt == nitend) )    &
-         t_oce_co2_flx  = glob_sum( 'p4zflx', oce_co2(:,:) * e1e2t(:,:) * 1000. )                    !  Total Flux of Carbon
+         t_oce_co2_flx  = glob_sum( 'p4zflx', oce_co2(:,:) )                    !  Total Flux of Carbon
       t_oce_co2_flx_cum = t_oce_co2_flx_cum + t_oce_co2_flx       !  Cumulative Total Flux of Carbon
 !      t_atm_co2_flx     = glob_sum( 'p4zflx', satmco2(:,:) * e1e2t(:,:) )       ! Total atmospheric pCO2
@@ -186 +186 @@
 
       IF( lk_iomput .AND. knt == nrdttrc ) THEN
-         CALL iom_put( "AtmCo2" , satmco2(:,:) * tmask(:,:,1) )   ! Atmospheric CO2 concentration
-         ! 
          ALLOCATE( zw2d(jpi,jpj) )  
          IF( iom_use( "Cflx"  ) )  THEN
-            zw2d(:,:) = oce_co2(:,:) * 1000.  ! conversion in molC/m2/s
+            zw2d(:,:) = oce_co2(:,:) / e1e2t(:,:) * rfact2r
             CALL iom_put( "Cflx"     , zw2d ) 
          ENDIF
          IF( iom_use( "Oflx"  ) )  THEN
-            zw2d(:,:) =  zoflx(:,:) * 1000.
+            zw2d(:,:) =  zoflx(:,:) * 1000 * tmask(:,:,1)
             CALL iom_put( "Oflx" , zw2d )
          ENDIF
@@ -205 +203 @@
            CALL iom_put( "Dpco2" ,  zw2d )
          ENDIF
-         IF( iom_use( "pCO2sea" ) ) THEN
-           zw2d(:,:) = ( zh2co3(:,:) / ( chemc(:,:,1) + rtrn ) ) * tmask(:,:,1)
-           CALL iom_put( "pCO2sea" ,  zw2d )
-         ENDIF
-
          IF( iom_use( "Dpo2" ) )  THEN
            zw2d(:,:) = ( atcox * patm(:,:) - atcox * trb(:,:,1,jpoxy) / ( chemo2(:,:,1) + rtrn ) ) * tmask(:,:,1)
            CALL iom_put( "Dpo2"  , zw2d )
          ENDIF
-         CALL iom_put( "tcflx"    , t_oce_co2_flx     )   ! molC/s
-         CALL iom_put( "tcflxcum" , t_oce_co2_flx_cum )   ! molC
+         CALL iom_put( "tcflx"    , t_oce_co2_flx * rfact2r )   ! molC/s
+         CALL iom_put( "tcflxcum" , t_oce_co2_flx_cum       )   ! molC
          !
          DEALLOCATE( zw2d )