Changeset 1678 for trunk/NEMO/TOP_SRC/PISCES/p4zflx.F90

Timestamp:

2009-10-26T12:38:26+01:00 (15 years ago)

Author:

cetlod

Message:

Improve PISCES diagnostics for IPCC AR5 exercise, see ticket:567

File:

• trunk/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified) (4 diffs)

trunk/NEMO/TOP_SRC/PISCES/p4zflx.F90

@@ -74 +74 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zkgco2, zkgo2, zh2co3
 #if defined key_trc_diaadd && defined key_iomput
-      REAL(wp), DIMENSION(jpi,jpj) ::  zcflx, zoflx, zkg, zdelc
+      REAL(wp), DIMENSION(jpi,jpj) ::  zcflx, zoflx, zkg, zdpco2, zdpo2
 #endif
       CHARACTER (len=25) :: charout
@@ -171 +171 @@
 
             ! Compute O2 flux 
-            zfld16 = atcox * chemc(ji,jj,2) *tmask(ji,jj,1) * zkgo2(ji,jj)
+            zfld16 = atcox * chemc(ji,jj,2) * tmask(ji,jj,1) * zkgo2(ji,jj)
             zflu16 = trn(ji,jj,1,jpoxy) * tmask(ji,jj,1) * zkgo2(ji,jj)
             tra(ji,jj,1,jpoxy) = tra(ji,jj,1,jpoxy) + ( zfld16 - zflu16 ) / fse3t(ji,jj,1)
@@ -181 +181 @@
             trc2d(ji,jj,jp_pcs0_2d + 1) = ( zfld16 - zflu16 ) * 1000. * tmask(ji,jj,1)
             trc2d(ji,jj,jp_pcs0_2d + 2) = zkgco2(ji,jj) * tmask(ji,jj,1)
-            trc2d(ji,jj,jp_pcs0_2d + 3) = atcco2 - zh2co3(ji,jj) / ( chemc(ji,jj,1) + rtrn ) * tmask(ji,jj,1)
+            trc2d(ji,jj,jp_pcs0_2d + 3) = ( atcco2 - zh2co3(ji,jj) / ( chemc(ji,jj,1) + rtrn ) ) &
+               &                            * tmask(ji,jj,1)
 #  else
             zcflx(ji,jj) = ( zfld - zflu ) * 1000.  * tmask(ji,jj,1)
             zoflx(ji,jj) = ( zfld16 - zflu16 ) * 1000. * tmask(ji,jj,1)
             zkg  (ji,jj) = zkgco2(ji,jj) * tmask(ji,jj,1)
-            zdelc(ji,jj) = atcco2 - zh2co3(ji,jj) / ( chemc(ji,jj,1) + rtrn ) * tmask(ji,jj,1)
+            zdpco2(ji,jj) = ( atcco2 - zh2co3(ji,jj)      / ( chemc(ji,jj,1) + rtrn ) ) &
+              &             * tmask(ji,jj,1)
+            zdpo2 (ji,jj) = ( atcox  - trn(ji,jj,1,jpoxy) / ( chemc(ji,jj,2) + rtrn ) ) &
+              &             * tmask(ji,jj,1)
 #  endif
 #endif
@@ -224 +228 @@
 
 # if defined key_trc_diaadd && defined key_iomput
-      CALL iom_put( "Cflx", zcflx )
-      CALL iom_put( "Oflx", zoflx )
-      CALL iom_put( "Kg"  , zkg   )
-      CALL iom_put( "DelC", zdelc )
+      CALL iom_put( "Cflx" , zcflx  )
+      CALL iom_put( "Oflx" , zoflx  )
+      CALL iom_put( "Kg"   , zkg    )
+      CALL iom_put( "Dpco2", zdpco2 )
+      CALL iom_put( "Dpo2" , zdpo2  )
 #endif