New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 11348 for NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/OCE/SBC/sbcmod.F90 – NEMO

Ignore:
Timestamp:
2019-07-25T14:02:55+02:00 (5 years ago)
Author:
gsamson
Message:

dev_r11265_ABL :

  • merge HPC-13_IRRMANN_BDY_optimization branch @ rev11332 with dev_r11265_ABL branch @ rev11334
  • allow ln_dm2dc option with ABL
  • cosmetic change in sbcabl.F90

identical results with rev11334 for bulk and abl orca2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/OCE/SBC/sbcmod.F90

    r11275 r11348  
    112112      REWIND( numnam_ref )          !* Namelist namsbc in reference namelist : Surface boundary 
    113113      READ  ( numnam_ref, namsbc, IOSTAT = ios, ERR = 901) 
    114 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namsbc in reference namelist', lwp ) 
     114901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namsbc in reference namelist' ) 
    115115      REWIND( numnam_cfg )          !* Namelist namsbc in configuration namelist : Parameters of the run 
    116116      READ  ( numnam_cfg, namsbc, IOSTAT = ios, ERR = 902 ) 
    117 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namsbc in configuration namelist', lwp ) 
     117902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namsbc in configuration namelist' ) 
    118118      IF(lwm) WRITE( numond, namsbc ) 
    119119      ! 
     
    263263      IF( ln_dm2dc ) THEN           !* daily mean to diurnal cycle 
    264264         nday_qsr = -1   ! allow initialization at the 1st call 
    265          IF( .NOT.( ln_flx .OR. ln_blk ) .AND. nn_components /= jp_iam_opa )   & 
    266             &   CALL ctl_stop( 'qsr diurnal cycle from daily values requires a flux or bulk formulation' ) 
     265         IF( .NOT.( ln_flx .OR. ln_blk .OR. ln_abl ) .AND. nn_components /= jp_iam_opa )   & 
     266            &   CALL ctl_stop( 'qsr diurnal cycle from daily values requires flux, bulk or abl formulation' ) 
    267267      ENDIF 
    268268      !                             !* Choice of the Surface Boudary Condition 
Note: See TracChangeset for help on using the changeset viewer.