Changeset 1909 for trunk/LMDZ.MARS/libf/phymars/improvedclouds.F

Timestamp:

Mar 9, 2018, 4:43:48 PM (7 years ago)

Author:

mvals

Message:

 

File:

• trunk/LMDZ.MARS/libf/phymars/improvedclouds.F (modified) (7 diffs)

trunk/LMDZ.MARS/libf/phymars/improvedclouds.F

@@ -1 @@
-      subroutine improvedclouds(ngrid,nlay,ptimestep,
-     &             pplay,pt,pdt,
-     &             pq,pdq,pdqcloud,pdtcloud,
+      subroutine improvedclouds(ngrid,nlay,microtimestep,
+     &             pplay,pteff,sum_subpdt,
+     &             pqeff,sum_subpdq,subpdqcloud,subpdtcloud,
      &             nq,tauscaling)
 ! to use  'getin'
@@ -42 +42 @@
       INTEGER ngrid,nlay
       integer nq                 ! nombre de traceurs
-      REAL ptimestep             ! pas de temps physique (s)
+      REAL microtimestep             ! pas de temps physique (s)
       REAL pplay(ngrid,nlay)     ! pression au milieu des couches (Pa)
             
-      REAL pt(ngrid,nlay)        ! temperature at the middle of the
+      REAL pteff(ngrid,nlay)        ! temperature at the middle of the
                                  !   layers (K)
-      REAL pdt(ngrid,nlay)       ! tendance temperature des autres
+      REAL sum_subpdt(ngrid,nlay)       ! tendance temperature des autres
                                  !   param.
-      REAL pq(ngrid,nlay,nq)     ! traceur (kg/kg)
-      REAL pdq(ngrid,nlay,nq)    ! tendance avant condensation
+      REAL pqeff(ngrid,nlay,nq)     ! traceur (kg/kg)
+      REAL sum_subpdq(ngrid,nlay,nq)    ! tendance avant condensation
                                  !   (kg/kg.s-1)
       REAL tauscaling(ngrid)     ! Convertion factor for qdust and Ndust
 
 c     Outputs:
-      REAL pdqcloud(ngrid,nlay,nq) ! tendance de la condensation
+      REAL subpdqcloud(ngrid,nlay,nq) ! tendance de la condensation
                                    !   H2O(kg/kg.s-1)
-      REAL pdtcloud(ngrid,nlay)    ! tendance temperature due
+      REAL subpdtcloud(ngrid,nlay)    ! tendance temperature due
                                    !   a la chaleur latente
 
@@ -216 +216 @@
 ! 1. Initialisation
 !=============================================================
-      cste = 4*pi*rho_ice*ptimestep
+      cste = 4*pi*rho_ice*microtimestep
 
       res_out(:,:) = 0
@@ -222 +222 @@
 
 c     Initialize the tendencies
-      pdqcloud(1:ngrid,1:nlay,1:nq)=0
-      pdtcloud(1:ngrid,1:nlay)=0
+      subpdqcloud(1:ngrid,1:nlay,1:nq)=0
+      subpdtcloud(1:ngrid,1:nlay)=0
     
       
       zt(1:ngrid,1:nlay) = 
-     &      pt(1:ngrid,1:nlay) + 
-     &      pdt(1:ngrid,1:nlay) * ptimestep
+     &      pteff(1:ngrid,1:nlay) + 
+     &      sum_subpdt(1:ngrid,1:nlay) * microtimestep
 
       zq(1:ngrid,1:nlay,1:nq) = 
-     &      pq(1:ngrid,1:nlay,1:nq) + 
-     &      pdq(1:ngrid,1:nlay,1:nq) * ptimestep
+     &      pqeff(1:ngrid,1:nlay,1:nq) + 
+     &      sum_subpdq(1:ngrid,1:nlay,1:nq) * microtimestep
       
       
@@ -317 +317 @@
         dM = 0.
         do i = 1, nbin_cld
-          n_aer(i) = n_aer(i)/( 1. + rate(i)*ptimestep)
-          m_aer(i) = m_aer(i)/( 1. + rate(i)*ptimestep)
-          dN       = dN + n_aer(i) * rate(i) * ptimestep
-          dM       = dM + m_aer(i) * rate(i) * ptimestep
+          n_aer(i) = n_aer(i)/( 1. + rate(i)*microtimestep)
+          m_aer(i) = m_aer(i)/( 1. + rate(i)*microtimestep)
+          dN       = dN + n_aer(i) * rate(i) * microtimestep
+          dM       = dM + m_aer(i) * rate(i) * microtimestep
         enddo
 
@@ -386 +386 @@
        lw=(2834.3-0.28*(zt(ig,l)-To)-
      &     0.004*(zt(ig,l)-To)*(zt(ig,l)-To))*1.e+3
-       pdtcloud(ig,l)= dMice*lw/cpp/ptimestep
+       subpdtcloud(ig,l)= dMice*lw/cpp/microtimestep
           
           
@@ -420 +420 @@
       
       ! Get cloud tendencies
-        pdqcloud(1:ngrid,1:nlay,igcm_h2o_vap) =
+        subpdqcloud(1:ngrid,1:nlay,igcm_h2o_vap) =
      &   (zq(1:ngrid,1:nlay,igcm_h2o_vap) - 
-     &    zq0(1:ngrid,1:nlay,igcm_h2o_vap))/ptimestep
-        pdqcloud(1:ngrid,1:nlay,igcm_h2o_ice) =
+     &    zq0(1:ngrid,1:nlay,igcm_h2o_vap))/microtimestep
+        subpdqcloud(1:ngrid,1:nlay,igcm_h2o_ice) =
      &   (zq(1:ngrid,1:nlay,igcm_h2o_ice) -
-     &    zq0(1:ngrid,1:nlay,igcm_h2o_ice))/ptimestep
-        pdqcloud(1:ngrid,1:nlay,igcm_ccn_mass) =
+     &    zq0(1:ngrid,1:nlay,igcm_h2o_ice))/microtimestep
+        subpdqcloud(1:ngrid,1:nlay,igcm_ccn_mass) =
      &   (zq(1:ngrid,1:nlay,igcm_ccn_mass) -
-     &    zq0(1:ngrid,1:nlay,igcm_ccn_mass))/ptimestep
-        pdqcloud(1:ngrid,1:nlay,igcm_ccn_number) =
+     &    zq0(1:ngrid,1:nlay,igcm_ccn_mass))/microtimestep
+        subpdqcloud(1:ngrid,1:nlay,igcm_ccn_number) =
      &   (zq(1:ngrid,1:nlay,igcm_ccn_number) -
-     &    zq0(1:ngrid,1:nlay,igcm_ccn_number))/ptimestep
+     &    zq0(1:ngrid,1:nlay,igcm_ccn_number))/microtimestep
      
       if (scavenging) then
       
-        pdqcloud(1:ngrid,1:nlay,igcm_dust_mass) =
+        subpdqcloud(1:ngrid,1:nlay,igcm_dust_mass) =
      &   (zq(1:ngrid,1:nlay,igcm_dust_mass) -
-     &    zq0(1:ngrid,1:nlay,igcm_dust_mass))/ptimestep
-        pdqcloud(1:ngrid,1:nlay,igcm_dust_number) =
+     &    zq0(1:ngrid,1:nlay,igcm_dust_mass))/microtimestep
+        subpdqcloud(1:ngrid,1:nlay,igcm_dust_number) =
      &   (zq(1:ngrid,1:nlay,igcm_dust_number) -
-     &    zq0(1:ngrid,1:nlay,igcm_dust_number))/ptimestep
+     &    zq0(1:ngrid,1:nlay,igcm_dust_number))/microtimestep
           
       endif