Changeset 8115

Timestamp:

2017-06-01T17:45:57+02:00 (7 years ago)

Author:

jcastill

Message:

Revert previous change, as the error that it tried to fix was caused by another unrelated cause

File:

• branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (1 diff)

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -1084 +1084 @@
       IF( nn_z0_met == 3 .AND. .NOT.ln_rough ) CALL ctl_stop( 'zdf_gls_init: nn_z0_met=3 requires ln_rough=T' ) 
       IF( nn_z0_met .NE. 3 .AND. ln_rough ) THEN
-         CALL ctl_stop('E R R O R:  ln_rough=.TRUE. but nn_z0_met is not 3')
+         CALL ctl_warn('W A R N I N G:  ln_rough=.TRUE. but nn_z0_met is not 3 - resetting nn_z0_met to 3') 
+         nn_z0_met = 3 
       ENDIF
       IF( nn_stab_func  < 0 .OR. nn_stab_func  > 3 ) CALL ctl_stop( 'zdf_gls_init: bad flag: nn_stab_func is 0, 1, 2 and 3' )