Merge remote-tracking branch 'odiazib/oscar/eamxx/fix_remap_test_mam4xx'(PR #7863)

EAMxx: Fixing the grid for LINOZ and OXID files.

We are using ne30pg2 files for linoz and oxid instead of ne4pg2, which produces an error in the DataInterpolation class because we also provide a remap file.

Another piece of code is added to fix the following error:

Error! Layout mismatch for input file variable.
26:  - filename: /compyfs/inputdata//atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_bc_a4_elev_1x1_2010_clim_ne4pg2_c20250701.nc
26:  - varname : BB
26:  - expected dims : ncol,lev
26:  - dims from file: ncol,altitude
It should fix these tests:

REP_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.pm-gpu_gnugpu.eamxx-mam4xx-remap_emiss_ne4_ne30--eamxx-L72

SMS_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.frontier_craygnu-mphipcc.eamxx-mam4xx-remap_emiss_ne4_ne30--eamxx-L72

[BFB]

* odiazib/oscar/eamxx/fix_remap_test_mam4xx:
  EAMxx: Updating files for remap unit test.
  EAMxx: Using a clone grid to allow reading data from an NC file that does not use the same field tags as eamxx.
  EAMxx: We must use ne4pg2 files for oxid and LINOZ.

Author: singhbalwinder

components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/mam4xx/remap_emiss_ne4_ne30/shell_commands

@@ -17,14 +17,15 @@ $CIMEROOT/../components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/mam4xx/se
 #------------------------------------------------------
 # Files for ne4pg2 emissions
 #------------------------------------------------------
-
-ATMCHANGE mam4_aero_microphys::mam4_so2_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so2_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_so4_a1_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a1_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_so4_a2_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a2_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_pom_a4_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_pom_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_bc_a4_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_bc_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_num_a1_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a1_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_num_a2_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a2_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_num_a4_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::mam4_soag_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_soag_elev_1x1_2010_clim_ne4pg2_c20241008.nc' -b
-ATMCHANGE mam4_aero_microphys::aero_microphys_remap_file='${DIN_LOC_ROOT}/atm/scream/maps/map_ne4pg2_to_ne30pg2_nco_c20241108.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_linoz_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne4pg2_c20250826.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_oxid_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne4pg2/oxid_1.9x2.5_L26_2015_ne4pg2_c20250813.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_so2_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so2_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_so4_a1_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a1_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_so4_a2_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a2_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_pom_a4_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_pom_a4_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_bc_a4_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_bc_a4_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_num_a1_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a1_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_num_a2_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a2_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_num_a4_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a4_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::mam4_soag_elevated_emiss_file_name='${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_soag_elev_1x1_2010_clim_ne4pg2_c20250701.nc' -b
+ATMCHANGE mam4_aero_microphys::aero_microphys_remap_file='${DIN_LOC_ROOT}/atm/scream/maps/map_ne4pg2_to_ne30pg2_nco_c20241108.nc' -b

components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.cpp

@@ -407,7 +407,7 @@ void MAMMicrophysics::set_oxid_reader()
   data_interp_oxid_ = std::make_shared<DataInterpolation>(grid_,oxid_fields);
   data_interp_oxid_->setup_time_database ({oxid_file_name},util::TimeLine::YearlyPeriodic, ref_ts_oxid);
   data_interp_oxid_->create_horiz_remappers (oxid_map_file=="none" ? "" : oxid_map_file);
-  data_interp_oxid_->set_logger(m_atm_logger); 
+  data_interp_oxid_->set_logger(m_atm_logger);
   DataInterpolation::VertRemapData remap_data_oxid;
   remap_data_oxid.vr_type = DataInterpolation::Dynamic3DRef;
   remap_data_oxid.pname = "PS";
@@ -443,7 +443,7 @@ void MAMMicrophysics::set_linoz_reader(){
   data_interp_linoz_ = std::make_shared<DataInterpolation>(grid_,linoz_fields);
   data_interp_linoz_->setup_time_database ({m_linoz_file_name},util::TimeLine::YearlyPeriodic, ref_ts_linoz);
   data_interp_linoz_->create_horiz_remappers (linoz_map_file=="none" ? "" : linoz_map_file);
-  data_interp_linoz_->set_logger(m_atm_logger); 
+  data_interp_linoz_->set_logger(m_atm_logger);
 
   DataInterpolation::VertRemapData remap_data_linoz;
   remap_data_linoz.vr_type = DataInterpolation::Static1D;
@@ -483,15 +483,14 @@ void MAMMicrophysics::set_elevated_emissions_reader()
     }
     std::shared_ptr<DataInterpolation> di_vertical = std::make_shared<DataInterpolation>(grid_,vertical_fields);
     di_vertical->set_input_files_dimname(ShortFieldTagsNames::LEV,"altitude");
+    di_vertical->set_input_files_dimname(ShortFieldTagsNames::ILEV,"altitude_int");
     di_vertical->setup_time_database ({file_name},util::TimeLine::YearlyPeriodic, ref_ts_vertical);
     di_vertical->create_horiz_remappers (extfrc_map_file=="none" ? "" : extfrc_map_file);
-    di_vertical->set_logger(m_atm_logger); 
+    di_vertical->set_logger(m_atm_logger);
     DataInterpolation::VertRemapData remap_data_vertical;
     remap_data_vertical.vr_type = DataInterpolation::Custom;
     remap_data_vertical.pmid = z_iface;
     auto grid_after_hremap_vertical = di_vertical->get_grid_after_hremap();
-    grid_after_hremap_vertical->reset_field_tag_name(ShortFieldTagsNames::LEV, "altitude");
-    grid_after_hremap_vertical->reset_field_tag_name(ShortFieldTagsNames::ILEV, "altitude_int");
     // we create elevated emission remapper
     auto vertical_remapper_elevated = std::make_shared<VerticalRemapperMAM4>(grid_after_hremap_vertical, grid_,
     VerticalRemapperMAM4::VertRemapType::MAM4_ELEVATED_EMISSIONS);

components/eamxx/src/share/algorithm/eamxx_data_interpolation.cpp

@@ -36,6 +36,7 @@ DataInterpolation (const std::shared_ptr<const AbstractGrid>& model_grid,
   using namespace ShortFieldTagsNames;
   m_input_files_dimnames[COL] = "ncol";
   m_input_files_dimnames[LEV] = "lev";
+  m_input_files_dimnames[ILEV] = "ilev";
   e2str(LEV);
 
   // Initialize logger with a console logger for warnings (logs on all ranks)
@@ -190,7 +191,17 @@ init_data_interval (const util::TimeStamp& t0)
     fnames.push_back(f.name());
   }
 
-  m_reader = std::make_shared<AtmosphereInput>(fnames,m_horiz_remapper_beg->get_src_grid());
+  // NOTE: Sometimes the original data does not use the same field tags as eamxx.
+  // For these cases, we need to perform a shallow clone of
+  // io_grid because the tags are constant in this object.
+  using namespace ShortFieldTagsNames;
+  auto horiz_interp_src_grid =
+        m_horiz_remapper_beg->get_src_grid()->clone(m_horiz_remapper_beg->get_src_grid()->name(), true);
+  horiz_interp_src_grid->reset_field_tag_name(COL, m_input_files_dimnames[COL]);
+  horiz_interp_src_grid->reset_field_tag_name(LEV, m_input_files_dimnames[LEV]);
+  horiz_interp_src_grid->reset_field_tag_name(ILEV, m_input_files_dimnames[ILEV]);
+
+  m_reader = std::make_shared<AtmosphereInput>(fnames,horiz_interp_src_grid);
 
   // Loop over all stored time slices to find an interval that contains t0
   auto t0_interval = m_time_database.find_interval(t0);
@@ -412,6 +423,8 @@ create_horiz_remappers (const std::string& map_file)
     int map_ncols_src = m_horiz_remapper_beg->get_src_grid()->get_num_global_dofs();
     int map_ncols_tgt = m_horiz_remapper_beg->get_tgt_grid()->get_num_global_dofs();
 
+
+
     // Ensure that the map file was compatible with data/model grids
     EKAT_REQUIRE_MSG (map_ncols_src==ncols_data,
         "[DataInterpolation] Error! Map file src grid is incompatible with the input data.\n"