Merge pull request #1379 from JulioTBacmeister/my_branch_radmods

peverwhee · web-flow · commit a239db6485d3 · 2025-08-29T16:30:11.000-06:00
cam6_4_111: Making blending region consistent with p_top for radiation schemes
diff --git a/bld/build-namelist b/bld/build-namelist
@@ -739,7 +739,7 @@ elsif ($rad_pkg =~ m/rrtmgp/) {
     my $abs_path = quote_string(set_abs_filepath($rel_path, $cam_dir));
     $nl->set_variable_value('radiation_nl', 'rrtmgp_coefs_sw_file', $abs_path);
 
-    add_default($nl, 'p_top_for_rrtmgp');
+    add_default($nl, 'p_top_for_equil_rad');
 
 }
 
@@ -3339,7 +3339,7 @@ if ($cfg->get('microphys') =~ /^mg/) {
 	add_default($nl, 'micro_mg_accre_sees_auto');
 	add_default($nl, 'micro_mg_vtrms_factor');
 	add_default($nl, 'micro_mg_implicit_fall');
-        add_default($nl, 'pumas_stochastic_tau_kernel_filename', 'val'=>"$cfgdir/../src/atmos_phys/pumas/pumas/KBARF_tau_kernel.dat");
+        add_default($nl, 'pumas_stochastic_tau_kernel_filename', 'val'=>"$cfgdir/../src/atmos_phys/schemes/pumas/pumas/KBARF_tau_kernel.dat");
 
         #set path for stochastic_tau_kernel_filename
         my $cam_dir = $cfg->get('cam_dir');
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -575,9 +575,11 @@
 <rrtmgp_coefs_lw_file>src/physics/rrtmgp/data/rrtmgp-gas-lw-g128.nc</rrtmgp_coefs_lw_file>
 <rrtmgp_coefs_sw_file>src/physics/rrtmgp/data/rrtmgp-gas-sw-g112.nc</rrtmgp_coefs_sw_file>
 
-<p_top_for_rrtmgp>                 10.D0 </p_top_for_rrtmgp>
-<p_top_for_rrtmgp  waccmx="1" >     1.D0 </p_top_for_rrtmgp>
-<p_top_for_rrtmgp  waccm_phys="1" > 1.D0 </p_top_for_rrtmgp>
+<!-- Pressure top for blending region for radiation heating -->
+<p_top_for_equil_rad>                  0.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  waccmx="1" >     1.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  waccm_phys="1" > 1.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  rad="rrtmgp">    2.D0 </p_top_for_equil_rad>
 
 <!-- CAM-RT absorptivity/emissivity lookup table -->
 <absems_data rad="camrt">atm/cam/rad/abs_ems_factors_fastvx.c030508.nc</absems_data>
diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
@@ -5771,11 +5771,12 @@ Calculate radiative effect of graupel/hail (using snow optics)
 Default: FALSE
 </entry>
 
-<entry id="p_top_for_rrtmgp" type="real"  category="radiation"
-       group="radiation_nl" valid_values="" >
-Top pressure level for RRTMGP
+<entry id="p_top_for_equil_rad" type="real"  category="radiation"
+       group="radheat_nl" valid_values="" >
+Top pressure level for non-LTE blending region
 Default: 1.0 for WACCM/WACCMX
-         10. for all other CAM runs
+         2. for all other RRTMGP runs
+         0.0 for all other runs
 </entry>
 
 <entry id="use_rad_dt_cosz" type="logical"  category="radiation"
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,92 @@
+===============================================================
+
+Tag name: cam6_4_111
+Originator(s): JulioTBacmeister, cacraigucar, peverwhee
+Date: August 29, 2025
+One-line Summary: Making blending region consistent with p_top for radiation schemes
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1379
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+  - Rename p_top_for_rrtmgp to the more generic p_top_for_equil_rad
+  - Move p_top_for_equil_rad to radheat namelist group and read in radheat_readnl
+  - Use p_top_for_equil_rad to set minimum pressure for blending layer in radheat_init
+  - Update stochastic tau PUMAS file path to match new location
+
+Describe any changes made to build system: N/A
+
+Describe any changes made to the namelist:
+M   bld/build-namelist
+M   bld/namelist_files/namelist_defaults_cam.xml
+M   bld/namelist_files/namelist_definition.xml
+- Rename p_top_for_rrtmgp to p_top_for_equil_rad
+- Update default for RRTMGP (cam7 physics) to 2
+- Correct the stochastic tau pumas file path
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: cacraigucar, peverwhee
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+M   src/physics/cam/radheat.F90
+- remove unused variables
+- read in p_top_for_equil_rad in readnl
+- use p_top_for_equil_rad as minimum lw pressure
+
+M   src/physics/rrtmgp/radiation.F90
+- Remove p_top_for_rrtmgp from readnl
+- "use" p_top_for_equil_rad in radiation_init to pass into rrtmgp_inputs_setup_init
+
+M   src/physics/waccm/radheat.F90
+- Add p_top_for_equil_rad to readnl routine
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam:
+  ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
+  SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
+  - diffs for MT configuration due to namelist default change
+
+  ERC_D_Ln9.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: NLFAIL) details:
+  ERC_D_Ln9.mpasa120_mpasa120.QPC7.derecho_intel.cam-outfrq9s_mpasa120 (Overall: NLFAIL) details:
+  ERC_D_Ln9.ne30pg2_ne30pg2_mt232.QPC7.derecho_intel.cam-outfrq9s (Overall: NLFAIL) details:
+  ERI_D_Ln18.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq3s_eri (Overall: NLFAIL) details:
+  ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: NLFAIL) details:
+  ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: NLFAIL) details:
+  ERR_Ln9.ne16pg3_ne16pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s_bwic (Overall: NLFAIL) details:
+  ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s_ctem (Overall: NLFAIL) details:
+  SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: NLFAIL) details:
+  SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: NLFAIL) details:
+  - nlfails for all RRTMGP configurations due to namelist name change
+
+  SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+  - pre-existing failure due to build-namelist error requiring CLM/CTSM external update.
+
+derecho/nvhpc/aux_cam:
+  ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: NLFAIL) details:
+  - nlfail for all RRTMGP configurations due to namelist name change
+
+izumi/nag/aux_cam:
+  ERC_D_Ln9.mpasa480_mpasa480_mt232.QPC7.izumi_nag.cam-outfrq9s_mpasa480 (Overall: NLFAIL) details:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-cosp_rad_diags (Overall: NLFAIL) details:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-outfrq9s_nochem (Overall: NLFAIL) details:
+  - nlfails for all RRTMGP configurations due to namelist name change
+
+izumi/gnu/aux_cam:
+  ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: NLFAIL) details:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_gnu.cam-sat_lcltod (Overall: NLFAIL) details:
+  ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC7.izumi_gnu.cam-outfrq9s (Overall: NLFAIL) details:
+  SMS_D_Ln3.ne3pg3_ne3pg3_mt232.PC7.izumi_gnu.cam-pc7_ne3pg3 (Overall: NLFAIL) details:
+  - nlfails for all RRTMGP configurations due to namelist name change
 
 ===============================================================
 
