Changeset 11494 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcavmlt.F90

Timestamp:

2019-09-03T12:46:35+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF: switch on isf param in WED025 and fix bugs in isf param code + cosmetic changes (ticket #2142)

File:

• NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcavmlt.F90 (modified) (2 diffs)

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcavmlt.F90

@@ -42 +42 @@
       !!----------------------------------------------------------------------
       !!
-      !! ** Purpose    : compute ice shelf fwf/heqt fluxes 
+      !! ** Purpose    : compute or read ice shelf fwf/heat fluxes in the ice shelf cavity
       !!
       !!---------------------------------------------------------------------
@@ -189 +189 @@
             !
             ! compute coeficient to solve the 2nd order equation
-            zeps1 = rau0_rcp*pgt(ji,jj)
-            zeps2 = rLfusisf*rau0*pgs(ji,jj)
-            zeps3 = rhoisf*rcpisf*rkappa/MAX(risfdep(ji,jj),zeps)
-            zeps4 = risf_lamb2+risf_lamb3*risfdep(ji,jj)
-            zeps6 = zeps4-pttbl(ji,jj)
-            zeps7 = zeps4-rtsurf
+            zeps1 = rau0_rcp * pgt(ji,jj)
+            zeps2 = rLfusisf * rau0 * pgs(ji,jj)
+            zeps3 = rhoisf * rcpisf * rkappa / MAX(risfdep(ji,jj),zeps)
+            zeps4 = risf_lamb2 + risf_lamb3 * risfdep(ji,jj)
+            zeps6 = zeps4 - pttbl(ji,jj)
+            zeps7 = zeps4 - rtsurf
             !
             ! solve the 2nd order equation to find zsfrz
             zaqe  = risf_lamb1 * (zeps1 + zeps3)
-            zaqer = 0.5_wp/MIN(zaqe,-zeps)
-            zbqe  = zeps1*zeps6+zeps3*zeps7-zeps2
-            zcqe  = zeps2*pstbl(ji,jj)
-            zdis  = zbqe*zbqe-4.0_wp*zaqe*zcqe               
+            zaqer = 0.5_wp / MIN(zaqe,-zeps)
+            zbqe  = zeps1 * zeps6 + zeps3 * zeps7 - zeps2
+            zcqe  = zeps2 * pstbl(ji,jj)
+            zdis  = zbqe * zbqe - 4.0_wp * zaqe * zcqe               
             !
             ! Presumably zdis can never be negative because gammas is very small compared to gammat
-            zsfrz=(-zbqe-SQRT(zdis))*zaqer
-            IF ( zsfrz < 0.0_wp ) zsfrz=(-zbqe+SQRT(zdis))*zaqer  ! check this if this if is needed
+            zsfrz=(-zbqe - SQRT(zdis)) * zaqer
+            IF ( zsfrz < 0.0_wp ) zsfrz=(-zbqe + SQRT(zdis)) * zaqer  ! check this if this if is needed
             !
             ! compute t freeze (eq. 25)