Merge branch 'jgfouca/eamxx_bfb_report_seed' into master (PR #7855)

Eamxx BFB baseline tests should report seed

This is for compare runs. It was already being reported for generation runs.

[BFB]

Author: jgfouca

components/eamxx/src/physics/gw/impl/gw_convect_gw_sources_impl.hpp

@@ -40,7 +40,6 @@ void Functions<S,D>::gw_convect_gw_sources(
   // Look up spectrum only if depth >= 2.5 km, else set tau0 = 0.
   //---------------------------------------------------------------------
   if ((hdepth >= hdepth_min) && (std::abs(lat) < (C::Pi/2))) {
-
     //------------------------------------------------------------------
     // Look up the spectrum using depth and uh.
     //------------------------------------------------------------------
@@ -54,6 +53,8 @@ void Functions<S,D>::gw_convect_gw_sources(
 
     const Int hdepth_i = static_cast<Int>(std::round(hdepth)) - 1;
     const Int uh_i = static_cast<Int>(std::round(uh)) + cinit.maxuh;
+    EKAT_KERNEL_ASSERT_MSG(hdepth_i >= 0 && hdepth_i < cinit.maxh, "Bad hdepth");
+    EKAT_KERNEL_ASSERT_MSG(uh_i >= 0 && uh_i < 2*cinit.maxuh + 1, "Bad uh");
     Kokkos::parallel_for(
       Kokkos::TeamVectorRange(team, num_pgwv), [&] (const int l) {
         if (Umaxi > Umini && (l >= Umini && l <= Umaxi)) {

components/eamxx/src/physics/gw/impl/gw_storm_speed_impl.hpp

@@ -48,23 +48,25 @@ void Functions<S,D>::gw_storm_speed(
   });
 
   // Speeds for critical level filtering.
-  umin =  init.pgwv*init.dc;
-  umax = -init.pgwv*init.dc;
+  if (maxi > mini) {
+    umin =  init.pgwv*init.dc;
+    umax = -init.pgwv*init.dc;
+  }
+  else {
+    using ResultType = Kokkos::MinMax<Real>::value_type;
+    ResultType min_max_result;
 
-  // The type that holds both min and max results
-  using ResultType = Kokkos::MinMax<Real>::value_type;
-  ResultType min_max_result;
+    Kokkos::parallel_reduce(
+      Kokkos::TeamVectorRange(team, maxi, mini+1), [&] (const int k, ResultType& update) {
+        if (ubm(k) < update.min_val) update.min_val = ubm(k);
+        if (ubm(k) > update.max_val) update.max_val = ubm(k);
+      }, Kokkos::MinMax<Real>(min_max_result));
 
-  Kokkos::parallel_reduce(
-    Kokkos::TeamVectorRange(team, maxi, mini+1), [&] (const int k, ResultType& update) {
-      if (ubm(k) < update.min_val) update.min_val = ubm(k);
-      if (ubm(k) > update.max_val) update.max_val = ubm(k);
-    }, Kokkos::MinMax<Real>(min_max_result));
-
-  team.team_barrier();
+    team.team_barrier();
 
-  umin = min_max_result.min_val;
-  umax = min_max_result.max_val;
+    umin = min_max_result.min_val;
+    umax = min_max_result.max_val;
+  }
 }
 
 } // namespace gw

components/eamxx/src/physics/gw/tests/gw_beres_src_tests.cpp

@@ -38,10 +38,10 @@ struct UnitWrap::UnitTest<D>::TestGwBeresSrc : public UnitWrap::UnitTest<D>::Bas
     // Set up inputs
     GwBeresSrcData baseline_data[] = {
       //           ncol, maxq0_conversion_factor, hdepth_scaling_factor, hdepth_min, storm_speed_min, use_gw_convect_old
-      GwBeresSrcData(10,                     0.1,                   0.2,      0.,              1., false,  front_init_data[0]),
-      GwBeresSrcData(11,                     0.2,                   0.3,      0.,              2., false,  front_init_data[1]),
-      GwBeresSrcData(12,                     0.3,                   0.4,      0.,              3., false,   front_init_data[2]),
-      GwBeresSrcData(13,                     0.4,                   0.5,      0.,              4., false,   front_init_data[3]),
+      GwBeresSrcData(10,                     0.1,                   0.2,      0.5,              1., false,  front_init_data[0]),
+      GwBeresSrcData(11,                     0.2,                   0.3,      0.5,              2., false,  front_init_data[1]),
+      GwBeresSrcData(12,                     0.3,                   0.4,      0.5,              3., false,   front_init_data[2]),
+      GwBeresSrcData(13,                     0.4,                   0.5,      0.5,              4., false,   front_init_data[3]),
     };
 
     static constexpr Int num_runs = sizeof(baseline_data) / sizeof(GwBeresSrcData);

components/eamxx/src/physics/gw/tests/gw_convect_gw_sources_tests.cpp

@@ -38,10 +38,10 @@ struct UnitWrap::UnitTest<D>::TestGwConvectGwSources : public UnitWrap::UnitTest
     // Set up inputs
     GwConvectGwSourcesData baseline_data[] = {
       //                   ncol, hdepth_min
-      GwConvectGwSourcesData(10,     0, front_init_data[0]),
-      GwConvectGwSourcesData(11,     0, front_init_data[1]),
-      GwConvectGwSourcesData(12,     0, front_init_data[2]),
-      GwConvectGwSourcesData(13,     0, front_init_data[3]),
+      GwConvectGwSourcesData(10,     0.5, front_init_data[0]),
+      GwConvectGwSourcesData(11,     0.5, front_init_data[1]),
+      GwConvectGwSourcesData(12,     0.5, front_init_data[2]),
+      GwConvectGwSourcesData(13,     0.5, front_init_data[3]),
     };
 
     static constexpr Int num_runs = sizeof(baseline_data) / sizeof(GwConvectGwSourcesData);

components/eamxx/src/physics/gw/tests/infra/gw_unit_tests_common.hpp

@@ -27,10 +27,10 @@ inline auto get_common_init_data(Engine& engine)
     // it represents an index
 
     //           pver, pgwv,   dc, orog_only, molec_diff, tau_0_ubc, nbot_molec, ktop, kbotbg, fcrit2, kwv
-    GwCommonInit(  72,   20, 0.75,     false,      false,     false,         16,   8,     66,    .67, 6.28e-5),
-    GwCommonInit(  72,   20, 0.75,     true ,      false,     true ,         16,   6,     68,    .67, 6.28e-5),
-    GwCommonInit(  72,   20, 0.75,     false,      true ,     true ,         16,   3,     70,    .67, 6.28e-5),
-    GwCommonInit(  72,   20, 0.75,     true ,      true ,     false,         16,   0,     70,    .67, 6.28e-5),
+    GwCommonInit(  72,   20, 2.5,     false,      false,     false,         16,   8,     66,    .67, 6.28e-5),
+    GwCommonInit(  72,   20, 2.5,     true ,      false,     true ,         16,   6,     68,    .67, 6.28e-5),
+    GwCommonInit(  72,   20, 2.5,     false,      true ,     true ,         16,   3,     70,    .67, 6.28e-5),
+    GwCommonInit(  72,   20, 2.5,     true ,      true ,     false,         16,   0,     70,    .67, 6.28e-5),
   };
 
   for (auto& d : rv) {

components/eamxx/src/share/core/eamxx_setup_random_test.hpp

@@ -52,8 +52,15 @@ Engine setup_random_test(const ekat::Comm* comm=nullptr, int* return_seed=nullpt
 }
 
 template <typename Engine=std::mt19937_64>
-Engine setup_random_test(const int seed)
+Engine setup_random_test(const int seed, const ekat::Comm* comm=nullptr)
 {
+  const auto& test_name = Catch::getResultCapture().getCurrentTestName();
+
+  if (comm == nullptr || comm->am_i_root()) {
+    // Print seed to screen to trace tests that fail.
+    std::cout << " For test " << test_name << ", using stored seed: " << seed << "\n";
+  }
+
   return Engine (seed);
 }
 

components/eamxx/src/share/physics/physics_test_data.hpp

@@ -528,7 +528,7 @@ struct UnitBase
       // Read the seed
       int seed;
       impl::read_scalars(m_ifile,seed);
-      return setup_random_test(seed);
+      return setup_random_test(seed, nullptr);
     }
   }
 };