Changeset 1864 for LMDZ5/branches/testing/libf/phylmd/cva_driver.F

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cva_driver.F (modified) (18 diffs)

LMDZ5/branches/testing/libf/phylmd/cva_driver.F

@@ -3 +3 @@
 !
       SUBROUTINE cva_driver(len,nd,ndp1,ntra,nloc,
-     &                   iflag_con,iflag_mix,
+     &                   iflag_con,iflag_mix,iflag_ice_thermo,
      &                   iflag_clos,delt,
      &                   t1,q1,qs1,t1_wake,q1_wake,qs1_wake,s1_wake,
@@ -52 +52 @@
 C      iflag_con     Integer        Input        version of convect (3/4)
 C      iflag_mix     Integer        Input        version of mixing  (0/1/2)
+C   iflag_ice_thermo Integer        Input        accounting for ice thermodynamics (0/1)
 C      iflag_clos    Integer        Input        version of closure (0/1)
 C      delt          Real           Input        time step
@@ -155 +156 @@
       integer iflag_con
       integer iflag_mix
+      integer iflag_ice_thermo
       integer iflag_clos
       real delt
@@ -381 +383 @@
       real buoybase1(klon)
 
+      real lf1(klon,klev) ,lf1_wake(klon,klev)
       real lv1(klon,klev) ,lv1_wake(klon,klev)
       real cpn1(klon,klev),cpn1_wake(klon,klev)
@@ -419 +422 @@
       real gz(nloc,klev),h(nloc,klev)     ,hm(nloc,klev)
       real               h_wake(nloc,klev),hm_wake(nloc,klev)
-      real lv(nloc,klev)     ,cpn(nloc,klev)
-      real lv_wake(nloc,klev),cpn_wake(nloc,klev)
+      real lv(nloc,klev), lf(nloc,klev), cpn(nloc,klev)
+      real lv_wake(nloc,klev), lf_wake(nloc,klev), cpn_wake(nloc,klev)
       real p(nloc,klev),ph(nloc,klev+1),tv(nloc,klev)    ,tp(nloc,klev)
       real                              tv_wake(nloc,klev)
@@ -430 +433 @@
       real sig(nloc,klev), w0(nloc,klev), ptop2(nloc)
       real hp(nloc,klev), ep(nloc,klev), sigp(nloc,klev)
-      real frac(nloc), buoy(nloc,klev)
+      real buoy(nloc,klev)
       real cape(nloc)
       real cin(nloc)
@@ -444 +447 @@
       real sigd(nloc)
 !      real mp(nloc,klev), qp(nloc,klev), up(nloc,klev), vp(nloc,klev)
-!      real wt(nloc,klev), water(nloc,klev), evap(nloc,klev)
+!      real wt(nloc,klev), water(nloc,klev), evap(nloc,klev), ice(nloc,klev)
 !      real b(nloc,klev), sigd(nloc)
 !      save mp,qp,up,vp,wt,water,evap,b
       real, save, allocatable :: mp(:,:),qp(:,:),up(:,:),vp(:,:)
-      real, save, allocatable :: wt(:,:),water(:,:),evap(:,:), b(:,:)
-c$OMP THREADPRIVATE(mp,qp,up,vp,wt,water,evap,b)
+      real, save, allocatable :: wt(:,:),water(:,:),evap(:,:)
+      real, save, allocatable :: ice(:,:),fondue(:,:), b(:,:)
+      real, save, allocatable :: frac(:,:), faci(:,:)
+c$OMP THREADPRIVATE(mp,qp,up,vp,wt,water,evap,ice,fondue,b,frac,faci)
       real  ft(nloc,klev), fq(nloc,klev)
       real ftd(nloc,klev), fqd(nloc,klev)
@@ -496 +501 @@
          allocate(mp(nloc,klev), qp(nloc,klev), up(nloc,klev))
          allocate(vp(nloc,klev), wt(nloc,klev), water(nloc,klev))
+         allocate(ice(nloc,klev), fondue(nloc,klev))
          allocate(evap(nloc,klev), b(nloc,klev))
+         allocate(frac(nloc,klev), faci(nloc,klev))
          first=.false.
        endif
@@ -502 +509 @@
 c   (common cvflag)
 
-       CALL cv_flag
+       CALL cv_flag(iflag_ice_thermo)
 
 c -- set thermodynamical constants:
@@ -610 +617 @@
 !       print*,'t1, q1 ',t1,q1
        CALL cv3_prelim(len,nd,ndp1,t1,q1,p1,ph1      ! nd->na
-     o               ,lv1,cpn1,tv1,gz1,h1,hm1,th1)
+     o               ,lv1,lf1,cpn1,tv1,gz1,h1,hm1,th1)
     
 c
        CALL cv3_prelim(len,nd,ndp1,t1_wake,q1_wake,p1,ph1 ! nd->na
-     o               ,lv1_wake,cpn1_wake,tv1_wake,gz1_wake
+     o               ,lv1_wake,lf1_wake,cpn1_wake,tv1_wake,gz1_wake
      o               ,h1_wake,bid,th1_wake)
     
