Changeset 3906

Timestamp:

May 19, 2021, 12:35:18 PM (4 years ago)

Author:

jyg

Message:

1/ Bug fix in wx_pbl_mod.F90

2/ New pbl_split option:
iflag_pbl_split=3 ==> iflag_split=1 over ocean,

iflag_split=0 everywhere else.

Location:

LMDZ6/trunk/libf/phylmd

Files:

• pbl_surface_mod.F90 (modified) (3 diffs)
• surf_ocean_mod.F90 (modified) (3 diffs)
• wx_pbl_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -546 +546 @@
     INTEGER                            :: n 
 ! << PC
-    INTEGER                            :: iflag_split 
+    INTEGER                            :: iflag_split, iflag_split_ref 
     INTEGER                            :: i, k, nsrf 
     INTEGER                            :: knon, j
@@ -889 +889 @@
 !
 !!jyg      iflag_split = mod(iflag_pbl_split,2)
-      iflag_split = mod(iflag_pbl_split,10)
+!!jyg      iflag_split = mod(iflag_pbl_split,10)
+      iflag_split_ref = mod(iflag_pbl_split,10)
 
 !****************************************************************************************
@@ -1297 +1298 @@
 ! 
 !****************************************************************************************
-   
-    loop_nbsrf: DO nsrf = 1, nbsrf
+                                                                          !<<<<<<<<<<<<<
+    loop_nbsrf: DO nsrf = 1, nbsrf                                        !<<<<<<<<<<<<<
+                                                                          !<<<<<<<<<<<<<
        IF (prt_level >=10) print *,' Loop nsrf ',nsrf
+!
+       IF (iflag_split_ref == 3) THEN
+         IF (nsrf == is_oce) THEN
+            iflag_split = 1
+         ELSE
+            iflag_split=0
+         ENDIF   !! (nsrf == is_oce)
+       ELSE                     
+         iflag_split = iflag_split_ref
+       ENDIF   !! (iflag_split_ref == 3)
 
 ! Search for index(ni) and size(knon) of domaine to treat

LMDZ6/trunk/libf/phylmd/surf_ocean_mod.F90

@@ -56 +56 @@
     REAL, DIMENSION(klon), INTENT(IN)        :: rmu0  
     REAL, DIMENSION(klon), INTENT(IN)        :: fder
-    REAL, INTENT(IN):: tsurf_in(klon) ! defined only for subscripts 1:knon
+    REAL, DIMENSION(klon), INTENT(IN)        :: tsurf_in     ! defined only for subscripts 1:knon
     REAL, DIMENSION(klon), INTENT(IN)        :: p1lay,z1lay ! pression (Pa) et altitude (m) du premier niveau
     REAL, DIMENSION(klon), INTENT(IN)        :: cdragh
@@ -74 +74 @@
     REAL, DIMENSION(klon), INTENT(INOUT)     :: qsurf
     REAL, DIMENSION(klon), INTENT(INOUT)     :: agesno
-    REAL, DIMENSION(klon), INTENT(inOUT):: z0h
+    REAL, DIMENSION(klon), INTENT(inOUT)     :: z0h
 
     REAL, intent(inout):: delta_sst(:) ! (knon)
@@ -98 +98 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: z0m
     !albedo SB >>>
-    !    REAL, DIMENSION(klon), INTENT(OUT)       :: alb1_new  ! new albedo in visible SW interval
-    !    REAL, DIMENSION(klon), INTENT(OUT)       :: alb2_new  ! new albedo in near IR interval
-    REAL, DIMENSION(6), INTENT(IN)          :: SFRWL 
-    REAL, DIMENSION(klon,nsw), INTENT(OUT)       :: alb_dir_new,alb_dif_new
+    !    REAL, DIMENSION(klon), INTENT(OUT)  :: alb1_new  ! new albedo in visible SW interval
+    !    REAL, DIMENSION(klon), INTENT(OUT)  :: alb2_new  ! new albedo in near IR interval
+    REAL, DIMENSION(6), INTENT(IN)           :: SFRWL 
+    REAL, DIMENSION(klon,nsw), INTENT(OUT)   :: alb_dir_new,alb_dif_new
     !albedo SB <<<     
     REAL, DIMENSION(klon), INTENT(OUT)       :: evap, fluxsens, fluxlat
-    REAL, INTENT(OUT):: tsurf_new(klon) ! sea surface temperature, in K
+    REAL, DIMENSION(klon), INTENT(OUT)       :: tsurf_new    ! sea surface temperature, in K
     REAL, DIMENSION(klon), INTENT(OUT)       :: dflux_s, dflux_l      
     REAL, DIMENSION(klon), INTENT(OUT)       :: lmt_bils

LMDZ6/trunk/libf/phylmd/wx_pbl_mod.F90

@@ -122 +122 @@
        BcoefT(j) = BcoefT_x(j) + sigw(j)*(sigx(j)*dd_Kh*dd_KTp(j)*BcoefT_x(j) + &
                                   Kech_h_w(j)*Kech_T_pw(j)*dd_BT(j))/(Kech_h(j)*Kech_Tp(j))
-       BcoefQ(j) = BcoefQ_x(j) + sigw(j)*(sigx(j)*dd_Kh*dd_KQs(j)*BcoefQ_x(j) + &
+       BcoefQ(j) = BcoefQ_x(j) + sigw(j)*(sigx(j)*dd_Kq*dd_KQs(j)*BcoefQ_x(j) + &
                                   Kech_q_w(j)*Kech_Q_sw(j)*dd_BQ(j))/(Kech_q(j)*Kech_Qs(j))
        BcoefU(j) = BcoefU_x(j) + sigw(j)*(sigx(j)*dd_Km*dd_KUp(j)*BcoefU_x(j) + &
@@ -691 +691 @@
 !!          print *,' wx_pbl_split, dqsatsrf, dqsatdT0*dTs ', dqsatsrf, dqsatdT0*dTs
         ENDIF
+!
+!!    IF (knon .NE. 0) THEN
+!!       call  iophys_ecrit('sigw', 1,'sigw', '.',sigw)
+!!       call  iophys_ecrit('phit', 1,'phit', 'W/m2',phit)
+!!       call  iophys_ecrit('phit_w', 1,'phit_w', 'W/m2',phit_w)
+!!       call  iophys_ecrit('phit_x', 1,'phit_x', 'W/m2',phit_x)
+!!       call  iophys_ecrit('phiq', 1,'phiq', 'kg/m2/s',phiq)
+!!       call  iophys_ecrit('phiq_w', 1,'phiq_w', 'kg/m2/s',phiq_w)
+!!       call  iophys_ecrit('phiq_x', 1,'phiq_x', 'kg/m2/s',phiq_x)
+!!       call  iophys_ecrit('q1_w', 1,'q1_w', '.',q1_w)
+!!       call  iophys_ecrit('q1_x', 1,'q1_x', '.',q1_x)
+!!    ENDIF  ! (knon .NE. 0)
 !
         RETURN