Changeset 4079 for trunk/LMDZ.GENERIC

Timestamp:

Feb 19, 2026, 9:22:06 PM (8 days ago)

Author:

mturbet

Message:

minor renaming commit

Location:

trunk/LMDZ.GENERIC/libf/phygeneric

Files:

• aerosol_radius.F90 (modified) (3 diffs)
• callsedim.F (modified) (2 diffs)
• newsedim.F (modified) (2 diffs)
• physiq_mod.F90 (modified) (2 diffs)
• rad_correlatedk.F90 (modified) (3 diffs)
• rain.F90 (modified) (2 diffs)
• rain_generic.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/phygeneric/aerosol_radius.F90

@@ -190 +190 @@
 
 !==================================================================
-   subroutine h2o_reffrad(ngrid,nlayer,pq,pt,reffrad,nueffrad)
-!==================================================================
-!     Purpose
-!     -------
-!     Compute the effective radii of liquid and icy water particles
+   subroutine aerosol_radius_h2o_liquid_ice_mixture(ngrid,nlayer,pq,pt,reffrad,nueffrad)
+!==================================================================
+!     Purpose
+!     -------
+!     Compute the effective radii of the mixture of liquid and icy water particles. 
 !
 !     Authors
@@ -246 +246 @@
       nueffrad(1:ngrid,1:nlayer)=nueff_iaero_h2o
 
-   end subroutine h2o_reffrad
-!==================================================================
-
-
-!==================================================================
-   subroutine h2o_cloudrad(ngrid,nlayer,pql,reffliq,reffice)
-!==================================================================
-!     Purpose
-!     -------
-!     Compute the effective radii of liquid and icy water particles
+   end subroutine aerosol_radius_h2o_liquid_ice_mixture
+!==================================================================
+
+
+!==================================================================
+   subroutine aerosol_radius_h2o_liquid_ice_separate(ngrid,nlayer,pql,reffliq,reffice)
+!==================================================================
+!     Purpose
+!     -------
+!     Compute the effective radii of liquid and icy water particles independently.
 !
 !     Authors
@@ -290 +290 @@
       endif
 
-   end subroutine h2o_cloudrad
+   end subroutine aerosol_radius_h2o_liquid_ice_separate
 !==================================================================
 

trunk/LMDZ.GENERIC/libf/phygeneric/callsedim.F

@@ -10 +10 @@
 
       use radinc_h, only : naerkind
-      use aerosol_radius, only: h2o_reffrad
+      use aerosol_radius, only: aerosol_radius_h2o_liquid_ice_mixture
       use aerosol_global_variables , only : iaero_h2o
       USE tracer_h, only : igcm_co2_ice,igcm_h2o_ice,radius,rho_q
@@ -128 +128 @@
 ! Water          
        if (water.and.(iaero_h2o.ne.0).and.(iq.eq.igcm_h2o_ice)) then
-            ! compute radii for h2o_ice 
-             call h2o_reffrad(ngrid,nlay,zqi(1,1,igcm_h2o_ice),zt,
-     &                reffrad(1,1,iaero_h2o),nueffrad(1,1,iaero_h2o))
-            ! call sedimentation for h2o_ice
-             call newsedim(ngrid,nlay,ngrid*nlay,ptimestep,
-     &            pplev,masse,epaisseur,zt,reffrad(1,1,iaero_h2o),
-     &            rho_q(iq),zqi(1,1,igcm_h2o_ice),wq,iq)
+         ! compute radii for h2o_ice 
+         call aerosol_radius_h2o_liquid_ice_mixture(ngrid,nlay,zqi(1,
+     &   1,igcm_h2o_ice),zt,reffrad(1,1,iaero_h2o),
+     &   nueffrad(1,1,iaero_h2o))
+         ! call sedimentation for h2o_ice
+         call newsedim(ngrid,nlay,ngrid*nlay,ptimestep,
+     &        pplev,masse,epaisseur,zt,reffrad(1,1,iaero_h2o),
+     &        rho_q(iq),zqi(1,1,igcm_h2o_ice),wq,iq)
 
 ! General Case

trunk/LMDZ.GENERIC/libf/phygeneric/newsedim.F

@@ -15 +15 @@
       use tracer_h, only : igcm_h2o_ice
       use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds     
-      use aerosol_radius, only: h2o_cloudrad
+      use aerosol_radius, only: aerosol_radius_h2o_liquid_ice_separate
 
       IMPLICIT NONE
@@ -166 +166 @@
 c Compute liquid and ice particle radii
         if((iq.eq.igcm_h2o_ice).and.crystal_shape) then
