Changeset 12623 for NEMO/branches/2020/r12581_ticket2418/src/OCE/SBC/sbcblk.F90

Timestamp:

2020-03-28T08:38:26+01:00 (4 years ago)

Author:

smasson

Message:

r12581_ticket2418: merge with trunk@12622, see #2418

File:

• NEMO/branches/2020/r12581_ticket2418/src/OCE/SBC/sbcblk.F90 (modified) (3 diffs)

NEMO/branches/2020/r12581_ticket2418/src/OCE/SBC/sbcblk.F90

@@ -639 +639 @@
       END IF
 
-      !!      CALL iom_put( "Cd_oce", zcd_oce)  ! output value of pure ocean-atm. transfer coef.
-      !!      CALL iom_put( "Ch_oce", zch_oce)  ! output value of pure ocean-atm. transfer coef.
-
-      IF( ABS(rn_zu - rn_zqt) < 0.1_wp ) THEN
-         !! If zu == zt, then ensuring once for all that:
-         t_zu(:,:) = ztpot(:,:)
-         q_zu(:,:) = zqair(:,:)
-      ENDIF
-
-
       !  Turbulent fluxes over ocean  => BULK_FORMULA @ sbcblk_phy.F90
       ! -------------------------------------------------------------
@@ -663 +653 @@
       ELSE                      !==  BLK formulation  ==!   turbulent fluxes computation
          CALL BULK_FORMULA( rn_zu, ptsk(:,:), pssq(:,:), t_zu(:,:), q_zu(:,:), &
-            &               zcd_oce(:,:), zch_oce(:,:), zce_oce(:,:),         &
-            &               wndm(:,:), zU_zu(:,:), pslp(:,:),                 &
-            &               taum(:,:), psen(:,:), zqla(:,:),                  &
-            &               pEvap=pevp(:,:), prhoa=rhoa(:,:) )
+            &               zcd_oce(:,:), zch_oce(:,:), zce_oce(:,:),          &
+            &               wndm(:,:), zU_zu(:,:), pslp(:,:),                  &
+            &               taum(:,:), psen(:,:), zqla(:,:),                   &
+            &               pEvap=pevp(:,:), prhoa=rhoa(:,:), pfact_evap=rn_efac )
 
          zqla(:,:) = zqla(:,:) * tmask(:,:,1)
@@ -1046 +1036 @@
       evap_ice (:,:,:) = rn_efac * qla_ice (:,:,:) * z1_rLsub    ! sublimation
       devap_ice(:,:,:) = rn_efac * dqla_ice(:,:,:) * z1_rLsub    ! d(sublimation)/dT
-      zevap    (:,:)   = rn_efac * ( emp(:,:) + tprecip(:,:) )   ! evaporation over ocean
+      zevap    (:,:)   = rn_efac * ( emp(:,:) + tprecip(:,:) )   ! evaporation over ocean  !LB: should we remove rn_efac here???
 
       ! --- evaporation minus precipitation --- !