Changeset 13159 for NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/OCE/SBC/sbcblk_algo_ncar.F90

Timestamp:

2020-06-26T10:26:32+02:00 (4 years ago)

Author:

gsamson

Message:

merge trunk@r13136 into ASINTER-06 branch; pass all SETTE tests; results identical to trunk@r13136; ticket #2419

Location:

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement

Files:

• . (modified) (1 prop)
• src/OCE/SBC/sbcblk_algo_ncar.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/OCE/SBC/sbcblk_algo_ncar.F90

@@ -112 +112 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   stab          ! stability test integer
       !!----------------------------------------------------------------------------------
-      !
-      l_zt_equal_zu = .FALSE.
-      IF( ABS(zu - zt) < 0.01_wp )   l_zt_equal_zu = .TRUE.    ! testing "zu == zt" is risky with double precision
+      l_zt_equal_zu = ( ABS(zu - zt) < 0.01_wp ) ! testing "zu == zt" is risky with double precision
 
       U_blk = MAX( 0.5_wp , U_zu )   !  relative wind speed at zu (normally 10m), we don't want to fall under 0.5 m/s
@@ -143 +141 @@
       ENDIF
 
-      !! Initializing values at z_u with z_t values:
-      t_zu = t_zt   ;   q_zu = q_zt
+      !! First guess of temperature and humidity at height zu:
+      t_zu = MAX( t_zt ,  180._wp )   ! who knows what's given on masked-continental regions...
+      q_zu = MAX( q_zt , 1.e-6_wp )   !               "
 
       !! ITERATION BLOCK

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette