Ignore:
Timestamp:
2019-12-05T11:46:38+01:00 (17 months ago)
Author:
gsamson
Message:

dev_ASINTER-01-05_merged: update branch with dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk@r12061 and trunk@r12055 + bugfix for agrif compatibility in sbcblk: sette tests with ref configs ok except ABL restartability (under investigation) (tickets #2159 and #2131)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ABL/sbcabl.F90

    r12021 r12063  
    9494      IF( nn_dyn_restore  < 0   .OR.  nn_dyn_restore  > 2 )   & 
    9595         &                 CALL ctl_stop( 'abl_init : bad flag, nn_dyn_restore must be  0, 1 or 2 ' )             
    96       ! 
     96 
    9797      !!--------------------------------------------------------------------- 
    9898      !! Control prints 
     
    216216            WRITE(numout,*) ' ABL Maximum value for dynamics restoring = ',zcff1 
    217217            ! Check that restoring coefficients are between 0 and 1 
    218             !IF( zcff1 > 1._wp .OR. zcff1 < 0._wp )   & 
    219             !IF( zcff1 > nn_fsbc .OR. zcff1 < 0._wp )   & 
    220218            IF( zcff1 - nn_fsbc > 0.001_wp .OR. zcff1 < 0._wp )   & 
    221219               &                   CALL ctl_stop( 'abl_init : wrong value for rn_ldyn_max' ) 
    222             !IF( zcff  > 1._wp .OR. zcff  < 0._wp )   & 
    223220            IF( zcff  - nn_fsbc > 0.001_wp .OR. zcff  < 0._wp )   & 
    224221               &                   CALL ctl_stop( 'abl_init : wrong value for rn_ldyn_min' ) 
     
    237234         WRITE(numout,*) ' ABL Maximum value for tracers restoring = ',zcff1 
    238235         ! Check that restoring coefficients are between 0 and 1 
    239          !IF( zcff1 > 1._wp .OR. zcff1 < 0._wp )   & 
    240236         IF( zcff1 - nn_fsbc > 0.001_wp .OR. zcff1 < 0._wp )   & 
    241237            &                   CALL ctl_stop( 'abl_init : wrong value for rn_ltra_max' ) 
    242          !IF( zcff  > 1._wp .OR. zcff  < 0._wp )   & 
    243238         IF( zcff  - nn_fsbc > 0.001_wp .OR. zcff  < 0._wp )   & 
    244239            &                   CALL ctl_stop( 'abl_init : wrong value for rn_ltra_min' ) 
Note: See TracChangeset for help on using the changeset viewer.