Add the ability to ignore a fluid property from the tabulation file by sepecifying the

interpolated properties in the input
- address porous flow failure that was relying on forwarding a property

Author: GiudGiud

modules/fluid_properties/src/fluidproperties/TabulatedFluidProperties.C

@@ -70,7 +70,9 @@ TabulatedFluidProperties::validParams()
       "density enthalpy internal_energy viscosity");
   params.addParam<MultiMooseEnum>("interpolated_properties",
                                   properties,
-                                  "Properties to interpolate if no data file is provided");
+                                  "Properties to interpolate. If unspecified and a data file is "
+                                  "provided, the properties from the data file will be used. If "
+                                  "specified, some properties from the data file can be ignored.");
 
   // (p,T) grid parameters
   params.addRangeCheckedParam<Real>(
@@ -2390,9 +2392,12 @@ TabulatedFluidProperties::readFileTabulationData(const bool use_pT)
                      "understands. It will be ignored.");
       // We could be reading a (v,e) tabulation after having read a (p,T) tabulation, do not
       // insert twice
+      // Also only allow properties specified as interpolated if user passed the parameter
       else if (std::find(_interpolated_properties.begin(),
                          _interpolated_properties.end(),
-                         column_names[i]) == _interpolated_properties.end())
+                         column_names[i]) == _interpolated_properties.end() &&
+               (!isParamSetByUser("interpolated_properties") ||
+                _interpolated_properties_enum.contains(column_names[i])))
         _interpolated_properties.push_back(column_names[i]);
     }
   }

modules/fluid_properties/test/tests/tabulated/tabulated_v_e.i

@@ -103,7 +103,7 @@
   []
   [tabulated]
     type = TabulatedBicubicFluidProperties
-    interpolated_properties = 'density enthalpy viscosity internal_energy k c cv cp entropy'
+    interpolated_properties = 'density enthalpy viscosity internal_energy k c cv cp entropy pressure temperature'
 
     # Uncomment this to read the tabulation
     # fluid_property_file = fluid_properties.csv

modules/porous_flow/test/tests/fluidstate/water_vapor_tab.i

@@ -166,7 +166,6 @@
 []
 
 [FluidProperties]
-
   [water_true]
     type = Water97FluidProperties
   []
@@ -175,6 +174,8 @@
     fp = water_true
     allow_fp_and_tabulation = true
     fluid_property_file = fluid_properties_extended.csv
+    # the test relies on forwarding enthalpy evaluations to 'water_true'
+    interpolated_properties = 'density viscosity'
   []
 []