Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/cloudth.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cloudth.F90 (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/cloudth.F90

@@ -74 +74 @@
       
 !-----------------------------------------------------------------------------------------------------------------
-! Initialisation des variables réelles
+! Initialisation des variables r?elles
 !-----------------------------------------------------------------------------------------------------------------
       sigma1(:,:)=0.
@@ -97 +97 @@
 
 !------------------------------------------------------------------------------------------------------------------
-! Calcul de la fraction du thermique et des écart-types des distributions
+! Calcul de la fraction du thermique et des ?cart-types des distributions
 !------------------------------------------------------------------------------------------------------------------                 
       do ind1=1,ngrid
@@ -140 +140 @@
 
 !-----------------------------------------------------------------------------------------------------------------
-! Calcul des écart-types pour s
-!-----------------------------------------------------------------------------------------------------------------
-
-      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)  
-
- 
-!-----------------------------------------------------------------------------------------------------------------
-! Calcul de l'eau condensée et de la couverture nuageuse
+! Calcul des ?cart-types pour s
+!-----------------------------------------------------------------------------------------------------------------
+
+!      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) 
+!       if (paprs(ind1,ind2).gt.90000) then
+!       ratqs(ind1,ind2)=0.002
+!       else 
+!       ratqs(ind1,ind2)=0.002+0.0*(90000-paprs(ind1,ind2))/20000
+!       endif
+       sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+0.002*po(ind1)
+       sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.01)**0.4+0.002*zqta(ind1,ind2) 
+!       sigma1s=ratqs(ind1,ind2)*po(ind1)
+!      sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.02)**0.4+0.00003  
+ 
+!-----------------------------------------------------------------------------------------------------------------
+! Calcul de l'eau condens?e et de la couverture nuageuse
 !-----------------------------------------------------------------------------------------------------------------
       sqrt2pi=sqrt(2.*pi)
@@ -241 +249 @@
 
 
-