Ignore:
Timestamp:
2015-12-14T10:27:28+01:00 (5 years ago)
Author:
timgraham
Message:

Merged head of trunk into branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

    r5600 r6043  
    1212   USE dom_oce         ! ocean space and time domain 
    1313   USE sbc_oce         ! surface boundary condition 
    14    USE dynspg_oce      ! surface pressure gradient variables 
    1514   USE phycst          ! physical constants 
    1615   USE fldread         ! read input fields 
     
    6261      !!--------------------------------------------------------------------- 
    6362      INTEGER, INTENT(in)::   kt   ! ocean time step 
    64       !! 
     63      ! 
    6564      INTEGER            ::   ierror  ! local integer  
    6665      INTEGER            ::   ios     ! Local integer output status for namelist read 
     
    7170      NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr, rn_pref, ln_apr_obc 
    7271      !!---------------------------------------------------------------------- 
    73       ! 
    7472      ! 
    7573      !                                         ! -------------------- ! 
     
    113111            IF(lwp) WRITE(numout,*) '         Inverse barometer added to OBC ssh data' 
    114112         ENDIF 
    115          IF( ( ln_apr_obc ) .AND. .NOT. lk_dynspg_ts )   & 
    116             CALL ctl_stop( 'sbc_apr: use inverse barometer ssh at open boundary ONLY possible with time-splitting' ) 
     113!jc: stop below should rather be a warning  
    117114         IF( ( ln_apr_obc ) .AND. .NOT. ln_apr_dyn   )   & 
    118115            CALL ctl_stop( 'sbc_apr: use inverse barometer ssh at open boundary ONLY requires ln_apr_dyn=T' ) 
Note: See TracChangeset for help on using the changeset viewer.