Changeset 8115


Ignore:
Timestamp:
2017-06-01T17:45:57+02:00 (3 years ago)
Author:
jcastill
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

    r8109 r8115  
    10841084      IF( nn_z0_met == 3 .AND. .NOT.ln_rough ) CALL ctl_stop( 'zdf_gls_init: nn_z0_met=3 requires ln_rough=T' )  
    10851085      IF( nn_z0_met .NE. 3 .AND. ln_rough ) THEN 
    1086          CALL ctl_stop('E R R O R:  ln_rough=.TRUE. but nn_z0_met is not 3') 
     1086         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')  
     1087         nn_z0_met = 3  
    10871088      ENDIF 
    10881089      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' )  
Note: See TracChangeset for help on using the changeset viewer.