EAMxx: Some fixes after rebase

E3SM-Project · Oct 31, 2024 · 9850df6 · 9850df6
1 parent 65847df
commit 9850df6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.cpp b/components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.cpp
@@ -51,7 +51,7 @@ void MAMMicrophysics::set_defaults_() {
   config_.amicphys.do_coag = true;
 
   config_.amicphys.nucleation = {};
-  // config_.amicphys.nucleation.dens_so4a_host = 1770.0;
+  //config_.amicphys.nucleation.dens_so4a_host = 1770.0;
   // config_.amicphys.nucleation.mw_so4a_host = 115.0;
   // config_.amicphys.nucleation.newnuc_method_user_choice = 2;
   // config_.amicphys.nucleation.pbl_nuc_wang2008_user_choice = 1;

diff --git a/components/eamxx/src/physics/mam/srf_emission_impl.hpp b/components/eamxx/src/physics/mam/srf_emission_impl.hpp
@@ -182,10 +182,7 @@ void srfEmissFunctions<S, D>::update_srfEmiss_data_from_file(
     const int time_index,  // zero-based
     AbstractRemapper &srfEmiss_horiz_interp, srfEmissInput &srfEmiss_input) {
   using namespace ShortFieldTagsNames;
-  // NOTE: these are currently unused
-  // using ESU    = ekat::ExeSpaceUtils<typename DefaultDevice::execution_space>;
-  // using Member = typename KokkosTypes<DefaultDevice>::MemberType;
-
+
   start_timer("EAMxx::srfEmiss::update_srfEmiss_data_from_file");
 
   // 1. Read from file
@@ -205,14 +202,6 @@ void srfEmissFunctions<S, D>::update_srfEmiss_data_from_file(
   // Recall, the fields are registered in the order: ps, ccn3, g_sw, ssa_sw,
   // tau_sw, tau_lw
 
-  // NOTE: these are currently unused
-  // const auto &layout = srfEmiss_horiz_interp.get_tgt_field(0)
-  //                          .get_header()
-  //                          .get_identifier()
-  //                          .get_layout();
-
-  const int ncols = layout.dim(COL);
-
   // Read fields from the file
   for(int i = 0; i < srfEmiss_horiz_interp.get_num_fields(); ++i) {
     auto sector =