Changeset 11541 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/TRA

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)

Location:

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/TRA

Files:

• traisf.F90 (modified) (1 diff)
• tranxt.F90 (modified) (2 diffs)

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

@@ -48 +48 @@
       IF( ln_timing )   CALL timing_start('tra_isf')
       !
-      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
+      ! 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)
       !
       ! ice sheet coupling case
-      IF ( ll_isfcpl ) THEN
+      IF ( ln_isfcpl ) THEN
          !
-         IF ( kt == nit000 ) CALL tra_isf_cpl(risfcpl_tsc, tsa)
+         IF ( kt == nit000  ) CALL tra_isf_cpl(risfcpl_tsc       , tsa)
+         IF ( kt == nit000+1) CALL tra_isf_cpl(risfcpl_tsc*0.5_wp, tsa)
          !
          ! ensure 0 trend due to unconservation of the ice shelf coupling
-         IF ( ll_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa)
+         IF ( ln_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa)
          !
       END IF

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

@@ -340 +340 @@
                   ! ice shelf
                   IF( ll_isf ) THEN
+                     !
                      IF ( ln_isfcav_mlt ) THEN
                         ! level fully include in the Losch_2008 ice shelf boundary layer
@@ -372 +373 @@
                         END IF
                      END IF
+                     !
+                     IF (ln_isfcpl .AND. ln_rstart .AND. kt == nit000+1 ) THEN    ! risfcpl_vol_n = 0 and risfcpl_vol_b = risfcpl_vol
+                        ztc_f  = ztc_f  + zfact1 * risfcpl_tsc(ji,jj,jk,jn) * r1_e1e2t(ji,jj)
+                        ze3t_f = ze3t_f - zfact1 * risfcpl_vol(ji,jj,jk   ) * r1_e1e2t(ji,jj)
+                     END IF
+                     !
                   END IF
                   !