modified reading of keys in pipe_drain_evaluator.cc

gcapodag · Mar 20, 2024 · 447181e · 447181e
1 parent ef1a0da
commit 447181e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/pks/flow/constitutive_relations/sources/pipe_drain_evaluator.cc b/src/pks/flow/constitutive_relations/sources/pipe_drain_evaluator.cc
@@ -25,17 +25,19 @@ PipeDrainEvaluator::PipeDrainEvaluator(Teuchos::ParameterList& plist) :
   energ_loss_coeff_weir_ = plist.get<double>("energy losses coeff weir", 0.54);
   energ_loss_coeff_subweir_ = plist.get<double>("energy losses coeff submerged weir", 0.056);
   energ_loss_coeff_orifice_ = plist.get<double>("energy losses coeff orifice", 0.167);
-  sw_domain_name_ = plist.get<std::string>("sw domain name", "surface"); 
+
+  sw_domain_name_ = plist.get<std::string>("surface domain name", "surface"); 
   pipe_domain_name_ = plist.get<std::string>("pipe domain name", "pipe"); 
+
   Tag tag = my_keys_.front().second;
 
   // my dependencies
   surface_depth_key_ = Keys::readKey(plist_, sw_domain_name_, "ponded depth", "ponded_depth");
   dependencies_.insert(KeyTag{surface_depth_key_, tag});
 
   // bathymetry
-  surface_bathymetry_key_ = Keys::getKey(sw_domain_name_, "bathymetry");
-  pipe_bathymetry_key_ = Keys::getKey(pipe_domain_name_, "bathymetry");
+  surface_bathymetry_key_ = Keys::readKey(plist_, sw_domain_name_, "surface bathymetry", "bathymetry");
+  pipe_bathymetry_key_ = Keys::readKey(plist_, pipe_domain_name_, "pipe bathymetry", "bathymetry");
 
   if(!pipe_domain_name_.empty()){
      pressure_head_key_ = Keys::readKey(plist_, pipe_domain_name_, "pressure head", "pressure_head");