Abstract aerosol interface; bulk aerosols (BAM); partial MAM; radiative_aerosol and physical props infra; optics core code; pfUnit tests

cime_config/buildlib

@@ -103,6 +103,7 @@ def _build_cam():
                               case.get_value("COMP_INTERFACE")),
                  os.path.join(atm_root, "src", "dynamics", "utils"),
                  os.path.join(atm_root, "src", "physics", "utils"),
+                 os.path.join(atm_root, "src", "aerosol"),
                  os.path.join(atm_root, "src", "history"),
                  os.path.join(atm_root, "src", "history", "buffers", "src"),
                  os.path.join(atm_root, "src", "history", "buffers", "src", "hash"),

cime_config/namelist_definition_cam.xml

@@ -403,6 +403,182 @@
     </values>
   </entry>
 
+<!-- Radiatively active aerosol -->
+  <entry id="mode_defs">
+    <type>char*256(120)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Definitions for the aerosol modes that may be used in the rad_climate and
+      rad_aer_diag_* variables.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="bin_defs">
+    <type>char*256(640)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Definitions for the aerosol bins that may be used in the rad_climate and
+      rad_aer_diag_* variables.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_climate">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      A list of the radiatively active species, i.e., species that affect the
+      climate simulation via the radiative heating rate calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_1">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      A list of species to be used in the first diagnostic radiative heating rate
+      calculation. These species are not the ones affecting the climate
+      simulation. This is a hook for performing radiative forcing calculations.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_2">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 2nd diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_3">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 3rd diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_4">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 4th diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_5">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 5th diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_6">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 6th diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_7">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 7th diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_8">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 8th diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_9">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 9th diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+  <entry id="rad_aer_diag_10">
+    <type>char*256(80)</type>
+    <category>radiation</category>
+    <group>rad_aer_nl</group>
+    <units>none</units>
+    <desc>
+      Analogous to rad_aer_diag_1, but for the 10th diagnostic calculation.
+    </desc>
+    <values>
+      <value>UNSET</value>
+    </values>
+  </entry>
+
+
 <!-- Vertical Coordinate -->
 
   <entry id="pver">

cime_config/testdefs/testmods_dirs/cam/outfrq_trcdata_bam_derecho/user_nl_cam

@@ -1,17 +1,22 @@
 ! these snapshots were constructed to specifically test whether the data read into the
 ! physics buffer by tracer_data in CAM will match the data read by CAM-SIMA bit-for-bit.
 ! this was done by
-! (1) taking a FHIST_C4 snapshot (which has prescribed_ozone and aero)
-! in this case a ne3pg3_fhistc4_gw_drag_cam4_oro snapshot,
+! (1) taking a FHIST_C4 snapshot (which has prescribed_ozone, aero, aerodep_flx, and volcaero)
+!     using a "user_set" location at the beginning of tphysbc, before check_energy_fix
+!     this is because the prescribed data modules run during timestep_init;
+!     the energy fixer will change model state, causing changes in the interpolation,
+!     so the "before" snapshot before the global energy fixer needs to be used.
 ! (2) using nco to zero out the prescribed ozone and aero fields from the snapshot data,
-! to create the "before" snapshot.
-! (3) the "after" snapshot is the original snapshot file (which has non-zero values for prescribed
-! ozone and aerosols)
+!     to create the "before" snapshot:
+!        ncap2 -O -s 'pbuf_ozone=0.0*pbuf_ozone' h1i_v2.nc 0xozone.nc
+!        ncap2 -O -s 'pbuf_sulf=0.0*pbuf_sulf;pbuf_bcar1=0.0*pbuf_sulf;pbuf_bcar2=0.0*pbuf_sulf;pbuf_ocar1=0.0*pbuf_sulf;pbuf_ocar2=0.0*pbuf_sulf;pbuf_sslt1=0.0*pbuf_sulf;pbuf_sslt2=0.0*pbuf_sulf;pbuf_sslt3=0.0*pbuf_sulf;pbuf_sslt4=0.0*pbuf_sulf;pbuf_dust1=0.0*pbuf_sulf;pbuf_dust2=0.0*pbuf_sulf;pbuf_dust3=0.0*pbuf_sulf;pbuf_dust4=0.0*pbuf_sulf;pbuf_VOLC_RAD_GEOM=0.0*pbuf_VOLC_RAD_GEOM;pbuf_VOLC_MMR=0.0*pbuf_VOLC_MMR' 0xozone.nc 0xozone_aero_volcaero.nc
+! (3) the "after" snapshot is the original "before" snapshot file
+!     (which has non-zero values for prescribed ozone and aerosol)
 ! the test will pass iff. the tracer_data utility in CAM-SIMA and the prescribed_ozone/aerosols schemes
 ! can populate the prescribed fields bit-for-bit compared to the original snapshot file.
 
-ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc4_tracer_data_0xprescribed-ozone-aero_from_cam4_oro_snapshot_derecho_gnu_after_c20251028.nc'
-ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc4_gw_drag_cam4_oro_snapshot_derecho_gnu_after_c20250826.nc'
+ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc4_tracer_data_0xprescribed-ozone-aero-volcaero_from_energy_fixer_derecho_gnu_before_c20260312.nc'
+ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc4_tracer_data_0xprescribed-ozone-aero-volcaero_from_energy_fixer_derecho_gnu_after_c20260312.nc'
 
 ! tolerances for testing
 ncdata_check_err = .true.
@@ -46,8 +51,12 @@ prescribed_ozone_fixed_tod = 0
 prescribed_ozone_fixed_ymd = 0
 prescribed_ozone_cycle_yr = 0
 
+prescribed_volcaero_datapath = "/glade/campaign/cesm/cesmdata/inputdata/atm/cam/volc"
+prescribed_volcaero_file = "CCSM4_volcanic_1850-2008_prototype1.nc"
+
 hist_output_frequency;h1: 1*nsteps
 hist_max_frames;h1: 1
 hist_add_inst_fields;h1:ozone
 hist_add_inst_fields;h1:sulf_D,bcar1_D,bcar2_D,ocar1_D,ocar2_D,sslt1_D,sslt2_D,sslt3_D,sslt4_D,dust1_D,dust2_D,dust3_D,dust4_D
+hist_add_inst_fields;h1:VOLC_MMR,VOLC_RAD_GEOM,VOLC_MASS,VOLC_MASS_C
 hist_precision;h1: REAL64