Changeset 2728 for trunk/LMDZ.GENERIC/libf

Timestamp:

Jun 21, 2022, 11:05:48 AM (3 years ago)

Author:

aslmd

Message:

epsi_generic value corrected

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• callcorrk.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (3 diffs)

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

@@ -29 +29 @@
       use radii_mod, only : su_aer_radii,co2_reffrad,h2o_reffrad,dust_reffrad,h2so4_reffrad,back2lay_reffrad
       use aerosol_mod, only : iaero_co2,iaero_h2o,iaero_dust,iaero_h2so4, iaero_back2lay, iaero_aurora
-      use tracer_h, only: igcm_h2o_vap, igcm_h2o_ice, igcm_co2_ice
+      use tracer_h
       use comcstfi_mod, only: pi, mugaz, cpp
       use callkeys_mod, only: varactive,diurnal,tracer,water,varfixed,satval,diagdtau,    &
@@ -797 +797 @@
             endif
             if (generic_condensation .and. .not. water) then
-               qvar(k) = qvar(k)/(epsi_generic+qvar(k)*(1.-epsi_generic))
+               do iq=1,nq
+                  call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,call_ice_vap_generic)
+                  if (call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
+
+                     epsi_generic=constants_epsi_generic(iq)
+
+                     qvar(k) = qvar(k)/(epsi_generic+qvar(k)*(1.-epsi_generic))
+
+                  endif
+               end do ! do iq=1,nq loop on tracers
             endif
          end do

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

@@ -17 +17 @@
       use radinc_h, only : L_NSPECTI,L_NSPECTV,naerkind
       use watercommon_h, only : RLVTT, Psat_water,epsi,su_watercycle, RV, T_h2o_ice_liq
-      use generic_cloud_common_h, only : Psat_generic
+      use generic_cloud_common_h, only : epsi_generic, Psat_generic
       use thermcell_mod, only: init_thermcell_mod
       use gases_h, only: gnom, gfrac
@@ -33 +33 @@
                           alpha_lift, alpha_devil, qextrhor, &
                           igcm_h2o_ice, igcm_h2o_vap, igcm_dustbin, &
-                          igcm_co2_ice, nesp, is_chim, is_condensable
+                          igcm_co2_ice, nesp, is_chim, is_condensable,constants_epsi_generic
       use time_phylmdz_mod, only: ecritphy, iphysiq, nday
       use phyetat0_mod, only: phyetat0
@@ -931 +931 @@
                   muvar(1:ngrid,nlayer+1)=mugaz/(1.e0+(1.e0/epsi-1.e0)*pq(1:ngrid,nlayer,igcm_h2o_vap)) 
                   ! take into account water effect on mean molecular weight
+               elseif(generic_condensation) then
+                  do iq=1,nq
+
+                     call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,call_ice_vap_generic)
+                     
+                     if (call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
+
+                        epsi_generic=constants_epsi_generic(iq)
+
+                        muvar(1:ngrid,1:nlayer)=mugaz/(1.e0+(1.e0/epsi_generic-1.e0)*pq(1:ngrid,1:nlayer,igcm_generic_vap)) 
+                        muvar(1:ngrid,nlayer+1)=mugaz/(1.e0+(1.e0/epsi_generic-1.e0)*pq(1:ngrid,nlayer,igcm_generic_vap))  
+
+                     endif
+               end do ! do iq=1,nq loop on tracers 
+               ! take into account generic condensable specie (GCS) effect on mean molecular weight
+               
                else
                   muvar(1:ngrid,1:nlayer+1)=mugaz