Changeset 11908 for NEMO/branches

Timestamp:

2019-11-14T20:20:07+01:00 (4 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_nemo: fix issue initialisation after ice sheet coupling step

Location:

NEMO/branches/2019/ENHANCE-02_ISF_nemo

Files:

• cfgs/SHARED/field_def_nemo-oce.xml (modified) (1 diff)
• src/OCE/ISF/isfcpl.F90 (modified) (3 diffs)
• src/OCE/TRA/traisf.F90 (modified) (1 diff)
• tests/ISOMIP+/MY_SRC/isfstp.F90 (modified) (1 diff)
• tests/ISOMIP+/MY_SRC/sbcfwb.F90 (modified) (2 diffs)

NEMO/branches/2019/ENHANCE-02_ISF_nemo/cfgs/SHARED/field_def_nemo-oce.xml

@@ -264 +264 @@
 
           <!-- * variable related to ice shelf forcing * -->
-          <field id="isfdebug3d2"                                                                                grid_ref="grid_T_3D" />
-          <field id="isfdebug3d1"                                                                                grid_ref="grid_T_3D" />
-          <field id="isfdebug2d"                                                                                />
+          <field id="isftfrz_par"     long_name="fzp temperature at ocean/isf interface"        unit="degC"     />
+          <field id="isftfrz_cav"     long_name="fzp temperature at ocean/isf interface"        unit="degC"     />
           <field id="fwfisf_cav"      long_name="Ice shelf melting"                             unit="kg/m2/s"  />
           <field id="fwfisf_par"      long_name="Ice shelf melting"                             unit="kg/m2/s"  />

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

@@ -61 +61 @@
       ! check presence of variable needed for coupling
       ! iom_varid return 0 if not found
-      id = 0
+      id = 1
       id = id * iom_varid(numror, 'ssmask', ldstop = .false.)
       id = id * iom_varid(numror, 'tmask' , ldstop = .false.)
@@ -145 +145 @@
       !!----------------------------------------------------------------------
       !!
-      INTEGER :: ji, jj, jd          !! loop index
+      INTEGER :: ji, jj, jd, jk      !! loop index
       INTEGER :: jip1, jim1, jjp1, jjm1
       !!
@@ -195 +195 @@
       !
       ! recompute the vertical scale factor, depth and water thickness
+      IF(lwp) write(numout,*) 'isfcpl_ssh : recompute scale factor from sshn (new wet cell)'
+      IF(lwp) write(numout,*) '~~~~~~~~~~~'
+      DO jk = 1, jpk
+         e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:) ) &
+             &                          / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk)   &
+             &          + e3t_0(:,:,jk)                               * (1._wp -tmask(:,:,jk))
+      END DO
+      e3t_b(:,:,:) = e3t_n(:,:,:)
       CALL dom_vvl_zgr()
       !

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/TRA/traisf.F90

@@ -68 +68 @@
          ! ensure 0 trend due to unconservation of the ice shelf coupling
          IF ( ln_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa)
+
+         IF ( ln_isfdebug ) THEN
+            CALL debug('tra_isf: risfcpl_tsc T',risfcpl_tsc(:,:,1))
+            CALL debug('tra_isf: risfcpl_tsc S',risfcpl_tsc(:,:,2))
+         END IF
          !
       END IF
       !
       IF ( ln_isfdebug ) THEN
-         CALL debug('tra_isf: risfcpl_tsc T',risfcpl_tsc(:,:,1))
-         CALL debug('tra_isf: risfcpl_tsc S',risfcpl_tsc(:,:,2))
          CALL debug('tra_isf: tsa T'        ,tsa(:,:,:,1))
          CALL debug('tra_isf: tsa S'        ,tsa(:,:,:,2))

NEMO/branches/2019/ENHANCE-02_ISF_nemo/tests/ISOMIP+/MY_SRC/isfstp.F90

@@ -145 +145 @@
          !---------------------------------------------------------------------------------------------------------------------
          ! initialisation ice sheet coupling
-         IF( ln_isfcpl ) CALL isfcpl_init()
+         IF ( ln_isfcpl ) CALL isfcpl_init()
          !
       END IF

NEMO/branches/2019/ENHANCE-02_ISF_nemo/tests/ISOMIP+/MY_SRC/sbcfwb.F90

@@ -84 +84 @@
             IF( kn_fwb == 2 )   WRITE(numout,*) '          adjusted from previous year budget'
             IF( kn_fwb == 3 )   WRITE(numout,*) '          fwf set to zero and spread out over erp area'
+            IF( kn_fwb == 4 )   WRITE(numout,*) '          instantaneously set to zero with heat and salt flux correction (ISOMIP+)'
          ENDIF
          !
@@ -120 +121 @@
             zcoef = z_fwf * rcp
             emp(:,:) = emp(:,:) - z_fwf            * tmask(:,:,1) ! (Eq. 34 AD2015)
-            qns(:,:) = qns(:,:) + zcoef * ( -1.9 ) * tmask(:,:,1) ! (Eq. 35 AD2015) ! could be sst_m if we don't want any bouyancy fluxes
-            sfx(:,:) = sfx(:,:) + z_fwf * ( 33.8 ) * tmask(:,:,1) ! (Eq. 36 AD2015) ! could be sss_m if we don't want any bouyancy fluxes
+            qns(:,:) = qns(:,:) + zcoef * sst_m(:,:) * tmask(:,:,1) ! (Eq. 35 AD2015) ! could be sst_m if we don't want any bouyancy fluxes
+            sfx(:,:) = sfx(:,:) + z_fwf * sss_m(:,:) * tmask(:,:,1) ! (Eq. 36 AD2015) ! could be sss_m if we don't want any bouyancy fluxes
+            !qns(:,:) = qns(:,:) + zcoef * ( -1.9 ) * tmask(:,:,1) ! (Eq. 35 AD2015) ! could be sst_m if we don't want any bouyancy fluxes
+            !sfx(:,:) = sfx(:,:) + z_fwf * ( 33.8 ) * tmask(:,:,1) ! (Eq. 36 AD2015) ! could be sss_m if we don't want any bouyancy fluxes
          ENDIF
          !