EAMxx: Fixing failing tests.

Author: odiazib

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

@@ -245,6 +245,9 @@ void MAMMicrophysics::set_grids(
         "o3_clim",  "o3col_clim", "t_clim",      "PmL_clim",
         "dPmL_dO3", "dPmL_dT",    "dPmL_dO3col", "cariolle_pscs"};
   }
+  // NOTE: order matches mam4xx:
+  // names of variables in oxid file.
+  var_names_oxi_={"O3", "OH", "NO3", "HO2"};
 #ifdef USE_OLD_LINOZ_FILE_READ
   if (config_.linoz.compute) {
 
@@ -272,9 +275,6 @@ void MAMMicrophysics::set_grids(
     linoz_data_.init(num_cols_io_linoz, num_levs_io_linoz, nvars);
     linoz_data_.allocate_temporary_views();
   }  // LINOZ reader
-  // NOTE: order matches mam4xx:
-  // names of variables in oxid file.
-  var_names_oxi_={"O3", "OH", "NO3", "HO2"};
   {
     oxid_file_name_ = m_params.get<std::string>("mam4_oxid_file_name");
     const std::string oxid_map_file =
@@ -537,7 +537,7 @@ void MAMMicrophysics::set_oxid_reader()
     VerticalRemapperMAM4::VertRemapType::MAM4_PSRef);
     remap_data_oxid.custom_remapper=vertical_remapper;
   }
-  data_interp_oxid_->create_vert_remapper (remap_data);
+  data_interp_oxid_->create_vert_remapper (remap_data_oxid);
   data_interp_oxid_->init_data_interval (start_of_step_ts());
 }
 // set DataInterpolation object for linoz reader.
@@ -730,25 +730,9 @@ void MAMMicrophysics::initialize_impl(const RunType run_type) {
   add_postcondition_check<Interval>(get_field_out("cldfrac_liq"),m_grid,0.0,1.0,false);
   add_postcondition_check<LowerBound>(get_field_out("tke"),m_grid,0);
   */
-#ifdef USE_OLD_LINOZ_FILE_READ
-  if (config_.linoz.compute) {
-    // climatology data for linear stratospheric chemistry
-    auto linoz_o3_clim = buffer_.scratch[0];  // ozone (climatology) [vmr]
-    auto linoz_o3col_clim =
-        buffer_.scratch[1];  // column o3 above box (climatology) [Dobson Units
-                             // (DU)]
-    auto linoz_t_clim = buffer_.scratch[2];  // temperature (climatology) [K]
-    auto linoz_PmL_clim =
-        buffer_.scratch[3];  // P minus L (climatology) [vmr/s]
-    auto linoz_dPmL_dO3 =
-        buffer_.scratch[4];  // sensitivity of P minus L to O3 [1/s]
-    auto linoz_dPmL_dT =
-        buffer_.scratch[5];  // sensitivity of P minus L to T3 [K]
-    auto linoz_dPmL_dO3col = buffer_.scratch[6];  // sensitivity of P minus L to
-                                                  // overhead O3 column [vmr/DU]
-    auto linoz_cariolle_pscs =
-        buffer_.scratch[7];  // Cariolle parameter for PSC loss of ozone [1/s]
 
+  if (config_.linoz.compute) {
+    // // climatology data for linear stratospheric chemistry
     auto ts = start_of_step_ts();
     std::string linoz_chlorine_file =
         m_params.get<std::string>("mam4_linoz_chlorine_file");
@@ -757,7 +741,6 @@ void MAMMicrophysics::initialize_impl(const RunType run_type) {
         linoz_chlorine_file, ts, chlorine_loading_ymd, chlorine_values_,
         chlorine_time_secs_);
   }
-#endif
   init_temporary_views();
   // FIXME : why are we only using nlev_ instead of ncol_xnlev?
   cmfdqr_ = view_1d("cmfdqr_", nlev_);
@@ -911,9 +894,6 @@ void MAMMicrophysics::run_impl(const double dt) {
     gas_aero_exchange_renaming_cloud_borne = get_field_out("mam4_microphysics_tendency_renaming_cloud_borne").get_view<Real***>();
   }
 
-
-
-#ifdef USE_OLD_LINOZ_FILE_READ
   // climatology data for linear stratospheric chemistry
   // ozone (climatology) [vmr]
   view_2d linoz_o3_clim;
@@ -931,6 +911,20 @@ void MAMMicrophysics::run_impl(const double dt) {
   view_2d linoz_dPmL_dO3col;
   // Cariolle parameter for PSC loss of ozone [1/s]
   view_2d linoz_cariolle_pscs;
+
+#ifdef USE_OLD_LINOZ_FILE_READ
+
+  linoz_o3_clim = buffer_.scratch[0];  // ozone (climatology) [vmr]
+  linoz_o3col_clim = buffer_.scratch[1];  // column o3 above box (climatology) [Dobson Units
+    //                          // (DU)]
+  linoz_t_clim = buffer_.scratch[2];  // temperature (climatology) [K]
+  linoz_PmL_clim = buffer_.scratch[3];  // P minus L (climatology) [vmr/s]
+  linoz_dPmL_dO3 = buffer_.scratch[4];  // sensitivity of P minus L to O3 [1/s]
+  linoz_dPmL_dT = buffer_.scratch[5];  // sensitivity of P minus L to T3 [K]
+  linoz_dPmL_dO3col = buffer_.scratch[6];  // sensitivity of P minus L to
+    //                                               // overhead O3 column [vmr/DU]
+  linoz_cariolle_pscs = buffer_.scratch[7];  // Cariolle parameter for PSC loss of ozone [1/s]
+
 #else
   data_interp_oxid_->run(end_of_step_ts());