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

Timestamp:

2019-08-08T16:02:49+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_nemo : add UKESM ice sheet coupling method (ticket #2142)

File:

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

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

@@ -198 +198 @@
             ! solve the 2nd order equation to find zsfrz
             zaqe  = risf_lamb1 * (zeps1 + zeps3)
-            zaqer = 0.5_wp/MIN(zaqe,-risf_eps)
+            zaqer = 0.5_wp/MIN(zaqe,-zeps)
             zbqe  = zeps1*zeps6+zeps3*zeps7-zeps2
             zcqe  = zeps2*pstbl(ji,jj)
@@ -248 +248 @@
       REAL(wp), DIMENSION(jpi,jpj), INTENT(in   ) :: pstbl               ! salinity in tbl
       !!--------------------------------------------------------------------
-      REAL(wp)                     :: zfwf_fld, zfwf_cpl                 ! total fwf in the forcing fields (pattern) and from the cpl interface (amount)
+      REAL(wp)                     :: zfwf_fld, zfwf_oasis               ! total fwf in the forcing fields (pattern) and from the oasis interface (amount)
       REAL(wp), DIMENSION(jpi,jpj) :: ztfrz                              ! tbl freezing temperature
       REAL(wp), DIMENSION(jpi,jpj) :: zfwf                               ! 2d fwf map after scaling
@@ -266 +266 @@
       !
       ! compute glob sum from atm->oce ice shelf fwf
-      zfwf_cpl = glob_sum('isfcav_mlt', fwfisf_cpl(:,:))
+      zfwf_oasis = glob_sum('isfcav_mlt', fwfisf_oasis(:,:))
       !
       ! scale fwf
-      zfwf(:,:) = zfwf(:,:) * zfwf_cpl / zfwf_fld
+      zfwf(:,:) = zfwf(:,:) * zfwf_oasis / zfwf_fld
       ! 
       ! define fwf and qoce
@@ -281 +281 @@
    !SUBROUTINE isfmlt_3eq_frz_ktm1
    ! compute tfrz based on sfrz value at kt-1 (need to be SAVED local array)
+   ! => should reduce error due to linarisation
    ! compute qfwf (eq 24)
    ! compute zqoce, zqlat, zqcon, zqhc