Changeset 11541 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfstp.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/isfstp.F90 (modified) (8 diffs)

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

@@ -75 +75 @@
          !
          ! compute tbl lvl/h
+         rhisf_tbl_cav(:,:) = rn_htbl * mskisf_cav(:,:)
          CALL isf_tbl_lvl(ht_n, e3t_n, misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav)
          !
@@ -94 +95 @@
          !
          ! compute misfkb, rhisf_tbl, rfrac (deepest level, thickness, fraction of deepest cell affected by tbl)
+         rhisf_tbl_par(:,:) = rhisf0_tbl_par(:,:)
          CALL isf_tbl_lvl(ht_n, e3t_n, misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par)
          !
@@ -140 +142 @@
       CALL isf_alloc()
       !
+      ! initalisation of fwf and tsc array to 0
       riceload(:,:)       = 0.0_wp
       fwfisf_oasis(:,:)   = 0.0_wp
@@ -166 +169 @@
          IF ( ln_isf ) THEN
             WRITE(numout,*) '      melt inside the cavity                  ln_isfcav_mlt   = ', ln_isfcav_mlt
-            IF ( ln_isfcav ) THEN
+            IF ( ln_isfcav_mlt) THEN
                WRITE(numout,*) '         melt formulation                        cn_isfcav_mlt   = ', TRIM(cn_isfcav_mlt)
                WRITE(numout,*) '         thickness of the top boundary layer     rn_htbl     = ', rn_htbl
@@ -184 +187 @@
             WRITE(numout,*) ''
             !
+            WRITE(numout,*) '      Coupling to an ice sheet model          ln_isfcpl        = ', ln_isfcpl
+            IF ( ln_isfcpl ) THEN
+               WRITE(numout,*) '         conservation activated ln_isfcpl_cons           = ', ln_isfcpl_cons
+               WRITE(numout,*) '            number of call of the extrapolation loop = ', nn_drown
+            ENDIF
+            WRITE(numout,*) ''
+            !
          ELSE
+
             IF ( ln_isfcav ) THEN
                WRITE(numout,*) ''
@@ -192 +203 @@
          END IF
 
-         WRITE(numout,*) '      Coupling to an ice sheet model          ln_isfcpl         = ', ln_isfcpl
-         IF ( ln_isfcpl ) THEN
-            WRITE(numout,*) '         conservation activated ln_isfcpl_cons           = ', ln_isfcpl_cons
-            WRITE(numout,*) '            number of call of the extrapolation loop = ', nn_drown
-         ENDIF
-         !
          IF (ln_isfcav) WRITE(numout,*) '      Ice shelf load method                   cn_isfload        = ', TRIM(cn_isfload)
          WRITE(numout,*) ''
@@ -251 +256 @@
       IF ( ln_isf ) THEN
          !
-         ! initialisation useful variable
-         r1_Lfusisf =  1._wp / rLfusisf
-         !
+         !---------------------------------------------------------------------------------------------------------------------
          ! initialisation melt in the cavity
          IF ( ln_isfcav_mlt ) THEN
@@ -276 +279 @@
             !
          END IF
-      END IF
-      !
-      !---------------------------------------------------------------------------------------------------------------------
-      ! initialisation ice sheet coupling
-      !
-      ll_isfcpl     = .FALSE.
-      ll_isfcpl_cons= .FALSE.
-      !
-      IF( ln_isfcpl ) THEN
-
-         ! prepare writing restart
-         IF( lwxios ) CALL iom_set_rstw_var_active('ssmask')
-         IF( lwxios ) CALL iom_set_rstw_var_active('tmask')
-         !IF( lwxios ) CALL iom_set_rstw_var_active('wmask')
-         !IF( lwxios ) CALL iom_set_rstw_var_active('gdepw_n')
-         IF( lwxios ) CALL iom_set_rstw_var_active('e3t_n')
-         IF( lwxios ) CALL iom_set_rstw_var_active('e3u_n')
-         IF( lwxios ) CALL iom_set_rstw_var_active('e3v_n')
-
-         IF( ln_rstart ) THEN
-            !
-            ll_isfcpl = .TRUE.
-            !
-            CALL isf_alloc_cpl()
-            !
-            ! extrapolation tracer properties
-            CALL isfcpl_tra()
-            !
-            ! correction of the horizontal divergence and associated temp. and salt content flux
-            CALL isfcpl_vol()
-            !
-            ! apply the 'conservation' method
-            IF ( ln_isfcpl_cons )  THEN
-               ll_isfcpl_cons = .TRUE.
-               CALL isfcpl_cons()
+         !
+         !---------------------------------------------------------------------------------------------------------------------
+         ! initialisation ice sheet coupling
+         IF( ln_isfcpl ) THEN
+            ! 
+            ! prepare writing restart
+            IF( lwxios ) CALL iom_set_rstw_var_active('ssmask')
+            IF( lwxios ) CALL iom_set_rstw_var_active('tmask')
+            IF( lwxios ) CALL iom_set_rstw_var_active('e3t_n')
+            IF( lwxios ) CALL iom_set_rstw_var_active('e3u_n')
+            IF( lwxios ) CALL iom_set_rstw_var_active('e3v_n')
+            !
+            IF( ln_rstart ) THEN
+               !
+               CALL isf_alloc_cpl()
+               !
+               ! extrapolation tracer properties
+               CALL isfcpl_tra()
+               !
+               ! correction of the horizontal divergence and associated temp. and salt content flux
+               CALL isfcpl_vol()
+               !
+               ! apply the 'conservation' method
+               IF ( ln_isfcpl_cons ) CALL isfcpl_cons()
+               !
+               ! Need to : - include in the cpl cons the risfcpl_vol/tsc contribution
+               !           - decide how to manage thickness level change in conservation
+               !
+               tsb    (:,:,:,:) = tsn (:,:,:,:)
+               sshb   (:,:)     = sshn(:,:)
+               ub     (:,:,:)   = un(:,:,:)
+               vb     (:,:,:)   = vn(:,:,:)
+               !
             END IF
             !
-            ! Need to include in the cpl cons the isfrst_cpl_div contribution
-            ! decide how to manage thickness level change in conservation
-            !
-            tsb    (:,:,:,:) = tsn (:,:,:,:)
-            sshb   (:,:)     = sshn(:,:)
-            !
-         END IF
+         END IF
+         !
       END IF