Changeset 11586 for NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/ABL/sbcabl.F90

Timestamp:

2019-09-20T17:28:02+02:00 (5 years ago)

Author:

gsamson

Message:

dev_r11265_ABL : see #2131

• merge HPC-13_IRRMANN_BDY_optimization branch @ r11535 (last commit) with dev_r11265_ABL branch @ r11414 (except doc directory)
• change ORCA2 results due to changes in HPC-13_IRRMANN_BDY_optimization branch

File:

• NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/ABL/sbcabl.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/ABL/sbcabl.F90

@@ -214 +214 @@
             ! 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 .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 .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' )
             IF( zcff  > zcff1                    )   &
-               &                   CALL ctl_stop( 'abl_init : rn_ldyn_max should be smaller than rn_ldyn_min' )
+               &                   CALL ctl_stop( 'abl_init : rn_ldyn_max must be smaller than rn_ldyn_min' )
          END IF
       END IF
@@ -234 +235 @@
          ! 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_ltra_max' )
          !IF( zcff  > 1._wp .OR. zcff  < 0._wp )   &
-         IF( zcff  > nn_fsbc .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' )
          IF( zcff  > zcff1                    )   &
-            &                   CALL ctl_stop( 'abl_init : rn_ltra_max should be smaller than rn_ltra_min' )
+            &                   CALL ctl_stop( 'abl_init : rn_ltra_max must be smaller than rn_ltra_min' )
       END IF