Changeset 11931 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/tests/ISOMIP+

Timestamp:

2019-11-19T18:30:57+01:00 (4 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_nemo: add comments, improve memory usage of ln_isfcpl_cons option, fix issue in ISOMIP+ configuration

Location:

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

Files:

• isf.F90 (modified) (3 diffs)
• isfstp.F90 (modified) (1 diff)
• sbcfwb.F90 (modified) (1 diff)

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

@@ -22 +22 @@
    PRIVATE
 
-   PUBLIC   isf_alloc, isf_alloc_par, isf_alloc_cav, isf_alloc_cpl
+   PUBLIC   isf_alloc, isf_alloc_par, isf_alloc_cav, isf_alloc_cpl, isf_dealloc_cpl
    !
    !-------------------------------------------------------
@@ -175 +175 @@
       !!                  ***  ROUTINE isf_alloc_cpl  ***
       !!
-      !! ** Purpose : 
-      !!
-      !! ** Method  : 
+      !! ** Purpose : allocate array use for the ice sheet coupling
       !!
       !!----------------------------------------------------------------------
@@ -202 +200 @@
    END SUBROUTINE isf_alloc_cpl
 
+   SUBROUTINE isf_dealloc_cpl()
+      !!---------------------------------------------------------------------
+      !!                  ***  ROUTINE isf_dealloc_cpl  ***
+      !!
+      !! ** Purpose : de-allocate useless public 3d array used for ice sheet coupling
+      !!
+      !!----------------------------------------------------------------------
+      INTEGER :: ierr, ialloc
+      !!----------------------------------------------------------------------
+      ierr = 0
+      !
+      DEALLOCATE( risfcpl_ssh, risfcpl_tsc, risfcpl_vol, STAT=ialloc )
+      ierr = ierr + ialloc
+      !
+      CALL mpp_sum ( 'isf', ierr )
+      IF( ierr /= 0 )   CALL ctl_stop('STOP','isfcpl: failed to deallocate arrays.')
+      !
+   END SUBROUTINE isf_dealloc_cpl
+
    SUBROUTINE isf_alloc()
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE isf_alloc  ***
       !!
-      !! ** Purpose : 
-      !!
-      !! ** Method  : 
+      !! ** Purpose : allocate array used for the ice shelf cavity (cav and par)
       !!
       !!----------------------------------------------------------------------

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

@@ -97 +97 @@
       END IF
       !
-      IF ( ln_isfcpl .AND. lrst_oce ) CALL isfcpl_rst_write(kt)
+      IF ( ln_isfcpl ) THEN
+         ! after step nit000 + 2 we do not need anymore the risfcpl_ arrays
+         IF ( kt == nit000 + 2 ) CALL isf_dealloc_cpl()
+
+         IF ( lrst_oce ) CALL isfcpl_rst_write(kt)
+      END IF
       !
       IF( ln_timing )   CALL timing_stop('isf')

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

@@ -118 +118 @@
          IF( MOD( kt-1, kn_fsbc ) == 0 ) THEN
             z_fwf = glob_sum( 'sbcfwb',  e1e2t(:,:) * ( emp(:,:) - rnf(:,:) + fwfisf_cav(:,:) + fwfisf_par(:,:) - snwice_fmass(:,:) ) )
+            !
+            ! correction for ice sheet coupling testing (ie remove the excess through the surface)
+            ! test impact on the melt as conservation correction made in depth
+            ! test conservation level as sbcfwb is conserving
+            ! avoid the model to blow up for large ssh drop (isomip OCEAN3 with melt switch off and uniform T/S)
+            IF (ln_isfcpl .AND. ln_isfcpl_cons) THEN
+               z_fwf = z_fwf + glob_sum( 'sbcfwb',  e1e2t(:,:) * risfcpl_cons_ssh(:,:) * rau0 )
+            END IF
+            !
             z_fwf = z_fwf / area
             zcoef = z_fwf * rcp
-            emp(:,:) = emp(:,:) - z_fwf            * tmask(:,:,1) ! (Eq. 34 AD2015)
-            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
+            emp(:,:) = emp(:,:) - z_fwf              * tmask(:,:,1) ! (Eq. 34 AD2015)
+            qns(:,:) = qns(:,:) + zcoef * sst_m(:,:) * tmask(:,:,1) ! (Eq. 35 AD2015) ! use sst_m to avoid generation of any bouyancy fluxes
+            sfx(:,:) = sfx(:,:) + z_fwf * sss_m(:,:) * tmask(:,:,1) ! (Eq. 36 AD2015) ! use sss_m to avoid generation of 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
+            !qns(:,:) = qns(:,:) + zcoef * ( -1.0 ) * tmask(:,:,1) ! use for ISOMIP+ coupling sanity check (keep ssh cst while playing with cpl conservation option)
+            !sfx(:,:) = sfx(:,:) + z_fwf * ( 34.2 ) * tmask(:,:,1) ! use for ISOMIP+ coupling sanity check (keep ssh cst while playing with cpl conservation option)
          ENDIF
          !