Changeset 15574 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfstp.F90

Timestamp:

2021-12-03T20:32:50+01:00 (3 years ago)

Author:

techene

Message:

#2605 #2715 trunk merged into dev_r14318_RK3_stage1

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1

Files:

• . (modified) (1 prop)
• src/OCE/ISF/isfstp.F90 (modified) (3 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfstp.F90

@@ -195 +195 @@
          !
          IF ( ln_isf ) THEN
-#if key_qco
-# if ! defined key_isf
-            CALL ctl_stop( 'STOP', 'isf_ctl: ice shelf requires both ln_isf=T AND key_isf activated' )
-# endif
+#if key_qco 
+# if ! defined key_isf 
+            CALL ctl_stop( 'STOP', 'isf_ctl: ice shelf requires both ln_isf=T AND key_isf activated' ) 
+# endif 
 #endif
             WRITE(numout,*) '      Add debug print in isf module           ln_isfdebug     = ', ln_isfdebug
@@ -267 +267 @@
       IF ( l_isfoasis .AND. ln_isf ) THEN
          !
-         CALL ctl_stop( 'namelist combination ln_cpl and ln_isf not tested' )
-         !
          ! NEMO coupled to ATMO model with isf cavity need oasis method for melt computation 
          IF ( ln_isfcav_mlt .AND. TRIM(cn_isfcav_mlt) /= 'oasis' ) CALL ctl_stop( 'cn_isfcav_mlt = oasis is the only option availble if fwf send by oasis' )
          IF ( ln_isfpar_mlt .AND. TRIM(cn_isfpar_mlt) /= 'oasis' ) CALL ctl_stop( 'cn_isfpar_mlt = oasis is the only option availble if fwf send by oasis' )
-         !
-         ! oasis melt computation not tested (coded but not tested)
-         IF ( ln_isfcav_mlt .OR. ln_isfpar_mlt ) THEN
-            IF ( TRIM(cn_isfcav_mlt) == 'oasis' ) CALL ctl_stop( 'cn_isfcav_mlt = oasis not tested' )
-            IF ( TRIM(cn_isfpar_mlt) == 'oasis' ) CALL ctl_stop( 'cn_isfpar_mlt = oasis not tested' )
-         END IF
          !
          ! oasis melt computation with cavity open and cavity parametrised (not coded)
@@ -306 +298 @@
          &             sn_isfpar_zmin, sn_isfpar_zmax, sn_isfpar_Leff,                           &
          &             ln_isfcpl     , nn_drown      , ln_isfcpl_cons, ln_isfdebug,              &
-         &             cn_isfload    , rn_isfload_T  , rn_isfload_S  , cn_isfdir
+         &             cn_isfload    , rn_isfload_T  , rn_isfload_S  , cn_isfdir  ,              &
+         &             rn_isfpar_bg03_gt0
       !!----------------------------------------------------------------------
       !

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+