Ignore:
Timestamp:
2015-03-02T20:34:59+01:00 (6 years ago)
Author:
mathiot
Message:

restore e3t/w definition as before merge in domzgr + zpshde if ln_isfcav = false

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

    r5111 r5114  
    168168                           & the pressure jacobian formulation hpg_prj') 
    169169 
    170       IF( ln_hpg_isf .AND. .NOT. ln_isfcav )   & 
    171            &   CALL ctl_stop( ' hpg_isf not available is ln_isfcav = false ' ) 
     170      IF(       ln_hpg_isf .AND. .NOT. ln_isfcav )   & 
     171         &   CALL ctl_stop( ' hpg_isf not available if ln_isfcav = false ' ) 
     172      IF( .NOT. ln_hpg_isf .AND.       ln_isfcav )   & 
     173         &   CALL ctl_stop( 'Only hpg_isf has been corrected to work with ice shelf cavity.' ) 
    172174      ! 
    173175      !                               ! Set nhpg from ln_hpg_... flags 
     
    188190      IF( ln_hpg_isf )   ioptio = ioptio + 1 
    189191      IF( ioptio /= 1 )   CALL ctl_stop( 'NO or several hydrostatic pressure gradient options used' ) 
    190       IF( ( .NOT. ln_hpg_isf ) .AND. ln_isfcav )   & 
    191           &  CALL ctl_stop( 'Only hpg_isf has been corrected to work with ice shelf cavity.' ) 
    192192      !  
    193193      ! initialisation of ice load 
Note: See TracChangeset for help on using the changeset viewer.