Changeset 1336 for LMDZ4/branches/LMDZ4V5.0-dev/libf

Timestamp:

Apr 1, 2010, 2:27:52 PM (15 years ago)

Author:

idelkadi

Message:

• Remise de la valeur par default de alp_offset a 0.
• Ajout de la possiblite de lecture des parametres de ini_wake.F dans le fichier ini_wake_param.data
• Ajout de la possiblite de lecture des parametres de wake.F dans le fichier wake_param.data
• Correction dans la partie convection (nouvelle physique)

Location:

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd

Files:

• concvl.F (modified) (5 diffs)
• conf_phys.F90 (modified) (1 diff)
• cv3_routines.F (modified) (2 diffs)
• cv3a_uncompress.F (modified) (2 diffs)
• cva_driver.F (modified) (3 diffs)
• ini_wake.F (modified) (1 diff)
• thermcell_qsat.F90 (added)
• wake.F (modified) (1 diff)

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/concvl.F

@@ -1 @@
-
-!
-! $Header$
-!
       SUBROUTINE concvl (iflag_con,iflag_clos,
      .             dtime,paprs,pplay,
@@ -89 +85 @@
        REAL em_ph(klon,klev+1),em_p(klon,klev)
        REAL upwd(klon,klev),dnwd(klon,klev),dnwdbis(klon,klev)
-       REAL Ma(klon,klev), mip(klon,klev),Vprecip(klon,klev)
+
+!!       REAL Ma(klon,klev), mip(klon,klev),Vprecip(klon,klev)     !jyg
+       REAL Ma(klon,klev), mip(klon,klev),Vprecip(klon,klev+1)     !jyg
+
        real da(klon,klev),phi(klon,klev,klev),mp(klon,klev)
        REAL cape(klon),cin(klon),tvp(klon,klev)
@@ -254 +253 @@
          DO i=1,klon
          em_ph(i,k) = paprs(i,k) / 100.0
+         pmflxr(i,k)=0.
          pmflxs(i,k)=0.
       ENDDO
@@ -336 +336 @@
      $              em_p,em_ph,iflag,
      $              d_t,d_q,d_u,d_v,d_tra,rain,
-     $              pmflxr,cbmf,work1,work2,
+!!     $              pmflxr,cbmf,work1,work2,           !jyg
+     $              Vprecip,cbmf,work1,work2,            !jyg
      $              kbas,ktop,
      $              dtime,Ma,upwd,dnwd,dnwdbis,qcondc,wd,cape,
@@ -390 +391 @@
         ENDDO
       ENDDO
+c                                                  !jyg
+c--Separation neige/pluie (pour diagnostics)       !jyg
+      DO k = 1, klev                               !jyg
+      DO i = 1, klon                               !jyg
+       IF (t1(i,k).LT.RTT) THEN                    !jyg
+         pmflxs(i,k)=Vprecip(i,k)                  !jyg
+       ELSE                                        !jyg
+         pmflxr(i,k)=Vprecip(i,k)                  !jyg
+       ENDIF                                       !jyg
+      ENDDO                                        !jyg
+      ENDDO                                        !jyg
 c
 cc      IF (if_ebil.ge.2) THEN

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/conf_phys.F90

@@ -1041 +1041 @@
 !Config Help = 
 !
-  alp_offset_omp = 0.01
+  alp_offset_omp = 0.
   call getin('alp_offset',alp_offset_omp)
 

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/cv3_routines.F

@@ -2331 +2331 @@
       real upwd(nloc,nd), dnwd(nloc,nd), ma(nloc,nd)
       real dnwd0(nloc,nd), mip(nloc,nd)
-      real Vprecip(nloc,nd)
+      real Vprecip(nloc,nd+1)
       real tls(nloc,nd), tps(nloc,nd)
       real qcondc(nloc,nd)                               ! cld
@@ -2367 +2367 @@
       do il=1,ncum
        precip(il)=0.0
-c       Vprecip(il,nd+1)=0.0
+       Vprecip(il,nd+1)=0.0
        wd(il)=0.0     ! gust
       enddo

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/cv3a_uncompress.F

@@ -39 +39 @@
       real ft(nloc,nd), fq(nloc,nd), fu(nloc,nd), fv(nloc,nd)
       real ftra(nloc,nd,ntra)
-      real Ma(nloc,nd),mip(nloc,nd),Vprecip(nloc,nd)
+      real Ma(nloc,nd),mip(nloc,nd),Vprecip(nloc,nd+1)
       real upwd(nloc,nd),dnwd(nloc,nd),dnwd0(nloc,nd)
       real qcondc(nloc,nd)
@@ -55 +55 @@
       real ft1(len,nd), fq1(len,nd), fu1(len,nd), fv1(len,nd)
       real ftra1(len,nd,ntra)
-      real Ma1(len,nd),mip1(len,nd),Vprecip1(len,nd)
+      real Ma1(len,nd),mip1(len,nd),Vprecip1(len,nd+1)
       real upwd1(len,nd),dnwd1(len,nd),dnwd01(len,nd)
       real qcondc1(len,nd)

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/cva_driver.F

@@ -153 +153 @@
       real Ma1(len,nd)
       real mip1(len,nd)
-      real Vprecip1(len,nd)
+!      real Vprecip1(len,nd)
+      real Vprecip1(len,nd+1)
       real upwd1(len,nd)
       real dnwd1(len,nd)
@@ -406 +407 @@
       real tps(nloc,klev), qprime(nloc), tprime(nloc)
       real precip(nloc)
-      real Vprecip(nloc,klev)
+!      real Vprecip(nloc,klev)
+      real Vprecip(nloc,klev+1)
       real tra(nloc,klev,ntra), trap(nloc,klev,ntra)
       real ftra(nloc,klev,ntra), traent(nloc,klev,klev,ntra)
@@ -492 +494 @@
       call  zilch(Ma1     ,nword2)
       call  zilch(mip1    ,nword2)
-      call  zilch(Vprecip1,nword2)
+!      call  zilch(Vprecip1,nword2)
+      Vprecip1=0.
       call  zilch(upwd1   ,nword2)
       call  zilch(dnwd1   ,nword2)

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/ini_wake.F

@@ -52 +52 @@
 c
 cCR: on rajoute ale et alp de la PBL precrits
-      open (99,file='wake.data',form='formatted',status='old',err=902)
+      open (99,file='ini_wake_param.data',form='formatted',
+     s      status='old',err=902)
       read (99,*) it
       read (99,*) w

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/wake.F

@@ -295 +295 @@
 
 ccc nrlmd Lecture du fichier wake_param.data
-c$$$      OPEN(99,file='wake_param.data',status='old',
-c$$$     $          form='formatted',err=9999)
-c$$$      READ(99,*,end=9998) stark
-c$$$      READ(99,*,end=9998) Alpk
-c$$$      READ(99,*,end=9998) wdens_ref
-c$$$      READ(99,*,end=9998) coefgw
-c$$$9998  Continue
-c$$$      CLOSE(99)
-c$$$9999  Continue
+      OPEN(99,file='wake_param.data',status='old',
+     $          form='formatted',err=9999)
+      READ(99,*,end=9998) stark
+      READ(99,*,end=9998) Alpk
+      READ(99,*,end=9998) wdens_ref
+      READ(99,*,end=9998) coefgw
+9998  Continue
+      CLOSE(99)
+9999  Continue
 c
 c   Initialisation de toutes des densites a wdens_ref.