Changeset 14995 for NEMO/trunk/src/OCE/ISF/isfstp.F90

Timestamp:

2021-06-15T19:15:26+02:00 (3 years ago)

Author:

mathiot

Message:

ticket #2669 : merge ticket2669_isf_fluxes into trunk

File:

• NEMO/trunk/src/OCE/ISF/isfstp.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/ISF/isfstp.F90

@@ -262 +262 @@
       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)
@@ -301 +293 @@
          &             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
       !!----------------------------------------------------------------------
       !