Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r1910 r2160  
    7474     
    7575!-----------------------------------------------------------------------------------------------------------------
    76 ! Initialisation des variables réelles
     76! Initialisation des variables r?elles
    7777!-----------------------------------------------------------------------------------------------------------------
    7878      sigma1(:,:)=0.
     
    9797
    9898!------------------------------------------------------------------------------------------------------------------
    99 ! Calcul de la fraction du thermique et des écart-types des distributions
     99! Calcul de la fraction du thermique et des ?cart-types des distributions
    100100!------------------------------------------------------------------------------------------------------------------                 
    101101      do ind1=1,ngrid
     
    140140
    141141!-----------------------------------------------------------------------------------------------------------------
    142 ! Calcul des écart-types pour s
    143 !-----------------------------------------------------------------------------------------------------------------
    144 
    145       sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+ratqs(ind1,ind2)*po(ind1)
    146       sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.02)**0.4+0.002*zqta(ind1,ind2) 
    147 
    148  
    149 !-----------------------------------------------------------------------------------------------------------------
    150 ! Calcul de l'eau condensée et de la couverture nuageuse
     142! Calcul des ?cart-types pour s
     143!-----------------------------------------------------------------------------------------------------------------
     144
     145!      sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+ratqs(ind1,ind2)*po(ind1)
     146!      sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.02)**0.4+0.002*zqta(ind1,ind2)
     147!       if (paprs(ind1,ind2).gt.90000) then
     148!       ratqs(ind1,ind2)=0.002
     149!       else
     150!       ratqs(ind1,ind2)=0.002+0.0*(90000-paprs(ind1,ind2))/20000
     151!       endif
     152       sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+0.002*po(ind1)
     153       sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.01)**0.4+0.002*zqta(ind1,ind2)
     154!       sigma1s=ratqs(ind1,ind2)*po(ind1)
     155!      sigma2s=0.11*((sth-senv)**2)**0.5/(fraca(ind1,ind2)+0.02)**0.4+0.00003 
     156 
     157!-----------------------------------------------------------------------------------------------------------------
     158! Calcul de l'eau condens?e et de la couverture nuageuse
    151159!-----------------------------------------------------------------------------------------------------------------
    152160      sqrt2pi=sqrt(2.*pi)
     
    241249
    242250
    243 
Note: See TracChangeset for help on using the changeset viewer.