fixes xml for unit tests

amanzi · Mar 13, 2024 · f03ca9c · f03ca9c
1 parent c39a817
commit f03ca9c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/executables/test/executable_coupled_water1.xml b/src/executables/test/executable_coupled_water1.xml
@@ -395,18 +395,18 @@
         </ParameterList>
       </ParameterList>
       <ParameterList name="relative_permeability" type="ParameterList">
-        <Parameter name="evaluator type" type="string" value="relative permeability, van Genuchten" />
+        <Parameter name="evaluator type" type="string" value="relative permeability, water retention model" />
         <Parameter name="model parameters" type="string" value="WRM parameters" />
         <Parameter name="minimum rel perm cutoff" type="double" value=" 0" />
         <Parameter name="use surface rel perm" type="bool" value="true" />
       </ParameterList>
       <ParameterList name="saturation_liquid" type="ParameterList">
         <Parameter name="model parameters" type="string" value="WRM parameters" />
-        <Parameter name="evaluator type" type="string" value="WRM" />
+        <Parameter name="evaluator type" type="string" value="water retention model" />
       </ParameterList>
       <ParameterList name="saturation_gas" type="ParameterList">
         <Parameter name="model parameters" type="string" value="WRM parameters" />
-        <Parameter name="evaluator type" type="string" value="WRM" />
+        <Parameter name="evaluator type" type="string" value="water retention model" />
       </ParameterList>
     </ParameterList>
     <ParameterList name="initial conditions" type="ParameterList">
@@ -424,7 +424,7 @@
       <ParameterList name="WRM parameters" type="ParameterList">
         <ParameterList name="rest domain" type="ParameterList">
           <Parameter name="region" type="string" value="computational domain" />
-          <Parameter name="WRM Type" type="string" value="van Genuchten" />
+          <Parameter name="wrm type" type="string" value="van Genuchten" />
           <Parameter name="van Genuchten alpha [Pa^-1]" type="double" value="0.00010224" />
           <Parameter name="van Genuchten n [-]" type="double" value=" 2" />
           <Parameter name="residual saturation [-]" type="double" value="0.2" />

diff --git a/src/executables/test/executable_coupled_water2.xml b/src/executables/test/executable_coupled_water2.xml
@@ -398,18 +398,18 @@
         </ParameterList>
       </ParameterList>
       <ParameterList name="relative_permeability" type="ParameterList">
-        <Parameter name="evaluator type" type="string" value="relative permeability, van Genuchten" />
+        <Parameter name="evaluator type" type="string" value="relative permeability, water retention model" />
         <Parameter name="model parameters" type="string" value="WRM parameters" />
         <Parameter name="minimum rel perm cutoff" type="double" value=" 0" />
         <Parameter name="use surface rel perm" type="bool" value="true" />
       </ParameterList>
       <ParameterList name="saturation_liquid" type="ParameterList">
         <Parameter name="model parameters" type="string" value="WRM parameters" />
-        <Parameter name="evaluator type" type="string" value="WRM" />
+        <Parameter name="evaluator type" type="string" value="water retention model" />
       </ParameterList>
       <ParameterList name="saturation_gas" type="ParameterList">
         <Parameter name="model parameters" type="string" value="WRM parameters" />
-        <Parameter name="evaluator type" type="string" value="WRM" />
+        <Parameter name="evaluator type" type="string" value="water retention model" />
       </ParameterList>
     </ParameterList>
     <ParameterList name="initial conditions" type="ParameterList">
@@ -427,7 +427,7 @@
       <ParameterList name="WRM parameters" type="ParameterList">
         <ParameterList name="rest domain" type="ParameterList">
           <Parameter name="region" type="string" value="computational domain" />
-          <Parameter name="WRM Type" type="string" value="van Genuchten" />
+          <Parameter name="wrm type" type="string" value="van Genuchten" />
           <Parameter name="van Genuchten alpha [Pa^-1]" type="double" value="0.00010224" />
           <Parameter name="van Genuchten n [-]" type="double" value=" 2" />
           <Parameter name="residual saturation [-]" type="double" value="0.2" />

diff --git a/src/executables/test/executable_coupled_water3.xml b/src/executables/test/executable_coupled_water3.xml
@@ -397,18 +397,18 @@
         </ParameterList>
       </ParameterList>
       <ParameterList name="relative_permeability" type="ParameterList">
-        <Parameter name="evaluator type" type="string" value="relative permeability, van Genuchten" />
+        <Parameter name="evaluator type" type="string" value="relative permeability, water retention model" />
         <Parameter name="model parameters" type="string" value="WRM parameters" />
         <Parameter name="minimum rel perm cutoff" type="double" value=" 0" />
         <Parameter name="use surface rel perm" type="bool" value="true" />
       </ParameterList>
       <ParameterList name="saturation_liquid" type="ParameterList">
         <Parameter name="model parameters" type="string" value="WRM parameters" />
-        <Parameter name="evaluator type" type="string" value="WRM" />
+        <Parameter name="evaluator type" type="string" value="water retention model" />
       </ParameterList>
       <ParameterList name="saturation_gas" type="ParameterList">
         <Parameter name="model parameters" type="string" value="WRM parameters" />
-        <Parameter name="evaluator type" type="string" value="WRM" />
+        <Parameter name="evaluator type" type="string" value="water retention model" />
       </ParameterList>
     </ParameterList>
     <ParameterList name="initial conditions" type="ParameterList">
@@ -426,7 +426,7 @@
       <ParameterList name="WRM parameters" type="ParameterList">
         <ParameterList name="rest domain" type="ParameterList">
           <Parameter name="region" type="string" value="computational domain" />
-          <Parameter name="WRM Type" type="string" value="van Genuchten" />
+          <Parameter name="wrm type" type="string" value="van Genuchten" />
           <Parameter name="van Genuchten alpha [Pa^-1]" type="double" value="0.00010224" />
           <Parameter name="van Genuchten n [-]" type="double" value=" 2" />
           <Parameter name="residual saturation [-]" type="double" value="0.2" />

diff --git a/src/pks/transport/transport_ats.hh b/src/pks/transport/transport_ats.hh
@@ -406,7 +406,7 @@ class Transport_ATS : public PK_PhysicalExplicit<Epetra_Vector> {
   };
 
 
-  void ChangedSolutionPK(const Tag& tag);
+  virtual void ChangedSolutionPK(const Tag& tag) override;
 
  private:
   void InitializeFields_();