-            call h2o_cloudrad(ngrid,nlay,pqi,reffh2oliq,reffh2oice)
+            call aerosol_radius_h2o_liquid_ice_separate(ngrid,
+     &                         nlay,pqi,reffh2oliq,reffh2oice)
         endif
 

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

@@ -25 +25 @@
       use rad_correlatedk_ini_aerosol_mod, only: rad_correlatedk_ini_aerosol
       use rad_correlatedk_init_stellar_mod, only: rad_correlatedk_init_stellar
-      use aerosol_radius, only: h2o_reffrad, aerosol_radius_co2
+      use aerosol_radius, only: aerosol_radius_h2o_liquid_ice_mixture, aerosol_radius_co2
       use aerosol_global_variables , only: aerosol_init, iaero_co2, iaero_h2o
       use surfdat_h, only: phisfi, zmea, zstd, zsig, zgam, zthe, &
@@ -2305 +2305 @@
          endif
          if(water.and.(iaero_h2o.ne.0))then
-            call h2o_reffrad(ngrid,nlayer,zq(1,1,igcm_h2o_ice),zt, &
+            call aerosol_radius_h2o_liquid_ice_mixture(ngrid,nlayer,zq(1,1,igcm_h2o_ice),zt, &
                              reffrad(1,1,iaero_h2o),nueffrad(1,1,iaero_h2o))
             do ig=1,ngrid

trunk/LMDZ.GENERIC/libf/phygeneric/rad_correlatedk.F90

@@ -27 +27 @@
       use ioipsl_getin_p_mod, only: getin_p
       use gases_h, only: ngasmx
-      use aerosol_radius, only : aerosol_radius_init,aerosol_radius_co2,h2o_reffrad, &
+      use aerosol_radius, only : aerosol_radius_init,aerosol_radius_co2,aerosol_radius_h2o_liquid_ice_mixture, &
                     aerosol_radius_dust,aerosol_radius_h2so4,aerosol_radius_back2lay
       use aerosol_global_variables , only : iaero_co2,iaero_h2o,iaero_dust,iaero_h2so4, &
@@ -503 +503 @@
          
          if ((iaer.eq.iaero_h2o).and.water) then ! Treat condensed water particles. To be generalized for other aerosols ...
-            call h2o_reffrad(ngrid,nlayer,pq(1,1,igcm_h2o_ice),pt, &
+            call aerosol_radius_h2o_liquid_ice_mixture(ngrid,nlayer,pq(1,1,igcm_h2o_ice),pt, &
                              reffrad(1,1,iaero_h2o),nueffrad(1,1,iaero_h2o))
             
@@ -513 +513 @@
             end if
 
-! Currently the variance is constant everywhere (see h2o_reffrad),
+! Currently the variance is constant everywhere (see aerosol_radius_h2o_liquid_ice_mixture),
 ! so no need to compute and print min/max
 !            call planetwide_maxval(nueffrad(:,:,iaero_h2o),maxvalue)

trunk/LMDZ.GENERIC/libf/phygeneric/rain.F90

@@ -4 +4 @@
   use ioipsl_getin_p_mod, only: getin_p
   use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds, RLVTT, RCPD, RCPV, RW, RVTMP2,Psat_water,Tsat_water,rhowater
-  use aerosol_radius, only: h2o_cloudrad
+  use aerosol_radius, only: aerosol_radius_h2o_liquid_ice_separate
   USE tracer_h, only: igcm_h2o_vap, igcm_h2o_ice
   use comcstfi_mod, only: g, r
@@ -278 +278 @@
 
  !recalculate liquid water particle radii
-           call h2o_cloudrad(ngrid,nlayer,ql,reffh2oliq,reffh2oice)
+           call aerosol_radius_h2o_liquid_ice_separate(ngrid,nlayer,ql,reffh2oliq,reffh2oice)
 
            SELECT CASE(precip_scheme)

trunk/LMDZ.GENERIC/libf/phygeneric/rain_generic.F90

@@ -6 +6 @@
    use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds,rhowater
    ! T_h2O_ice_clouds,rhowater  are only used for precip_scheme_generic >=2
-   use aerosol_radius, only: h2o_cloudrad ! only used for precip_scheme_generic >=2
+   use aerosol_radius, only: aerosol_radius_h2o_liquid_ice_separate ! only used for precip_scheme_generic >=2
    use tracer_h
    use comcstfi_mod, only: g, r, cpp
@@ -343 +343 @@
 
                !recalculate liquid GCS particle radii
-               call h2o_cloudrad(ngrid,nlayer,ql,reffh2oliq,reffh2oice)
+               call aerosol_radius_h2o_liquid_ice_separate(ngrid,nlayer,ql,reffh2oliq,reffh2oice)
 
                SELECT CASE(precip_scheme_generic)