Changeset 12063 for NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ABL/sbcabl.F90

Timestamp:

2019-12-05T11:46:38+01:00 (4 years 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:

• NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ABL/sbcabl.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ABL/sbcabl.F90

@@ -94 +94 @@
       IF( nn_dyn_restore  < 0   .OR.  nn_dyn_restore  > 2 )   &
          &                 CALL ctl_stop( 'abl_init : bad flag, nn_dyn_restore must be  0, 1 or 2 ' )            
-      !
+
       !!---------------------------------------------------------------------
       !! Control prints
@@ -216 +216 @@
             WRITE(numout,*) ' ABL Maximum value for dynamics restoring = ',zcff1
             ! Check that restoring coefficients are between 0 and 1
-            !IF( zcff1 > 1._wp .OR. zcff1 < 0._wp )   &
-            !IF( zcff1 > nn_fsbc .OR. zcff1 < 0._wp )   &
             IF( zcff1 - nn_fsbc > 0.001_wp .OR. zcff1 < 0._wp )   &
                &                   CALL ctl_stop( 'abl_init : wrong value for rn_ldyn_max' )
-            !IF( zcff  > 1._wp .OR. zcff  < 0._wp )   &
             IF( zcff  - nn_fsbc > 0.001_wp .OR. zcff  < 0._wp )   &
                &                   CALL ctl_stop( 'abl_init : wrong value for rn_ldyn_min' )
@@ -237 +234 @@
          WRITE(numout,*) ' ABL Maximum value for tracers restoring = ',zcff1
          ! Check that restoring coefficients are between 0 and 1
-         !IF( zcff1 > 1._wp .OR. zcff1 < 0._wp )   &
          IF( zcff1 - nn_fsbc > 0.001_wp .OR. zcff1 < 0._wp )   &
             &                   CALL ctl_stop( 'abl_init : wrong value for rn_ltra_max' )
-         !IF( zcff  > 1._wp .OR. zcff  < 0._wp )   &
          IF( zcff  - nn_fsbc > 0.001_wp .OR. zcff  < 0._wp )   &
             &                   CALL ctl_stop( 'abl_init : wrong value for rn_ltra_min' )