EAMxx: improve conditional sampling diags

Author: mahf708

components/eamxx/src/diagnostics/conditional_sampling.cpp

@@ -149,7 +149,7 @@ void apply_conditional_sampling_2d_lev(
 ConditionalSampling::ConditionalSampling(const ekat::Comm &comm, const ekat::ParameterList &params)
     : AtmosphereDiagnostic(comm, params) {
 
-  m_input_f      = m_params.get<std::string>("field_name");
+  m_input_f      = m_params.get<std::string>("input_field");
   m_condition_f  = m_params.get<std::string>("condition_field");
   m_condition_op = m_params.get<std::string>("condition_operator");
 

components/eamxx/src/diagnostics/tests/conditional_sampling_test.cpp

@@ -79,7 +79,7 @@ TEST_CASE("conditional_sampling") {
     const auto comp_val = 0.001;
     REQUIRE_THROWS(diag_factory.create("ConditionalSampling", comm,
                                        params)); // No 'field_name' parameter
-    params.set<std::string>("field_name", "qc");
+    params.set<std::string>("input_field", "qc");
     REQUIRE_THROWS(diag_factory.create("ConditionalSampling", comm,
                                        params)); // No 'condition_field' parameter
     params.set<std::string>("condition_field", "qc");
@@ -169,7 +169,7 @@ TEST_CASE("conditional_sampling") {
     const auto comp_lev = static_cast<int>(nlevs / 3);
     REQUIRE_THROWS(diag_factory.create("ConditionalSampling", comm,
                                        params)); // No 'field_name' parameter
-    params.set<std::string>("field_name", "qc");
+    params.set<std::string>("input_field", "qc");
     REQUIRE_THROWS(diag_factory.create("ConditionalSampling", comm,
                                        params)); // No 'condition_field' parameter
     params.set<std::string>("condition_field", "lev");

components/eamxx/src/share/io/eamxx_io_utils.cpp

@@ -141,7 +141,7 @@ create_diagnostic (const std::string& diag_field_name,
   std::regex horiz_avg ("([A-Za-z0-9_]+)_horiz_avg$");
   std::regex vert_contract ("([A-Za-z0-9_]+)_vert_(avg|sum)(_((dp|dz)_weighted))?$");
   std::regex zonal_avg (R"(([A-Za-z0-9_]+)_zonal_avg_(\d+)_bins$)");
-  std::regex conditional_sampling (R"(([A-Za-z0-9_]+)_where_([A-Za-z0-9_]+)_(gt|ge|eq|ne|le|lt)_(\d+(\.\d+)?)$)");
+  std::regex conditional_sampling (R"(([A-Za-z0-9_]+)_where_([A-Za-z0-9_]+)_(gt|ge|eq|ne|le|lt)_(\d+(?:\.\d+)?)$)");
 
   std::string diag_name;
   std::smatch matches;