Changeset 11541 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfhdiv.F90

Timestamp:

2019-09-12T18:41:17+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF: simplify use of ln_isf, add extra comments + minor changes (ticket #2142)

File:

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

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

@@ -20 +20 @@
       !!                  ***  SUBROUTINE isf_hdiv  ***
       !!       
-      !! ** Purpose :   
+      !! ** Purpose :   update the horizontal divergence with the ice shelf contribution
+      !!                (parametrisation, explicit, ice sheet coupling conservation
+      !!                 increment)
       !!
-      !! ** Method  :   
-      !!
-      !! ** Action  :   phdiv   decreased by the fwf inflow (isf melt in this case)
       !!----------------------------------------------------------------------
       REAL(wp), DIMENSION(:,:,:), INTENT( inout ) ::   phdiv   ! horizontal divergence
@@ -38 +37 @@
          IF ( ln_isfpar_mlt ) CALL isf_hdiv_mlt(misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, fwfisf_par, fwfisf_par_b, phdiv)
          !
-      END IF
-      !
-      ! ice sheet coupling contribution (if conservation needed)
-      IF ( ll_isfcpl ) THEN
          !
-         ! correct divergence only for the first time step
-         IF ( kt == nit000 ) CALL isf_hdiv_cpl(risfcpl_vol, phdiv)
-         !
-         ! correct divergence every time step to remove any trend due to coupling
-         IF ( ll_isfcpl_cons ) CALL isf_hdiv_cpl(risfcpl_cons_vol, phdiv)
+         ! ice sheet coupling contribution 
+         IF ( ln_isfcpl ) THEN
+            !
+            ! correct divergence only for the first time step
+            IF ( kt == nit000   ) CALL isf_hdiv_cpl(risfcpl_vol       , phdiv)
+            IF ( kt == nit000+1 ) CALL isf_hdiv_cpl(risfcpl_vol*0.5_wp, phdiv)
+            !
+            ! correct divergence every time step to remove any trend due to coupling
+            ! conservation option
+            IF ( ln_isfcpl_cons ) CALL isf_hdiv_cpl(risfcpl_cons_vol, phdiv)
+            !
+         END IF
          !
       END IF
@@ -57 +59 @@
       !!                  ***  SUBROUTINE sbc_isf_div  ***
       !!       
-      !! ** Purpose :   update the horizontal divergence with the runoff inflow
+      !! ** Purpose :   update the horizontal divergence with the ice shelf inflow
       !!
-      !! ** Method  :   
-      !!                CAUTION : risf_tsc(:,:,jp_sal) is negative (outflow) increase the 
-      !!                          divergence and expressed in m/s
+      !! ** Method  :   pfwf is positive (outflow) and expressed as kg/m2/s
+      !!                increase the divergence
       !!
-      !! ** Action  :   phdivn   decreased by the runoff inflow
+      !! ** Action  :   phdivn   increased by the ice shelf outflow
       !!----------------------------------------------------------------------
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: phdiv
@@ -73 +74 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       INTEGER  ::   ikt, ikb 
-      REAL(wp), DIMENSION(jpi,jpj) :: zqvol,ztmp
+      REAL(wp), DIMENSION(jpi,jpj) :: zhdiv
       !!----------------------------------------------------------------------
       !
@@ -79 +80 @@
       !
       ! compute integrated divergence correction
-      zqvol(:,:) = 0.5_wp * ( pfwf(:,:) + pfwf_b(:,:) ) * r1_rau0 / phtbl(:,:)
+      zhdiv(:,:) = 0.5_wp * ( pfwf(:,:) + pfwf_b(:,:) ) * r1_rau0 / phtbl(:,:)
       !
       ! update divergence at each level affected by ice shelf top boundary layer
@@ -88 +89 @@
             ! level fully include in the ice shelf boundary layer
             DO jk = ikt, ikb - 1
-               phdiv(ji,jj,jk) = phdiv(ji,jj,jk) + zqvol(ji,jj)
+               phdiv(ji,jj,jk) = phdiv(ji,jj,jk) + zhdiv(ji,jj)
             END DO
             ! level partially include in ice shelf boundary layer 
-            phdiv(ji,jj,ikb) = phdiv(ji,jj,ikb) + zqvol(ji,jj) * pfrac(ji,jj)
+            phdiv(ji,jj,ikb) = phdiv(ji,jj,ikb) + zhdiv(ji,jj) * pfrac(ji,jj)
          END DO
       END DO
@@ -101 +102 @@
       !!                  ***  SUBROUTINE isf_hdiv_cpl  ***
       !!       
-      !! ** Purpose :   
+      !! ** Purpose :   update the horizontal divergence with the ice shelf 
+      !!                coupling conservation increment
       !!
-      !! ** Method  :   
+      !! ** Method  :   pqvol is positive (outflow) and expressed as m3/s
+      !!                increase the divergence
       !!
-      !! ** Action  :  
+      !! ** Action  :   phdivn   increased by the ice shelf outflow
+      !!
       !!----------------------------------------------------------------------
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: phdiv