Changeset 1411 for LMDZ4/trunk/libf/phylmd/cloudth.F90

Timestamp:

Jul 9, 2010, 1:06:15 PM (14 years ago)

Author:

idelkadi

Message:

Nettoyage dans physiq.F des anciennes versions versions des options iflag_cldcon=5 ou 6.
Dans isrtilp.F, iflag_cldcon=5 : la version bi-gaussienne partout et iflag_cldcon=6 : bi-gaussiennes pour les thermiques et la lognormale ailleurs

File:

• LMDZ4/trunk/libf/phylmd/cloudth.F90 (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/cloudth.F90

@@ -142 +142 @@
 ! Calcul des écart-types pour s
 !-----------------------------------------------------------------------------------------------------------------
-!      alpha=0.5*(fraca(ind1,ind2)+fraca(ind1,ind2-1))
-!      sigma1s=(Max(1.2*fraca(ind1,ind2)*(sth-senv)**2,(senv/100)**2))**0.5
-!      sigma2s=((0.021/(fraca(ind1,ind2)+0.0)**0.5)*(sth-senv)**2+(sth/100)**2)**0.5 
-!      sigma1s=(1.5**0.5)*(fraca(ind1,ind2)**0.65)*(sth-senv)+0.000045
-!      sigma2s=0.1265*(sth-senv)/(fraca(ind1,ind2)+0.0)**0.35+0.000045     
-
-      sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+0.00003
-      sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.02)**0.4+0.00003  
-
-!      sigma1s=(1.5**0.5)*(alpha**0.65)*(sth-senv)+0.000045
-!      sigma2s=0.1265*(sth-senv)/alpha**0.35+0.000045
-      
-!      sigma1s=(2.8**0.5)*(0.1**0.7)*(sth-senv)+0.00002
-!      sigma2s=((0.126/(0.1)**0.3)*(sth-senv))+0.00002
-
+
+      sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+ratqs(ind1,ind2)*po(ind1)
+      sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.02)**0.4+0.002*zqta(ind1,ind2)  
 
  
@@ -214 +202 @@
       senv=aenv*(po(ind1)-zqsatenv(ind1,ind2)) 
       
-!      if (zqenv(ind1).gt.0.005) then
-      sigma1s=0.005*zqenv(ind1)
-!      else 
-!      sigma1s=0.0005
-!      endif
-
-!      sigma1s=ratqs(ind1,ind2)*zqenv(ind1)
-
-
-
-!      sigma1s=0.00003
+
+      sigma1s=ratqs(ind1,ind2)*zqenv(ind1)
+
       sqrt2pi=sqrt(2.*pi)
       xenv=senv/(sqrt(2.)*sigma1s)