Changeset 11521 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/TRA/traisf.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/TRA/traisf.F90 (modified) (3 diffs)

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

@@ -48 +48 @@
       IF( ln_timing )   CALL timing_start('tra_sbc')
       !
-      ! cavity case
-      IF ( ln_isfcav_mlt ) CALL tra_isf_mlt(misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav, risf_cav_tsc, risf_cav_tsc_b, tsa)
-      !
-      ! parametrisation case
-      IF ( ln_isfpar_mlt ) CALL tra_isf_mlt(misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, risf_par_tsc, risf_par_tsc_b, tsa)
+      IF (ln_isf) THEN
+         !
+         ! cavity case
+         IF ( ln_isfcav_mlt ) CALL tra_isf_mlt(misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav, risf_cav_tsc, risf_cav_tsc_b, tsa)
+         !
+         ! parametrisation case
+         IF ( ln_isfpar_mlt ) CALL tra_isf_mlt(misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, risf_par_tsc, risf_par_tsc_b, tsa)
+         !
+      END IF
       !
       ! ice sheet coupling case
-      IF ( ll_isfcpl .AND. kt == nit000 ) CALL tra_isf_cpl(risfcpl_tsc, tsa)
-      !
-      ! ice sheet coupling case (
-      IF ( ll_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa)
+      IF ( ll_isfcpl ) THEN
+         !
+         IF ( kt == nit000 ) CALL tra_isf_cpl(risfcpl_tsc, tsa)
+         !
+         ! ensure 0 trend due to unconservation of the ice shelf coupling
+         IF ( ll_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa)
+         !
+      END IF
       !
       IF( ln_timing )   CALL timing_stop('tra_isf')
@@ -95 +103 @@
             !
             ! level fully include in the ice shelf boundary layer
-            ! sign - because fwf sign of evapo (rnf sign of precip)
             DO jk = ikt, ikb - 1
                pts(ji,jj,jk,jp_tem) = pts(ji,jj,jk,jp_tem) + ztc(ji,jj)
@@ -117 +124 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(inout) :: ptsa
       !!----------------------------------------------------------------------
-      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(in   ) :: ptsc  !( >0 out )
+      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(in   ) :: ptsc
       !!----------------------------------------------------------------------
       INTEGER :: jk