Changeset 12015 for NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ABL/ablmod.F90

Timestamp:

2019-11-29T16:59:07+01:00 (4 years ago)

Author:

gsamson

Message:

dev_ASINTER-01-05_merged: merge dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk branch @rev11988 with dev_r11265_ASINTER-01_Guillaume_ABL1D branch @rev11937 (tickets #2159 and #2131); ORCA2_ICE(_ABL) reproductibility OK

File:

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

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

@@ -17 +17 @@
    USE phycst         ! physical constants
    USE dom_oce, ONLY  : tmask  
-   USE sbc_oce, ONLY  : ght_abl, ghw_abl, e3t_abl, e3w_abl, jpka, jpkam1
-   USE sbcblk         ! use some physical constants for flux computation
+   USE sbc_oce, ONLY  : ght_abl, ghw_abl, e3t_abl, e3w_abl, jpka, jpkam1, rhoa
+   USE sbcblk         ! use rn_?fac
+   USE sbcblk_phy     ! use some physical constants for flux computation
    !
    USE prtctl         ! Print control                    (prt_ctl routine)
@@ -100 +101 @@
       REAL(wp) , INTENT(  out), DIMENSION(:,:  ) ::   ptauj_ice    ! ice-surface tauy stress (V-point)     
 #endif     
-     !
-      REAL(wp), DIMENSION(1:jpi,1:jpj   )        ::   zrhoa, zwnd_i, zwnd_j
+      !
+      REAL(wp), DIMENSION(1:jpi,1:jpj   )        ::   zwnd_i, zwnd_j
       REAL(wp), DIMENSION(1:jpi,2:jpka  )        ::   zCF    
       REAL(wp), DIMENSION(1:jpi,1:jpj,1:jpka)    ::   z_cft      !--FL--to be removed after the test phase   
@@ -529 +530 @@
             ztemp             = tq_abl  ( ji, jj, 2, nt_a, jp_ta ) 
             zhumi             = tq_abl  ( ji, jj, 2, nt_a, jp_qa ) 
-            zcff              = pslp_dta( ji, jj ) /   &              !<-- At this point ztemp and zhumi should not be zero ...
-               &                        (  R_dry*ztemp * ( 1._wp + rctv0*zhumi )  )
+            !zcff              = pslp_dta( ji, jj ) /   &              !<-- At this point ztemp and zhumi should not be zero ...
+            !   &                        (  R_dry*ztemp * ( 1._wp + rctv0*zhumi )  )
+            zcff              = rho_air( ztemp, zhumi, pslp_dta( ji, jj ) )
             psen ( ji, jj )   =      cp_air(zhumi) * zcff * psen(ji,jj) * ( psst(ji,jj) + rt0 - ztemp )
             pevp ( ji, jj )   = rn_efac*MAX( 0._wp,  zcff * pevp(ji,jj) * ( pssq(ji,jj)       - zhumi ) )
-            zrhoa( ji, jj )   = zcff              
+            rhoa( ji, jj )   = zcff              
          END DO
       END DO
@@ -551 +553 @@
             zcff          = SQRT(  zwnd_i(ji,jj) * zwnd_i(ji,jj)   &
                &                 + zwnd_j(ji,jj) * zwnd_j(ji,jj)  )  ! * msk_abl(ji,jj)
-            zztmp         = zrhoa(ji,jj) * pcd_du(ji,jj)
+            zztmp         = rhoa(ji,jj) * pcd_du(ji,jj)
             
             pwndm (ji,jj) =         zcff
@@ -593 +595 @@
                zztmp2 = 0.5_wp * ( v_abl(ji,jj+1,2,nt_a) + v_abl(ji,jj,2,nt_a) )
             
-               ptaui_ice(ji,jj) = 0.5_wp * (  zrhoa(ji+1,jj) * pCd_du_ice(ji+1,jj)             &
-                  &                      +    zrhoa(ji  ,jj) * pCd_du_ice(ji  ,jj)  )          &
+               ptaui_ice(ji,jj) = 0.5_wp * (  rhoa(ji+1,jj) * pCd_du_ice(ji+1,jj)             &
+                  &                      +    rhoa(ji  ,jj) * pCd_du_ice(ji  ,jj)  )          &
                   &         * ( zztmp1 - rn_vfac * pssu_ice(ji,jj) )
-               ptauj_ice(ji,jj) = 0.5_wp * (  zrhoa(ji,jj+1) * pCd_du_ice(ji,jj+1)             &
-                  &                      +    zrhoa(ji,jj  ) * pCd_du_ice(ji,jj  )  )          &
+               ptauj_ice(ji,jj) = 0.5_wp * (  rhoa(ji,jj+1) * pCd_du_ice(ji,jj+1)             &
+                  &                      +    rhoa(ji,jj  ) * pCd_du_ice(ji,jj  )  )          &
                   &         * ( zztmp2 - rn_vfac * pssv_ice(ji,jj) )
             END DO