Changeset 1993 for trunk/LMDZ.GENERIC/libf/phystd/largescale.F90

Timestamp:

Aug 29, 2018, 4:41:34 PM (6 years ago)

Author:

jleconte

Message:

29/08/2018 == JL

-watersat was used only in vdifc and thus it was not consistent with other routines (turbdiff, rain, largescale...) which used Psat_water from watercommon.
This is now harmonized. ALl routines use Psat_water. Watersat.F has been removed, but the routine is now in watercommon for archival purpose. It is not used anymore.
-also changed the number of chars for tname in the dyn3D/infotrac.F90 to be able to run rcm1d.

File:

• trunk/LMDZ.GENERIC/libf/phystd/largescale.F90 (modified) (7 diffs)

trunk/LMDZ.GENERIC/libf/phystd/largescale.F90

@@ -5 +5 @@
       use ioipsl_getin_p_mod, only: getin_p
       use watercommon_h, only : RLVTT, RCPD, RVTMP2,  &
-          T_h2O_ice_clouds,T_h2O_ice_liq,Psat_waterDP,Lcpdqsat_waterDP
+          T_h2O_ice_clouds,T_h2O_ice_liq,Psat_water,Lcpdqsat_water
       USE tracer_h
       IMPLICIT none
@@ -50 +50 @@
       ! JL13: if "careful, T<Tmin in psat water" appears often, you may want to stabilise the model by
       !                   decreasing alpha and increasing nitermax accordingly
-      DOUBLE PRECISION zt(ngrid), zq(ngrid)
+      DOUBLE PRECISION zq(ngrid)
       DOUBLE PRECISION zcond(ngrid),zcond_iter
       DOUBLE PRECISION zdelq(ngrid)
-      DOUBLE PRECISION zqs(ngrid), zdqs(ngrid)
-      DOUBLE PRECISION local_p,psat_tmp,dlnpsat_tmp,Lcp
+      DOUBLE PRECISION zqs(ngrid)
+      real zt(ngrid),local_p,psat_tmp,dlnpsat_tmp,Lcp,zqs_temp,zdqs
       
 ! evaporation calculations
@@ -106 +106 @@
 !           zt(i)=15.   ! check too low temperatures
          endif
-         call Psat_waterDP(zt(i),local_p,psat_tmp,zqs(i))
+         call Psat_water(zt(i),local_p,psat_tmp,zqs_temp)
+         zqs(i)=zqs_temp
  
          zdelq(i) = MAX(MIN(ratqs * zq(i),1.-zq(i)),1.d-12)
@@ -127 +128 @@
             zcond(i) = 0.0d0
             Do nn=1,nitermax  
-               call Psat_waterDP(zt(i),local_p,psat_tmp,zqs(i))
-               call Lcpdqsat_waterDP(zt(i),local_p,psat_tmp,zqs(i),zdqs(i),dlnpsat_tmp)
-               zcond_iter = alpha*(zx_q(i)-zqs(i))/(1.d0+zdqs(i))          
+               call Psat_water(zt(i),local_p,psat_tmp,zqs_temp)
+               zqs(i)=zqs_temp
+               call Lcpdqsat_water(zt(i),local_p,psat_tmp,zqs_temp,zdqs,dlnpsat_tmp)
+               zcond_iter = alpha*(zx_q(i)-zqs(i))/(1.d0+zdqs)     
                   !zcond can be negative here
                zx_q(i) = zx_q(i) - zcond_iter
@@ -150 +152 @@
             zcond(i) = 0.0d0
             Do nn=1,nitermax  
-               call Lcpdqsat_waterDP(zt(i),local_p,psat_tmp,zqs(i),zdqs(i),dlnpsat_tmp)
-               zcond_iter = MAX(0.0d0,alpha*(zx_q(i)-zqs(i))/(1.d0+zdqs(i)))       
+               call Lcpdqsat_water(zt(i),local_p,psat_tmp,zqs(i),zdqs,dlnpsat_tmp)
+               zcond_iter = MAX(0.0d0,alpha*(zx_q(i)-zqs(i))/(1.d0+zdqs))          
                   !zcond always postive! cannot evaporate clouds!
                   !this is why we must reevaporate before largescale
@@ -159 +161 @@
 !              if (ABS(zcond_iter/alpha).lt.qthreshold) exit
                zt(i) = zt(i) + zcond_iter*Lcp*rneb(i,k)
-               call Psat_waterDP(zt(i),local_p,psat_tmp,zqs(i))
+               call Psat_water(zt(i),local_p,psat_tmp,zqs_temp)
+               zqs(i)=zqs_temp
                if (nn.eq.nitermax) print*,'itermax in largescale'
             End do ! niter
@@ -172 +175 @@
          pdqvaplsc(1:ngrid,k)  = dqevap(1:ngrid,k) - zcond(1:ngrid)
          pdqliqlsc(1:ngrid,k) = - pdqvaplsc(1:ngrid,k)
-         pdtlsc(1:ngrid,k)  = pdqliqlsc(1:ngrid,k)*real(Lcp)
+         pdtlsc(1:ngrid,k)  = pdqliqlsc(1:ngrid,k)*Lcp
 
    Enddo ! k= nlayer, 1, -1