Changeset 3284


Ignore:
Timestamp:
2012-01-27T14:21:11+01:00 (9 years ago)
Author:
rblod
Message:

Correct control if no diffusion, see ticket #835

Location:
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90

    r3186 r3284  
    150150      IF( ln_dynldf_hor   )   ioptio = ioptio + 1 
    151151      IF( ln_dynldf_iso   )   ioptio = ioptio + 1 
    152       IF( ioptio /= 1 ) CALL ctl_stop( '          use only ONE direction (level/hor/iso)' ) 
     152      IF( ioptio > 1 ) CALL ctl_stop( '          use only ONE direction (level/hor/iso)' ) 
    153153 
    154154      !                                   ! Set nldf, the type of lateral diffusion, from ln_dynldf_... logicals 
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90

    r3186 r3284  
    163163      IF( ln_traldf_hor   )   ioptio = ioptio + 1 
    164164      IF( ln_traldf_iso   )   ioptio = ioptio + 1 
    165       IF( ioptio /= 1 )   CALL ctl_stop( '          use only ONE direction (level/hor/iso)' ) 
     165      IF( ioptio > 1 )   CALL ctl_stop( '          use only ONE direction (level/hor/iso)' ) 
    166166 
    167167      ! defined the type of lateral diffusion from ln_traldf_... logicals 
Note: See TracChangeset for help on using the changeset viewer.