diff --git a/src/physics/cam/radheat.F90 b/src/physics/cam/radheat.F90
@@ -39,16 +39,12 @@ module radheat
 
   public :: radheat_disable_waccm ! disable waccm heating in the upper atm
 
+  real(r8), public :: p_top_for_equil_rad = 0._r8
+
 ! Private variables for merging heating rates
   real(r8):: qrs_wt(pver)             ! merge weight for cam solar heating
   real(r8):: qrl_wt(pver)             ! merge weight for cam long wave heating
 
-  ! sw merge region
-  ! highest altitude (lowest  pressure) of merge region (Pa)
-  real(r8) :: min_pressure_sw= 5._r8
-  ! lowest  altitude (lowest  pressure) of merge region (Pa)
-  real(r8) :: max_pressure_sw=50._r8
-
   ! lw merge region
   ! highest altitude (lowest  pressure) of merge region (Pa)
   real(r8) :: min_pressure_lw= 5._r8
@@ -61,10 +57,36 @@ module radheat
 contains
 !===============================================================================
 subroutine radheat_readnl(nlfile)
-
-  character(len=*), intent(in) :: nlfile  ! filepath for file containing namelist input
-
-  ! No options for this version of radheat; this is just a stub.
+   ! Read radheat_nl namelist group
+   use namelist_utils,  only: find_group_name
+   use spmd_utils,      only: mpicom, mstrid=>masterprocid, mpi_real8
+   use cam_abortutils,  only: endrun
+
+   character(len=*), intent(in) :: nlfile  ! filepath for file containing namelist input
+
+   ! Local variables
+   integer :: unitn, ierr
+   integer :: dtime      ! timestep size
+   character(len=32) :: errmsg
+   character(len=*), parameter :: sub = 'radheat_readnl'
+
+   namelist /radheat_nl/ p_top_for_equil_rad
+   !-----------------------------------------------------------------------------
+
+   if (masterproc) then
+      open( newunit=unitn, file=trim(nlfile), status='old' )
+      call find_group_name(unitn, 'radheat_nl', status=ierr)
+      if (ierr == 0) then
+         read(unitn, radheat_nl, iostat=ierr, iomsg=errmsg)
+         if (ierr /= 0) then
+            call endrun(sub//': ERROR reading namelist: '//trim(errmsg))
+         end if
+      end if
+      close(unitn)
+   end if
+
+   call mpi_bcast(p_top_for_equil_rad, 1, mpi_real8, mstrid, mpicom, ierr)
+   if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: p_top_for_equil_rad")
 
 end subroutine radheat_readnl
 
@@ -92,8 +114,6 @@ subroutine radheat_init(pref_mid)
     ! local vars
     real(r8) :: co2_mw, o1_mw, o2_mw, o3_mw, no_mw, n2_mw ! molecular weights
 
-    real(r8) :: delta_merge_sw      ! range of merge region
-    real(r8) :: midpoint_sw         ! midpoint of merge region
     real(r8) :: delta_merge_lw      ! range of merge region
     real(r8) :: midpoint_lw         ! midpoint of merge region
     real(r8) :: psh(pver)           ! pressure scale height
@@ -116,43 +136,22 @@ subroutine radheat_init(pref_mid)
     ! set max/min pressures for merging regions.
 
     if (camrt) then
-       min_pressure_sw = 1e5_r8*exp(-10._r8)
-       max_pressure_sw = 1e5_r8*exp(-9._r8)
        min_pressure_lw = 1e5_r8*exp(-10._r8)
        max_pressure_lw = 1e5_r8*exp(-8.57_r8)
     else
-       min_pressure_sw =  5._r8
-       max_pressure_sw = 50._r8
-       min_pressure_lw = 10._r8
+       min_pressure_lw = p_top_for_equil_rad
        max_pressure_lw = 50._r8
     endif
 
-    delta_merge_sw = max_pressure_sw - min_pressure_sw
     delta_merge_lw = max_pressure_lw - min_pressure_lw
 
-    midpoint_sw = (max_pressure_sw + min_pressure_sw)/2._r8
     midpoint_lw = (max_pressure_lw + min_pressure_lw)/2._r8
 
     do k=1,pver
 
        ! pressure scale heights for camrt merging (cam4)
        psh(k)=log(1e5_r8/pref_mid(k))
 
-       if ( pref_mid(k) .le. min_pressure_sw  ) then
-          qrs_wt(k) = 0._r8
-       else if( pref_mid(k) .ge. max_pressure_sw) then
-          qrs_wt(k) = 1._r8
-       else
-          if (camrt) then
-             ! camrt
-             qrs_wt(k) = 1._r8 - tanh( (psh(k) - 9._r8)/.75_r8 )
-          else
-             ! rrtmg
-             qrs_wt(k) = 0.5_r8 + 1.5_r8*((pref_mid(k)-midpoint_sw)/delta_merge_sw) &
-                       - 2._r8*((pref_mid(k)-midpoint_sw)/delta_merge_sw)**3._r8
-          endif
-       endif
-
        if ( pref_mid(k) .le. min_pressure_lw  ) then
           qrl_wt(k)= 0._r8
        else if( pref_mid(k) .ge. max_pressure_lw) then
diff --git a/src/physics/rrtmgp/radiation.F90 b/src/physics/rrtmgp/radiation.F90
@@ -148,8 +148,6 @@ module radiation
 logical :: graupel_in_rad   = .false. ! graupel in radiation code
 logical :: use_rad_uniform_angle = .false. ! if true, use the namelist rad_uniform_angle for the coszrs calculation
 
-real(r8) :: p_top_for_rrtmgp = 0._r8 ! top pressure for RRTMGP
-
 ! Gathered indices of day and night columns 
 integer :: nday           ! Number of daylight columns
 integer :: nnite          ! Number of night columns
@@ -275,7 +273,7 @@ subroutine radiation_readnl(nlfile)
    namelist /radiation_nl/ &
       rrtmgp_coefs_lw_file, rrtmgp_coefs_sw_file, iradsw, iradlw,        &
       irad_always, use_rad_dt_cosz, spectralflux, use_rad_uniform_angle, &
-      rad_uniform_angle, graupel_in_rad, p_top_for_rrtmgp
+      rad_uniform_angle, graupel_in_rad
    !-----------------------------------------------------------------------------
 
    if (masterproc) then
@@ -311,8 +309,6 @@ subroutine radiation_readnl(nlfile)
    if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: rad_uniform_angle")   
    call mpi_bcast(graupel_in_rad, 1, mpi_logical, mstrid, mpicom, ierr)
    if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: graupel_in_rad")
-   call mpi_bcast(p_top_for_rrtmgp, 1, mpi_real8, mstrid, mpicom, ierr)
-   if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: p_top_for_rrtmgp")
 
    if (use_rad_uniform_angle .and. rad_uniform_angle == -99._r8) then
       call endrun(sub//': ERROR - use_rad_uniform_angle is set to .true,' &
@@ -420,6 +416,7 @@ subroutine radiation_init(pbuf2d)
    use rad_constituents,          only: iceopticsfile, liqopticsfile
    use rrtmgp_lw_gas_optics,      only: rrtmgp_lw_gas_optics_init
    use rrtmgp_sw_gas_optics,      only: rrtmgp_sw_gas_optics_init
+   use radheat,                   only: p_top_for_equil_rad
 
    ! Initialize the radiation and cloud optics.
    ! Add fields to the history buffer.
@@ -471,7 +468,7 @@ subroutine radiation_init(pbuf2d)
    call rrtmgp_inputs_setup_init(ktopcam, ktoprad, nlaycam, sw_low_bounds, sw_high_bounds, nswbands,               &
                    pref_edge, nlay, pver, pverp, kdist_sw, kdist_lw, qrl_unused, is_first_step(), use_rad_dt_cosz, &
                    get_step_size(), get_nstep(), iradsw, dt_avg, irad_always, is_first_restart_step(),             &
-                   p_top_for_rrtmgp, nlwbands, nradgas, gasnamelength, idx_sw_diag, idx_nir_diag, idx_uv_diag,     &
+                   p_top_for_equil_rad, nlwbands, nradgas, gasnamelength, idx_sw_diag, idx_nir_diag, idx_uv_diag,  &
                    idx_sw_cloudsim, idx_lw_diag, idx_lw_cloudsim, nswgpts, nlwgpts, nlayp, nextsw_cday,            &
                    get_curr_calday(), band2gpt_sw, errmsg, errflg)
    if (errflg /= 0) then
diff --git a/src/physics/waccm/radheat.F90 b/src/physics/waccm/radheat.F90
@@ -46,6 +46,7 @@ module radheat
   logical :: nlte_limit_co2 = .false. ! if true apply upper limit to co2 in the Fomichev scheme
   logical :: nlte_use_aliarms = .false. ! If true, use ALI-ARMS for the cooling rate calculation
   integer :: nlte_aliarms_every_X = 1 ! Call aliarms every X times radiation is called
+  real(r8), public :: p_top_for_equil_rad = 0._r8 ! Pressure top for blending layer
 
 ! Private variables for merging heating rates
   real(r8):: qrs_wt(pver)             ! merge weight for cam solar heating
@@ -77,7 +78,7 @@ subroutine radheat_readnl(nlfile)
     use namelist_utils,  only: find_group_name
     use units,           only: getunit, freeunit
     use cam_abortutils,  only: endrun
-    use spmd_utils,     only : mpicom, masterprocid, mpi_logical, mpi_integer
+    use spmd_utils,     only : mpicom, masterprocid, mpi_logical, mpi_integer, mpi_real8
 
     use waccm_forcing,   only: waccm_forcing_readnl
 
@@ -87,7 +88,7 @@ subroutine radheat_readnl(nlfile)
     integer :: unitn, ierr
     character(len=*), parameter :: subname = 'radheat_readnl'
 
-    namelist /radheat_nl/ nlte_use_mo, nlte_limit_co2, nlte_use_aliarms,nlte_aliarms_every_X
+    namelist /radheat_nl/ nlte_use_mo, nlte_limit_co2, nlte_use_aliarms,nlte_aliarms_every_X, p_top_for_equil_rad
 
     if (masterproc) then
        unitn = getunit()
@@ -112,6 +113,8 @@ subroutine radheat_readnl(nlfile)
     if (ierr /= 0) call endrun("radheat_readnl: FATAL: mpi_bcast: nlte_use_aliarms")
     call mpi_bcast (nlte_aliarms_every_X, 1, mpi_integer, masterprocid, mpicom, ierr)
     if (ierr /= 0) call endrun("radheat_readnl: FATAL: mpi_bcast: nlte_aliarms_every_X")
+    call mpi_bcast(p_top_for_equil_rad, 1, mpi_real8, masterprocid, mpicom, ierr)
+    if (ierr /= 0) call endrun("radheat_readnl: FATAL: mpi_bcast: p_top_for_equil_rad")
 
     ! Have waccm_forcing read its namelist as well.
     call waccm_forcing_readnl(nlfile)
