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

Timestamp:

2019-09-10T11:49:13+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF: fix issue with ice sheet coupling and conservation + other minor changes (ticket #2142)

File:

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

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

@@ -33 +33 @@
    USE isfcpl         ! isf variables
    USE isf            ! isf variables
+   USE isfutils
 
    IMPLICIT NONE
@@ -103 +104 @@
       END IF
 
-      IF ( ln_isfcpl ) THEN
+      IF ( ll_isfcpl ) THEN
+
          IF (lrst_oce) CALL isfcpl_rst_write(kt)
+
       END IF
       !
@@ -181 +184 @@
             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,*) '      Ice shelf load method                   cn_isfload        = ', TRIM(cn_isfload)
          ELSE
             IF ( ln_isfcav ) THEN
@@ -196 +192 @@
          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,*) ''
+
       END IF
       !
@@ -244 +249 @@
       !
       ! terminate routine now if no ice shelf melt formulation specify
-      IF ( .NOT. ln_isf ) RETURN
-      !
-      ! initialisation useful variable
-      r1_Lfusisf =  1._wp / rLfusisf
+      IF ( ln_isf ) THEN
+         !
+         ! initialisation useful variable
+         r1_Lfusisf =  1._wp / rLfusisf
+         !
+         ! initialisation melt in the cavity
+         IF ( ln_isfcav_mlt ) THEN
+            !
+            ! initialisation  of cav variable
+            CALL isf_cav_init()
+            !
+            ! read cav variable from restart
+            IF ( ln_rstart ) CALL isfrst_read('cav', risf_cav_tsc, fwfisf_cav, risf_cav_tsc_b, fwfisf_cav_b)
+            !
+         END IF
+         !
+         !---------------------------------------------------------------------------------------------------------------------
+         ! initialisation parametrised melt
+         IF ( ln_isfpar_mlt ) THEN
+            !
+            ! initialisation  of par variable
+            CALL isf_par_init()
+            !
+            ! read par variable from restart
+            IF ( ln_rstart ) CALL isfrst_read('par', risf_par_tsc, fwfisf_par, risf_par_tsc_b, fwfisf_par_b)
+            !
+         END IF
+      END IF
+      !
+      !---------------------------------------------------------------------------------------------------------------------
+      ! initialisation ice sheet coupling
       !
       ll_isfcpl     = .FALSE.
       ll_isfcpl_cons= .FALSE.
       !
-      ! initialisation melt in the cavity
-      IF ( ln_isfcav_mlt ) THEN
-         !
-         ! initialisation  of cav variable
-         CALL isf_cav_init()
-         !
-         ! read cav variable from restart
-         IF ( ln_rstart ) CALL isfrst_read('cav', risf_cav_tsc, fwfisf_cav, risf_cav_tsc_b, fwfisf_cav_b)
-         !
-      END IF
-      !
-      !---------------------------------------------------------------------------------------------------------------------
-      ! initialisation parametrised melt
-      IF ( ln_isfpar_mlt ) THEN
-         !
-         ! initialisation  of par variable
-         CALL isf_par_init()
-         !
-         ! read par variable from restart
-         IF ( ln_rstart ) CALL isfrst_read('par', risf_par_tsc, fwfisf_par, risf_par_tsc_b, fwfisf_par_b)
-         !
-      END IF
-      !
-      !---------------------------------------------------------------------------------------------------------------------
-      ! initialisation ice sheet coupling
       IF( ln_isfcpl ) THEN