Revives small kernels shoc function, changes shell cmd for CIME test,…

… fix test runtimes
E3SM-Project · Apr 23, 2024 · b366be0 · b366be0
1 parent d9e8015
commit b366be0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/aci/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/aci/shell_commands
@@ -1,7 +1,7 @@
 
 #Default scream has 10 tracers, MAM4xx adds another 31 making a total of 41 tracer
-#Set total number of tracers to 41
-./xmlchange SCREAM_CMAKE_OPTIONS="`./xmlquery --value SCREAM_CMAKE_OPTIONS | sed 's/SCREAM_NUM_TRACERS [0-9][0-9]*/SCREAM_NUM_TRACERS 41/'`"
+#Set total number of tracers to 41. We are using append here as last entry wins while parsing xml options
+./xmlchange --append SCREAM_CMAKE_OPTIONS="SCREAM_NUM_TRACERS 41"
 
 $CIMEROOT/../components/eamxx/scripts/atmchange initial_conditions::Filename='$DIN_LOC_ROOT/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc' -b
 $CIMEROOT/../components/eamxx/scripts/atmchange mac_aero_mic::atm_procs_list="tms,shoc,cldFraction,mam4_aci,p3" -b

diff --git a/components/eamxx/src/physics/shoc/disp/shoc_assign_2d_view_disp.cpp b/components/eamxx/src/physics/shoc/disp/shoc_assign_2d_view_disp.cpp
@@ -13,7 +13,7 @@ ::shoc_assign_2d_view_disp(
   const view_2d<const Spack>&  input_view,
   const view_2d<Spack>&        output_view)
 {
-  /*using ExeSpace = typename KT::ExeSpace;
+  using ExeSpace = typename KT::ExeSpace;
 
   const auto nlev_packs = ekat::npack<Spack>(nlev);
   const auto policy = ekat::ExeSpaceUtils<ExeSpace>::get_default_team_policy(shcol, nlev_packs);
@@ -22,7 +22,7 @@ ::shoc_assign_2d_view_disp(
     Kokkos::parallel_for(Kokkos::TeamVectorRange(team, nlev_packs), [&] (const Int& k) {
         output_view (i,k) = input_view(i,k);
     });
-  });*/
+  });
 }
 
 } // namespace shoc

diff --git a/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.cpp b/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.cpp
@@ -81,12 +81,12 @@ void SHOCMacrophysics::set_grids(const std::shared_ptr<const GridsManager> grids
   add_field<Required>("phis",           scalar2d_layout_col, m2/s2, grid_name, ps);
 
   // Input/Output variables
-  add_field<Updated>("tke",             scalar3d_layout_mid, m2/s2,   grid_name, "tracers", ps);
-  add_field<Updated>("horiz_winds",     horiz_wind_layout,   m/s,     grid_name, ps);
-  add_field<Updated>("sgs_buoy_flux",   scalar3d_layout_mid, K*(m/s), grid_name, ps);
-  add_field<Updated>("eddy_diff_mom",   scalar3d_layout_mid, m2/s,    grid_name, ps);
-  add_field<Updated>("qc",              scalar3d_layout_mid, Qunit,   grid_name, "tracers", ps);
-  add_field<Updated>("cldfrac_liq",     scalar3d_layout_mid, nondim,  grid_name, ps);
+  add_field<Updated>("tke",           scalar3d_layout_mid, m2/s2,   grid_name, "tracers", ps);
+  add_field<Updated>("horiz_winds",   horiz_wind_layout,   m/s,     grid_name, ps);
+  add_field<Updated>("sgs_buoy_flux", scalar3d_layout_mid, K*(m/s), grid_name, ps);
+  add_field<Updated>("eddy_diff_mom", scalar3d_layout_mid, m2/s,    grid_name, ps);
+  add_field<Updated>("qc",            scalar3d_layout_mid, Qunit,   grid_name, "tracers", ps);
+  add_field<Updated>("cldfrac_liq",   scalar3d_layout_mid, nondim,  grid_name, ps);
 
   // Output variables
   add_field<Computed>("pbl_height",       scalar2d_layout_col, m,           grid_name);

diff --git a/components/eamxx/src/physics/shoc/impl/shoc_main_impl.hpp b/components/eamxx/src/physics/shoc/impl/shoc_main_impl.hpp
@@ -266,7 +266,7 @@ void Functions<S,D>::shoc_main_internal(
     check_tke(team,nlev,tke);
   }
 
-  // End SHOC parameterization  
+  // End SHOC parameterization
 
   // Use SHOC outputs to update the host model
   // temperature

diff --git a/...onents/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3/CMakeLists.txt b/...onents/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3/CMakeLists.txt
@@ -13,8 +13,7 @@ CreateADUnitTest(${TEST_BASE_NAME}
 
 # Set AD configurable options
 set (ATM_TIME_STEP 1800)
-#SetVarDependingOnTestSize(NUM_STEPS 2 5 48)  # 1h 4h 24h
-SetVarDependingOnTestSize(NUM_STEPS 1 1 1)  # 1h 4h 24h
+SetVarDependingOnTestSize(NUM_STEPS 2 5 48)  # 1h 4h 24h
 set (RUN_T0 2021-10-12-45000)
 
 # Determine num subcycles needed to keep shoc dt<=300s

diff --git a/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt b/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt
@@ -12,7 +12,7 @@ CreateADUnitTest(${TEST_BASE_NAME}
 )
 
 # Set AD configurable options
-SetVarDependingOnTestSize(NUM_STEPS 1 1 1)
+SetVarDependingOnTestSize(NUM_STEPS 12 24 36)
 set (ATM_TIME_STEP 600)
 set (RUN_T0 2021-10-12-45000)