Changeset 3662 for trunk/LMDZ.GENERIC

Timestamp:

Feb 27, 2025, 3:24:36 PM (4 months ago)

Author:

gmilcareck

Message:

Generic PCM:
Minor changing for the virtual potential temperature correction.
And convadj.F becomes convadj.F90 .
GM

Location:

trunk/LMDZ.GENERIC

Files:

• changelog.txt (modified) (1 diff)
• libf/phystd/callkeys_mod.F90 (modified) (1 diff)
• libf/phystd/convadj.F (deleted)
• libf/phystd/convadj.F90 (added)
• libf/phystd/inifis_mod.F90 (modified) (1 diff)
• libf/phystd/vdif_kc.F (modified) (4 diffs)

trunk/LMDZ.GENERIC/changelog.txt

@@ -2017 +2017 @@
 Water: changing only the name of the 'RV' variable to 'RW' 
 to avoid conflicts with the future thermodynamics module.
+
+== 27/02/2025 == GM
+
+Minor changing for the virtual potential temperature correction.
+And convadj.F becomes convadj.F90 .

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

@@ -55 +55 @@
       logical,save :: generic_condensation
       logical,save :: generic_rain
-      logical,save :: virtual_correction
-!$OMP THREADPRIVATE(varactive,varfixed,sedimentation,generic_condensation,generic_rain,virtual_correction)
+      logical,save :: virtual_theta_correction
+!$OMP THREADPRIVATE(varactive,varfixed,sedimentation,generic_condensation,generic_rain,virtual_theta_correction)
       logical,save :: water ,watercond, waterrain, moistadjustment, moistadjustment_generic, moist_convection_inhibition
 !$OMP THREADPRIVATE(water, watercond, waterrain, moistadjustment, moistadjustment_generic, moist_convection_inhibition)

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

@@ -1074 +1074 @@
      if (is_master) write(*,*)trim(rname)//": moist_convection_inhibition = ", moist_convection_inhibition
      
-     if (is_master) write(*,*)trim(rname)//": Virtual correction ?"
-     virtual_correction=.false. !default value 
-     call getin_p("virtual_correction",virtual_correction)
-     if (is_master) write(*,*)trim(rname)//": virtual_correction = ",virtual_correction
+     if (is_master) write(*,*)trim(rname)//": Virtual theta correction ?"
+     virtual_theta_correction=.false. !default value 
+     call getin_p("virtual_theta_correction",virtual_theta_correction)
+     if (is_master) write(*,*)trim(rname)//": virtual_theta_correction = ",virtual_theta_correction
 
      if (is_master) write(*,*)trim(rname)//": Compute water cycle ?"

trunk/LMDZ.GENERIC/libf/phystd/vdif_kc.F

@@ -3 +3 @@
       use generic_cloud_common_h, only: epsi_generic
       use generic_tracer_index_mod, only: generic_tracer_index
-      use callkeys_mod, only: generic_condensation, virtual_correction
+      use callkeys_mod, only: generic_condensation, 
+     &                        virtual_theta_correction
       IMPLICIT NONE
 c.......................................................................
@@ -262 +263 @@
 c
 c.......................................................................
-c  Virtual correction
-c.......................................................................
-c
-
-      if((generic_condensation) .and. (virtual_correction)) THEN
+c  Virtual theta correction
+c.......................................................................
+c
+
+      if((generic_condensation) .and. (virtual_theta_correction)) THEN
         DO ilev=1,nlay
          DO igrid=1,ngrid
@@ -274 +275 @@
             if(call_ice_vap_generic) then
                tetav(igrid,ilev) = teta(igrid,ilev)*
-     &              (1.+zq(igrid,ilev,igcm_generic_vap)/epsi_generic)/
-     &              (1.+zq(igrid,ilev,igcm_generic_vap))
+     &               (1.e0+(1.e0/epsi_generic-1.e0)*
+     &               zq(igrid,ilev,igcm_generic_vap))
             endif
           ENDDO
@@ -288 +289 @@
 c-----------------------------------------------------------------------
 c
-      if((generic_condensation) .and. (virtual_correction)) THEN
+      if((generic_condensation) .and. (virtual_theta_correction)) THEN
         n2(igrid,ilev)=g*unsdzdec(igrid,ilev)
      &                 *(tetav(igrid,ilev)-tetav(igrid,ilev-1))