@@ -755 +762 @@
      :    ,u1,v1,gz1,th1,th1_wake
      :    ,tra1
-     :    ,h1     ,lv1     ,cpn1   ,p1,ph1,tv1    ,tp1,tvp1,clw1
-     :    ,h1_wake,lv1_wake,cpn1_wake     ,tv1_wake
+     :    ,h1     ,lv1, lf1,cpn1   ,p1,ph1,tv1    ,tp1,tvp1,clw1
+     :    ,h1_wake,lv1_wake,lf1_wake,cpn1_wake     ,tv1_wake
      :    ,sig1,w01,ptop21
      :    ,Ale1,Alp1
@@ -765 +772 @@
      o    ,u,v,gz,th,th_wake
      o    ,tra
-     o    ,h     ,lv     ,cpn    ,p,ph,tv    ,tp,tvp,clw
-     o    ,h_wake,lv_wake,cpn_wake    ,tv_wake
+     o    ,h     ,lv, lf     ,cpn    ,p,ph,tv    ,tp,tvp,clw
+     o    ,h_wake,lv_wake,lf_wake,cpn_wake    ,tv_wake
      o    ,sig,w0,ptop2
      o    ,Ale,Alp  ) 
@@ -800 +807 @@
        CALL cv3_undilute2(nloc,ncum,nd,icb,icbs,nk        !na->nd
      :                        ,tnk,qnk,gznk,hnk,t,q,qs,gz
-     :                        ,p,h,tv,lv,pbase,buoybase,plcl
-     o                        ,inb,tp,tvp,clw,hp,ep,sigp,buoy)
+     :                        ,p,h,tv,lv,lf,pbase,buoybase,plcl
+     o                        ,inb,tp,tvp,clw,hp,ep,sigp,buoy
+     :                        ,frac)
    
       endif
@@ -816 +824 @@
 !-------------------------------------------------------------------
       IF (iflag_con .eq. 3) THEN
+       if ((iflag_ice_thermo.eq.1).and.(iflag_mix.ne.0)) then
+         write(*,*) " iflag_ice_thermo==1 requires iflag_mix==0",
+     &   " but iflag_mix=",iflag_mix, ". Might as well stop here."
+         stop
+       endif
        IF (iflag_mix .ge. 1 ) THEN
          CALL zilch(supmax,nloc*klev)    
@@ -877 +890 @@
         IF (iflag_mix.eq.0) THEN
          CALL cv3_mixing(nloc,ncum,nd,nd,ntra,icb,nk,inb    ! na->nd
-     :                       ,ph,t,q,qs,u,v,tra,h,lv,qnk
+     :                       ,ph,t,q,qs,u,v,tra,h,lv,lf,frac,qnk
      :                       ,unk,vnk,hp,tv,tvp,ep,clw,m,sig
      o   ,ment,qent,uent,vent,nent,sigij,elij,ments,qents,traent)
@@ -913 +926 @@
        CALL cv3_unsat(nloc,ncum,nd,nd,ntra,icb,inb,iflag    ! na->nd
      :               ,t_wake,q_wake,qs_wake,gz,u,v,tra,p,ph
-     :               ,th_wake,tv_wake,lv_wake,cpn_wake
+     :               ,th_wake,tv_wake,lv_wake,lf_wake,cpn_wake
      :               ,ep,sigp,clw
      :               ,m,ment,elij,delt,plcl,coef_clos
-     o          ,mp,qp,up,vp,trap,wt,water,evap,b,sigd
+     o          ,mp,qp,up,vp,trap,wt,water,evap,fondue,ice
+     :          ,faci,b,sigd
      o          ,wdtrainA,wdtrainM)   ! RomP
       endif
@@ -943 +957 @@
      :                     ,icb,inb,delt
      :                     ,t,q,t_wake,q_wake,s_wake,u,v,tra
-     :                     ,gz,p,ph,h,hp,lv,cpn,th,th_wake
+     :                     ,gz,p,ph,h,hp,lv,lf,cpn,th,th_wake
      :                     ,ep,clw,m,tp,mp,qp,up,vp,trap
-     :                     ,wt,water,evap,b,sigd
+     :                     ,wt,water,ice,evap,fondue,faci,b,sigd
      :                    ,ment,qent,hent,iflag_mix,uent,vent
      :                    ,nent,elij,traent,sig
@@ -1043 +1057 @@
       return
       end
-