Changeset 4118

Timestamp:

Mar 29, 2022, 12:43:14 PM (3 years ago)

Author:

evignon

Message:

correction variable with

Location:

LMDZ6/trunk/libf

Files:

• phylmd/cloudth_mod.F90 (modified) (7 diffs)
• phylmd/phys_local_var_mod.F90 (modified) (3 diffs)
• phylmdiso/phys_local_var_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/cloudth_mod.F90

@@ -1550 +1550 @@
       USE phys_output_var_mod, ONLY : cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv
       USE lscp_tools_mod, ONLY: CALC_QSAT_ECMWF, FALLICE_VELOCITY
-      USE phys_local_var_mod, ONLY : qlth, qith, qsith, with
+      USE phys_local_var_mod, ONLY : qlth, qith, qsith, wiceth
 
       IMPLICIT NONE
@@ -1689 +1689 @@
       qlth(:,ind2)=0.
       qith(:,ind2)=0.
-      with(:,ind2)=0.
+      wiceth(:,ind2)=0.
       rneb(:,:)=0.
       qcloud(:)=0.
@@ -1992 +1992 @@
             ENDIF
 
-            CALL ICE_MPC_BL_CLOUDS(ind1,ind2,klev,Ni,Ei,C_cap,d_top,iflag_topthermals,temp_mpc,pres_mpc,zqta(ind1,:),qsith(ind1,:),qlth(ind1,:),deltazlev_mpc,with(ind1,:),fraca_mpc,qith(ind1,:))
+            CALL ICE_MPC_BL_CLOUDS(ind1,ind2,klev,Ni,Ei,C_cap,d_top,iflag_topthermals,temp_mpc,pres_mpc,zqta(ind1,:), &
+                                   qsith(ind1,:),qlth(ind1,:),deltazlev_mpc,wiceth(ind1,:),fraca_mpc,qith(ind1,:))
 
             ! qmax calculation
@@ -2236 +2237 @@
     ! Calcule ice fall velocity in thermals
 
-    CALL FALLICE_VELOCITY(klon,qith(:,ind2),Tbefth(:),rhoth(:),paprs(:,ind2),falseklon(:),with(:,ind2))
+    CALL FALLICE_VELOCITY(klon,qith(:,ind2),Tbefth(:),rhoth(:),paprs(:,ind2),falseklon(:),wiceth(:,ind2))
 
 RETURN
@@ -2244 +2245 @@
 
 !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-SUBROUTINE ICE_MPC_BL_CLOUDS(ind1,ind2,klev,Ni,Ei,C_cap,d_top,iflag_topthermals,temp,pres,qth,qsith,qlth,deltazlev,with,fraca,qith)
+SUBROUTINE ICE_MPC_BL_CLOUDS(ind1,ind2,klev,Ni,Ei,C_cap,d_top,iflag_topthermals,temp,pres,qth,qsith,qlth,deltazlev,vith,fraca,qith)
 
 ! parameterization of ice for boundary
@@ -2324 +2325 @@
     REAL,  DIMENSION(klev), INTENT(IN) :: qlth       ! condensed liquid water in thermals, approximated value [kg/kg]
     REAL,  DIMENSION(klev), INTENT(IN) :: deltazlev  ! layer thickness [m]
-    REAL,  DIMENSION(klev), INTENT(IN) :: with       ! ice crystal fall velocity [m/s]
+    REAL,  DIMENSION(klev), INTENT(IN) :: vith       ! ice crystal fall velocity [m/s]
     REAL,  DIMENSION(klev+1), INTENT(IN) :: fraca      ! fraction of the mesh covered by thermals
     REAL,  DIMENSION(klev), INTENT(INOUT) :: qith       ! condensed ice water , thermals [kg/kg]
@@ -2402 +2403 @@
     fp1=0.
     IF (fraca(ind2p1) .GT. 0.) THEN
-    fp2=-qith(ind2p2)*rho(ind2p2)*with(ind2p2)*fraca(ind2p2)! flux defined positive upward
-    fp1=-qith(ind2p1)*rho(ind2p1)*with(ind2p1)*fraca(ind2p1)
+    fp2=-qith(ind2p2)*rho(ind2p2)*vith(ind2p2)*fraca(ind2p2)! flux defined positive upward
+    fp1=-qith(ind2p1)*rho(ind2p1)*vith(ind2p1)*fraca(ind2p1)
     ENDIF
 

LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -438 +438 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: cldemi, cldfra, cldtau, fiwc, fl, re, flwc
 !$OMP THREADPRIVATE(cldemi, cldfra, cldtau, fiwc, fl, re, flwc)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith, qsith, with
-!$OMP THREADPRIVATE(qlth, qith, qsith)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith, qsith, wiceth
+!$OMP THREADPRIVATE(qlth, qith, qsith, wiceth)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ref_liq, ref_ice, theta, zphi
 !$OMP THREADPRIVATE(ref_liq, ref_ice, theta, zphi)
@@ -778 +778 @@
       ALLOCATE(rain_lsc(klon))
       ALLOCATE(rain_num(klon))
-      ALLOCATE(qlth(klon,klev), qith(klon,klev), qsith(klon,klev), with(klon,klev))
+      ALLOCATE(qlth(klon,klev), qith(klon,klev), qsith(klon,klev), wiceth(klon,klev))
       !
       ALLOCATE(sens_x(klon), sens_w(klon))
@@ -1089 +1089 @@
       DEALLOCATE(rain_lsc)
       DEALLOCATE(rain_num)
-      DEALLOCATE(qlth, qith, qsith, with)
+      DEALLOCATE(qlth, qith, qsith, wiceth)
 !
       DEALLOCATE(sens_x, sens_w)

LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

@@ -559 +559 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: cldemi, cldfra, cldtau, fiwc, fl, re, flwc
 !$OMP THREADPRIVATE(cldemi, cldfra, cldtau, fiwc, fl, re, flwc)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith, qsith
-!$OMP THREADPRIVATE(qlth, qith, qsith)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith, qsith, wiceth
+!$OMP THREADPRIVATE(qlth, qith, qsith, wiceth)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ref_liq, ref_ice, theta, zphi
 !$OMP THREADPRIVATE(ref_liq, ref_ice, theta, zphi)
@@ -943 +943 @@
       ALLOCATE(rain_lsc(klon))
       ALLOCATE(rain_num(klon))
-      ALLOCATE(qlth(klon,klev), qith(klon,klev), qsith(klon,klev))
+      ALLOCATE(qlth(klon,klev), qith(klon,klev), qsith(klon,klev), wiceth(klon,klev))
       !
 #ifdef ISO
@@ -1325 +1325 @@
       DEALLOCATE(rain_lsc)
       DEALLOCATE(rain_num)
-      DEALLOCATE(qlth, qith, qsith)
+      DEALLOCATE(qlth, qith, qsith, wiceth)
 !
       DEALLOCATE(sens_x, sens_w)