Changeset 14141

Timestamp:

2020-12-09T17:00:01+01:00 (3 years ago)

Author:

techene

Message:

#2385 and #2480 : revise check compatibilities

File:

• NEMO/trunk/src/OCE/DYN/dynhpg.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/DYN/dynhpg.F90

@@ -183 +183 @@
       ENDIF
       !
-      IF( .NOT.ln_linssh .AND. .NOT.(ln_hpg_sco.OR.ln_hpg_prj.OR.ln_hpg_isf.OR.ln_hpg_djc) )          &
-         &   CALL ctl_stop('dyn_hpg_init : non-linear free surface requires either ',   &
-         &                 '   the standard jacobian formulation hpg_sco    or '    ,   &
-         &                 '   the pressure jacobian formulation hpg_prj'             )
-         !
+      IF( .NOT.ln_linssh .AND. (ln_hpg_zco.OR.ln_hpg_zps) )   &
+         &   CALL ctl_stop( 'dyn_hpg_init : non-linear free surface incompatible with hpg_zco or hpg_zps' )
+      !
+      IF( .NOT. (ln_hpg_isf.AND.ln_isfcav) )                  &
+         &   CALL ctl_stop( 'dyn_hpg_init : ln_hpg_isf=T requires ln_isfcav=T and vice versa' )  
+      !
+#if defined key_qco
       IF( ln_hpg_isf ) THEN
-         IF( .NOT. ln_isfcav )   CALL ctl_stop( ' hpg_isf not available if ln_isfcav = false ' )
-       ELSE
-         IF(       ln_isfcav )   CALL ctl_stop( 'Only hpg_isf has been corrected to work with ice shelf cavity.' )
+         CALL ctl_stop( 'dyn_hpg_init : key_qco and ln_hpg_isf not yet compatible' )
       ENDIF
+#endif
       !
       !                               ! Set nhpg from ln_hpg_... flags & consistency check
@@ -239 +240 @@
          END IF
       END IF
+      !
    END SUBROUTINE dyn_hpg_init