Changeset 2957 for LMDZ5/trunk

Timestamp:

Jul 18, 2017, 12:38:26 PM (7 years ago)

Author:

jbmadeleine

Message:

Added options in cloudth_vert_v3:

• iflag_cloudth_vert_noratqs runs only when iflag_cloudth_vert=4 and removes

the dependency to ratqs from the calculation of sigma1s

• sigma1s_factor=1.1 and sigma1s_power=0.6 control the values used in the

calculation of sigma1s=(1.10.5)*(fraca(ind1,ind2)0.6)/...

File:

• LMDZ5/trunk/libf/phylmd/cloudth_mod.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/phylmd/cloudth_mod.F90

@@ -845 +845 @@
       REAL zqsatenv(ngrid,klev)
       
-   
-
-
       REAL sigma1(ngrid,klev)                                                         
       REAL sigma2(ngrid,klev)
@@ -864 +861 @@
       REAL rdd,cppd,Lv
       REAL alth,alenv,ath,aenv
-      REAL sth,senv,sigma1s,sigma2s,xth,xenv,exp_xenv1,exp_xenv2,exp_xth1,exp_xth2
+      REAL sth,senv,sigma1s,sigma2s,sigma1s_fraca,sigma1s_ratqs
+      REAL xth,xenv,exp_xenv1,exp_xenv2,exp_xth1,exp_xth2
       REAL xth1,xth2,xenv1,xenv2,deltasth, deltasenv
       REAL IntJ,IntI1,IntI2,IntI3,IntJ_CF,IntI1_CF,IntI3_CF,coeffqlenv,coeffqlth
@@ -874 +872 @@
       REAL,SAVE :: vert_alpha, vert_alpha_th
       !$OMP THREADPRIVATE(vert_alpha, vert_alpha_th)
+      REAL,SAVE :: sigma1s_factor=1.1
+      REAL,SAVE :: sigma1s_power=0.6
+      !$OMP THREADPRIVATE(sigma1s_factor,sigma1s_power)
+      INTEGER, SAVE :: iflag_cloudth_vert_noratqs=0
+      !$OMP THREADPRIVATE(iflag_cloudth_vert_noratqs)
+
       LOGICAL, SAVE :: firstcall = .TRUE.
       !$OMP THREADPRIVATE(firstcall)
@@ -917 +921 @@
         CALL getin_p('cloudth_vert_alpha_th',vert_alpha_th)
         WRITE(*,*) 'cloudth_vert_alpha_th = ', vert_alpha_th
+        ! Factor used in the calculation of sigma1s
+        CALL getin_p('cloudth_sigma1s_factor',sigma1s_factor)
+        WRITE(*,*) 'cloudth_sigma1s_factor = ', sigma1s_factor
+        ! Power used in the calculation of sigma1s
+        CALL getin_p('cloudth_sigma1s_power',sigma1s_power)
+        WRITE(*,*) 'cloudth_sigma1s_power = ', sigma1s_power
+        ! Remove the dependency to ratqs from the variance of the vertical PDF
+        CALL getin_p('iflag_cloudth_vert_noratqs',iflag_cloudth_vert_noratqs)
+        WRITE(*,*) 'iflag_cloudth_vert_noratqs = ', iflag_cloudth_vert_noratqs
+
         firstcall=.FALSE.
       ENDIF
@@ -969 +983 @@
 !------------------------------------------------------------------------------
 
-      sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+ratqs(ind1,ind2)*po(ind1)
+      sigma1s_fraca = (sigma1s_factor**0.5)*(fraca(ind1,ind2)**sigma1s_power) / &
+     &                (1-fraca(ind1,ind2))*((sth-senv)**2)**0.5
+!     sigma1s_fraca = (1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5
+      sigma1s_ratqs = ratqs(ind1,ind2)*po(ind1)
+      sigma1s = sigma1s_fraca + sigma1s_ratqs
       sigma2s=(0.09*(((sth-senv)**2)**0.5)/((fraca(ind1,ind2)+0.02)**0.5))+0.002*zqta(ind1,ind2)
 !      tests
@@ -1034 +1052 @@
         deltasth=ath*vert_alpha_th*sigma2s
       ELSE IF (iflag_cloudth_vert == 4) THEN
-        deltasenv=vert_alpha*sigma1s
-        deltasth=vert_alpha_th*sigma2s
+        IF (iflag_cloudth_vert_noratqs == 1) THEN
+          deltasenv=vert_alpha*sigma1s_fraca
+          deltasth=vert_alpha_th*sigma2s
+        ELSE
+          deltasenv=vert_alpha*sigma1s
+          deltasth=vert_alpha_th*sigma2s
+        ENDIF
       ENDIF