Changeset 15574 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/TOP/PISCES/P4Z/p4zlys.F90

Timestamp:

2021-12-03T20:32:50+01:00 (3 years ago)

Author:

techene

Message:

#2605 #2715 trunk merged into dev_r14318_RK3_stage1

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1

Files:

• . (modified) (1 prop)
• src/TOP/PISCES/P4Z/p4zlys.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14318_RK3_stage1/src/TOP/PISCES/P4Z/p4zlys.F90

@@ -65 +65 @@
       INTEGER  ::   ji, jj, jk, jn
       REAL(wp) ::   zdispot, zrhd, zcalcon
-      REAL(wp) ::   zomegaca, zexcess, zexcess0
+      REAL(wp) ::   zomegaca, zexcess, zexcess0, zkd
       CHARACTER (len=25) ::   charout
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zco3, zcaldiss, zhinit, zhi, zco3sat
@@ -80 +80 @@
 
       CALL solve_at_general( zhinit, zhi, Kbb )
-
-      DO_3D( 1, 1, 1, 1, 1, jpkm1 )
+      DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1)
          zco3(ji,jj,jk) = tr(ji,jj,jk,jpdic,Kbb) * ak13(ji,jj,jk) * ak23(ji,jj,jk) / (zhi(ji,jj,jk)**2   &
             &             + ak13(ji,jj,jk) * zhi(ji,jj,jk) + ak13(ji,jj,jk) * ak23(ji,jj,jk) + rtrn )
@@ -93 +92 @@
       !     ---------------------------------------------------------
 
-      DO_3D( 1, 1, 1, 1, 1, jpkm1 )
+      DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1)
 
          ! DEVIATION OF [CO3--] FROM SATURATION VALUE
@@ -105 +104 @@
          excess(ji,jj,jk) = 1._wp - zomegaca
          zexcess0 = MAX( 0., excess(ji,jj,jk) )
-         zexcess  = zexcess0**nca
 
-         ! AMOUNT CACO3 (12C) THAT RE-ENTERS SOLUTION
-         !       (ACCORDING TO THIS FORMULATION ALSO SOME PARTICULATE
-         !       CACO3 GETS DISSOLVED EVEN IN THE CASE OF OVERSATURATION)
-         zdispot = kdca * zexcess * tr(ji,jj,jk,jpcal,Kbb)
+         IF( zomegaca < 0.8 ) THEN
+            zexcess = zexcess0**nca
+            ! AMOUNT CACO3 THAT RE-ENTERS SOLUTION
+            zdispot = kdca * zexcess * tr(ji,jj,jk,jpcal,Kbb)
+         ELSE
+            zkd = kdca * 0.2**(nca - 0.11)
+            zexcess = zexcess0**0.11
+            zdispot = zkd * zexcess * tr(ji,jj,jk,jpcal,Kbb)
+        ENDIF
+
         !  CHANGE OF [CO3--] , [ALK], PARTICULATE [CACO3],
         !       AND [SUM(CO2)] DUE TO CACO3 DISSOLUTION/PRECIPITATION

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+