Merge remote-tracking branch 'odiazib/eamxx/time_interpolation_linoz_oxid' (PR #7722)

EAMxx: Time interpolation for Linoz and Oxidants

I am updating the time interpolation for LINOZ and oxidants. As part of this PR, the routines developed by @TaufiqHassan will be used. Additionally, the NetCDF files for LINOZ and oxidants are being replaced with updated versions due to issues with the time variable in the previous files.

After this PR, time interpolation will be consistent with the DataInterpolation class and EAM. Note that we are using the routine implemented in PR 7381.

Further details: The current implementation does not account for the number of days in each month; it only checks the month to select a time slice.

The test mam4_aero_microphys_standalone_baseline_cmp will fail for the configurations gcc-openmp and gcc-cuda, except for gcc-openmp/fpe (this test does not compare baselines).

The test cpu-gcc/REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx will also fail the baseline comparison.

[NBFB]

* odiazib/eamxx/time_interpolation_linoz_oxid:
  EAMxx: Updating NetCDF files for standalone testing. The previous files contained an issue with the time variable. The new files are limited to a single year.
  Fixing the time interpolation for LINOZ and oxidants.

Author: singhbalwinder

components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp

@@ -126,7 +126,7 @@ struct TracerTimeSlice {
 
 // Converts raw YYYYMMDD date integers into sorted TimeStamp-index pairs.
 // Assumes yearly periodicity for now.
-// NOTE: Consider adding support for transient data. 
+// NOTE: Consider adding support for transient data.
 struct TracerTimeDatabase {
   std::vector<TracerTimeSlice> slices;
   scream::util::TimeLine timeline = scream::util::TimeLine::YearlyPeriodic;
@@ -148,7 +148,7 @@ struct TracerTimeDatabase {
   int get_next_idx(int idx) const {
     return (idx + 1) % slices.size();
   }
-  
+
   // Finds the interval [t_i, t_{i+1}) that contains ts. Assumes cyclic behavior.
   int find_interval(const util::TimeStamp& ts) const {
     EKAT_REQUIRE_MSG(size() >= 2, "Time database has fewer than 2 time slices.");
@@ -362,7 +362,7 @@ inline void init_monthly_time_offset(TracerData& tracer_data,
   EKAT_REQUIRE_MSG(cyclical_ymd_index >= 0,
       "Error! Model time (" + std::to_string(cyclical_ymd) +
       ") is not within tracer time period.");
-  
+
   tracer_data.offset_time_index_ = cyclical_ymd_index;
 }
 
@@ -383,7 +383,7 @@ inline void init_irregular_time_database(TracerData& tracer_data,
 
   auto ts_model = convert_date(cyclical_ymd);
   const int interval = tracer_data.time_db.find_interval(ts_model);
-  
+
   EKAT_REQUIRE_MSG(interval >= 0,
     "Error! Model time (" + std::to_string(cyclical_ymd) +
     ") is not within the tracer time range.");
@@ -461,11 +461,7 @@ inline void setup_tracer_data(TracerData &tracer_data,
   }
 
   // Time initialization logic — delegated to helpers above
-  if (tracer_file_type == ELEVATED_EMISSIONS) {
-    init_irregular_time_database(tracer_data, trace_data_file, cyclical_ymd);
-  } else {
-    init_monthly_time_offset(tracer_data, trace_data_file, cyclical_ymd);
-  }
+  init_irregular_time_database(tracer_data, trace_data_file, cyclical_ymd);
 
   scorpio::release_file(trace_data_file);
   tracer_data.file_type = tracer_file_type;
@@ -624,7 +620,7 @@ inline void update_monthly_timestate(
   }
 }
 
-// Loads time slice data before and after current timestamp (ts), 
+// Loads time slice data before and after current timestamp (ts),
 // and prepares interpolation state. First call initializes both BEG and END.
 inline void update_irregular_timestate(
     const std::shared_ptr<AtmosphereInput>& scorpio_reader,
@@ -705,13 +701,8 @@ inline void update_tracer_timestate(
     TracerTimeState& time_state,
     TracerData& data_tracer)
 {
-  if (data_tracer.file_type == ELEVATED_EMISSIONS) {
-    update_irregular_timestate(scorpio_reader, ts, tracer_horiz_interp,
+  update_irregular_timestate(scorpio_reader, ts, tracer_horiz_interp,
                                time_state, data_tracer);
-  } else {
-    update_monthly_timestate(scorpio_reader, ts, tracer_horiz_interp,
-                             time_state, data_tracer);
-  }
 }
 
 // This function is based on the SPA::perform_time_interpolation function.

components/eamxx/tests/single-process/mam/aero_microphys/CMakeLists.txt

@@ -25,8 +25,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
 # Ensure test input files are present in the data dir
 set (TEST_INPUT_FILES
      scream/init/${EAMxx_tests_IC_FILE_MAM4xx_72lev}
-     scream/mam4xx/linoz/ne2np4/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne2np4_c20240724.nc
-     scream/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_1850-2015_c20240827.nc
+     scream/mam4xx/linoz/ne2np4/linoz2010_2010JPL_CMIP6_10deg_58km_ne2np4_c20250923.nc
+     scream/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_2015_c20250923.nc
      scream/mam4xx/linoz/Linoz_Chlorine_Loading_CMIP6_0003-2017_c20171114.nc
      scream/mam4xx/photolysis/RSF_GT200nm_v3.0_c080811.nc
      scream/mam4xx/photolysis/temp_prs_GT200nm_JPL10_c130206.nc

components/eamxx/tests/single-process/mam/aero_microphys/input.yaml

@@ -20,8 +20,8 @@ eamxx:
    mam4_o3_lbl: 4
    mam4_psc_T : 193.0
    mam4_linoz_ymd : 20100101
-   mam4_linoz_file_name : ${SCREAM_DATA_DIR}/mam4xx/linoz/ne2np4/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne2np4_c20240724.nc
-   mam4_oxid_file_name : ${SCREAM_DATA_DIR}/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_2015_c20250813.nc
+   mam4_linoz_file_name : ${SCREAM_DATA_DIR}/mam4xx/linoz/ne2np4/linoz2010_2010JPL_CMIP6_10deg_58km_ne2np4_c20250923.nc
+   mam4_oxid_file_name : ${SCREAM_DATA_DIR}/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_2015_c20250923.nc
    mam4_oxid_ymd : 20150101
    mam4_linoz_chlorine_file : ${SCREAM_DATA_DIR}/mam4xx/linoz/Linoz_Chlorine_Loading_CMIP6_0003-2017_c20171114.nc
    mam4_chlorine_loading_ymd : 20100101