Changeset 9450 for branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmeso.F90

Timestamp:

2018-03-30T18:08:29+02:00 (6 years ago)

Author:

aumont

Message:

debug PISCES code

File:

• branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmeso.F90 (modified) (7 diffs)

branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmeso.F90

@@ -85 +85 @@
       CHARACTER (len=25) :: charout
       REAL(wp) :: zrfact2, zmetexcess
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zgrazing, zw3d
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zgrazing, zw3d, zfezoo2
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zz2ligprod
 
       !!---------------------------------------------------------------------
@@ -91 +92 @@
       IF( nn_timing == 1 )  CALL timing_start('p5z_meso')
       !
-      CALL wrk_alloc( jpi, jpj, jpk, zgrazing )
+      CALL wrk_alloc( jpi, jpj, jpk, zgrazing, zfezoo2 )
       zgrazing(:,:,:) = 0._wp
+      zfezoo2 (:,:,:) = 0._wp
+      !
+      IF (ln_ligand) THEN
+         CALL wrk_alloc( jpi, jpj, jpk, zz2ligprod )
+         zz2ligprod(:,:,:) = 0._wp
+      ENDIF
 
       zmetexcess = 0.0
@@ -138 +145 @@
                !   most abundant species
                !   ------------------------------------------------------------  
-               ztmp1 = xpref2p * zcompaph**1.5
-               ztmp2 = xpref2m * zcompames**1.5
-               ztmp3 = xpref2c * zcompapoc**1.5
-               ztmp4 = xpref2d * zcompadi**1.5
-               ztmp5 = xpref2z * zcompaz**1.5
+               ztmp1 = xpref2p * zcompaph * (0.75 * zcompaph + 0.25 * zcompadi)
+               ztmp2 = xpref2m * zcompames**2
+               ztmp3 = xpref2c * zcompapoc**2
+               ztmp4 = xpref2d * zcompadi * (0.75 * zcompadi + 0.25 * zcompaph)
+               ztmp5 = xpref2z * zcompaz**2
                ztmptot = ztmp1 + ztmp2 + ztmp3 + ztmp4 + ztmp5 + rtrn
                ztmp1 = ztmp1 / ztmptot
@@ -290 +297 @@
                tra(ji,jj,jk,jpdoc) = tra(ji,jj,jk,jpdoc) + zgradoc
                !
-               IF( ln_ligand ) tra(ji,jj,jk,jplgw) = tra(ji,jj,jk,jplgw) + zgradoc * ldocz
+               IF( ln_ligand ) THEN
+                  tra(ji,jj,jk,jplgw)  = tra(ji,jj,jk,jplgw) + zgradoc * ldocz
+                  zz2ligprod(ji,jj,jk) = zgradoc * ldocz
+               ENDIF
                !
                tra(ji,jj,jk,jpdon) = tra(ji,jj,jk,jpdon) + zgradon
@@ -296 +306 @@
                tra(ji,jj,jk,jpoxy) = tra(ji,jj,jk,jpoxy) - o2ut * zgrarem
                tra(ji,jj,jk,jpfer) = tra(ji,jj,jk,jpfer) + zgraref
+               zfezoo2(ji,jj,jk)   = zgraref
                tra(ji,jj,jk,jpdic) = tra(ji,jj,jk,jpdic) + zgrarem
                tra(ji,jj,jk,jptal) = tra(ji,jj,jk,jptal) + rno3 * zgraren
@@ -351 +362 @@
             CALL iom_put( "PCAL", zw3d )
          ENDIF
+         IF( iom_use( "FEZOO2" ) ) THEN
+            zw3d(:,:,:) = zfezoo2(:,:,:) * 1e9 * 1.e+3 * rfact2r * tmask(:,:,:)   !
+            CALL iom_put( "FEZOO2", zw3d )
+         ENDIF
+         IF( iom_use( "LPRODZ2" ) .AND. ln_ligand )  THEN
+            zw3d(:,:,:) = zz2ligprod(:,:,:) * 1e9 * 1.e+3 * rfact2r * tmask(:,:,:)
+            CALL iom_put( "LPRODZ2"  , zw3d )
+         ENDIF
          CALL wrk_dealloc( jpi, jpj, jpk, zw3d )
       ENDIF
@@ -360 +379 @@
       ENDIF
       !
-      CALL wrk_dealloc( jpi, jpj, jpk, zgrazing )
+      CALL wrk_dealloc( jpi, jpj, jpk, zgrazing, zfezoo2 )
+      IF ( ln_ligand ) CALL wrk_dealloc( jpi, jpj, jpk, zz2ligprod )
       !
       IF( nn_timing == 1 )  CALL timing_stop('p5z_meso')