Changeset 2701 for trunk/LMDZ.GENERIC/libf

Timestamp:

Jun 21, 2022, 11:05:35 AM (2 years ago)

Author:

aslmd

Message:

rename largescale_generic and genericcommon_h

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• condensation_generic_mod.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/largescale_generic_mod.F90) (2 diffs)
• evap_generic.F90 (modified) (2 diffs)
• generic_cloud_common_h.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/genericcommon_h.F90) (2 diffs)
• physiq_mod.F90 (modified) (4 diffs)

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

@@ -1 @@
-module largescale_generic_mod
+module condensation_generic_mod
     implicit none
     
 contains
     
-    subroutine largescale_generic(ngrid,nlayer,nq,ptimestep, pplev, pplay,    &
+    subroutine condensation_generic(ngrid,nlayer,nq,ptimestep, pplev, pplay,    &
                 pt, pq, pdt, pdq, pdtlsc, pdqvaplsc, pdqliqlsc)
         use ioipsl_getin_p_mod, only: getin_p !-> to get the metallicity 
-        use genericcommon_h, only : RLVTT, cpp, &
+        use generic_cloud_common_h, only : RLVTT, cpp, &
         Psat_generic,Lcpdqsat_generic,specie_parameters
         USE tracer_h
@@ -148 +148 @@
                 endif !(is_generic(iq)==1) .and. (index(noms(iq),"vap") .ne. 0))
         enddo ! iq=1,nq
-        ! print*, "pdqvaplsc = ",pdqvaplsc(:,:)
-        ! print*,"pdtlsc = ",pdtlsc(:,:)
-    end subroutine largescale_generic
-end module largescale_generic_mod
+
+    end subroutine condensation_generic
+end module condensation_generic_mod

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

@@ -1 +1 @@
 subroutine evap_generic(ngrid,nlayer,nq,dtime,pt,pq,pdq,pdt,igcm_generic_vap, &
                         igcm_generic_ice,dqevap,dtevap,qevap,tevap)
-    Use genericcommon_h
+    Use generic_cloud_common_h
     Use tracer_h
     implicit none 
@@ -38 +38 @@
 
     !   Evaporate all the ice from the tracer
-    zlvdcp = RLVTT/cpp ! RLVTT is the latent heat of vaporization (comes from genericcommon_h attention)
+    zlvdcp = RLVTT/cpp ! RLVTT is the latent heat of vaporization (comes from generic_cloud_common_h attention)
  
     DO l=1,nlayer

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

@@ -1 @@
-module genericcommon_h
+module generic_cloud_common_h
     use comcstfi_mod, only: r, cpp, mugaz
     implicit none 
@@ -155 +155 @@
     end subroutine Lcpdqsat_generic
 
-end module genericcommon_h
+end module generic_cloud_common_h

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

@@ -71 +71 @@
       use turb_mod, only : q2,sensibFlux,turb_resolved
       use mass_redistribution_mod, only: mass_redistribution
-      use largescale_generic_mod, only: largescale_generic 
+      use condensation_generic_mod, only: condensation_generic 
 #ifndef MESOSCALE
       use vertical_layers_mod, only: presnivs, pseudoalt
@@ -297 +297 @@
       ! For Atmospheric Temperatures : (K/s)    
       real dtlscale(ngrid,nlayer)                             ! Largescale routine.
-      real dtlscale_generic(ngrid,nlayer)                     ! largescale_generic routine. 
+      real dtlscale_generic(ngrid,nlayer)                     ! condensation_generic routine. 
       real zdtc(ngrid,nlayer)                                 ! Condense_co2 routine.
       real zdtdif(ngrid,nlayer)                               ! Turbdiff/vdifc routines.
@@ -330 +330 @@
       real dqvaplscale(ngrid,nlayer)  ! Largescale routine.
       real dqcldlscale(ngrid,nlayer)  ! Largescale routine.
-      real dqvaplscale_generic(ngrid,nlayer,nq) !largescale_generic routine.
-      real dqcldlscale_generic(ngrid,nlayer,nq) !largescale_generic routine.
+      real dqvaplscale_generic(ngrid,nlayer,nq) !condensation_generic routine.
+      real dqcldlscale_generic(ngrid,nlayer,nq) !condensation_generic routine.
       REAL,allocatable,save :: zdqchim(:,:,:) ! Calchim_asis routine
       REAL,allocatable,save :: zdqschim(:,:)  ! Calchim_asis routine
@@ -1547 +1547 @@
   !   VI.3. Aerosol particles
   ! -------------------------
-         ! Generic tracers condensation and evaporation
-         ! do iq=1,nq
-         !    !loop on tracers and check if is_generic and  if "vap" in noms
-         !    if((is_generic(iq)==1) .and. (index(noms(iq),"vap") .ne. 0)) then
-         !       ! call to largescale_generic
-         !       print*,"we're in the GENERIC condition"
-         !       call largescale_generic(ngrid,nlayer,nq,ptimestep,pplev,pplay,   &
-         !                               pt,pq,pdt,pdq,noms(iq),dtlscale_generic, &
-         !                               dqvaplscale_generic,dqcldlscale_generic)
-         !       pdt(1:ngrid,1:nlayer) = pdt(1:ngrid,1:nlayer)+dtlscale_generic(1:ngrid,1:nlayer)
-         !       pdq(1:ngrid,1:nlayer,iq) = pdq(1:ngrid,1:nlayer,iq)+dqvaplscale_generic(1:ngrid,1:nlayer)
-         !       pdq(1:ngrid,1:nlayer,iq+1) = pdq(1:ngrid,1:nlayer,iq+1)+dqcldlscale_generic(1:ngrid,1:nlayer)
-         !       !!!!huge assumption in the last line : ice tracer has index +1 of vap tracer
-         !    endif ! (is_generic(iq)==1 .and. (index(noms(iq),"vap") .ne. 0))
-         ! enddo ! iq=1,nq
+
          !Generic Condensation
          if (generic_condensation) then 
-            call largescale_generic(ngrid,nlayer,nq,ptimestep,pplev,pplay,   &
+            call condensation_generic(ngrid,nlayer,nq,ptimestep,pplev,pplay,   &
                                           pt,pq,pdt,pdq,dtlscale_generic, &
                                           dqvaplscale_generic,dqcldlscale_generic)