Use the interpolation bounds from the files in (v,e) over querying the FP

- otherwise we would compute min/max from FP calls OOB from the tabulation
- then flush to min/max that could be OOB

Author: GiudGiud

modules/fluid_properties/src/fluidproperties/TabulatedFluidProperties.C

@@ -359,13 +359,14 @@ TabulatedFluidProperties::initialSetup()
       generateVETabulatedData();
     }
   }
-  // Could be needed to get bounds computed from (p, T) bounds
-  else if (_fp)
-    createVEGridVectors();
 
   computePropertyIndicesInInterpolationVectors();
   constructInterpolation();
 
+  // Could be needed to get bounds computed from (p, T) bounds
+  if (_fp && !_create_direct_ve_interpolations)
+    createVEGridVectors();
+
   // Write tabulated data to file
   if (_save_file)
   {
@@ -2633,18 +2634,8 @@ TabulatedFluidProperties::createVGridVector()
   mooseAssert(_file_name_ve_in.empty(), "We should be reading the specific volume grid from file");
   if (!_v_bounds_specified)
   {
-    if (_fp)
-    {
-      // extreme values of specific volume for the grid bounds
-      Real v1 = _fp->v_from_p_T(_pressure_min, _temperature_min);
-      Real v2 = _fp->v_from_p_T(_pressure_max, _temperature_min);
-      Real v3 = _fp->v_from_p_T(_pressure_min, _temperature_max);
-      Real v4 = _fp->v_from_p_T(_pressure_max, _temperature_max);
-      _v_min = std::min({v1, v2, v3, v4});
-      _v_max = std::max({v1, v2, v3, v4});
-    }
     // if csv exists, get max and min values from csv file
-    else if (_interpolate_density)
+    if (_interpolate_density)
     {
       Real rho_max =
           *std::max_element(_properties[_density_idx].begin(), _properties[_density_idx].end());
@@ -2653,6 +2644,16 @@ TabulatedFluidProperties::createVGridVector()
       _v_max = 1 / rho_min;
       _v_min = 1 / rho_max;
     }
+    else if (_fp)
+    {
+      // extreme values of specific volume for the grid bounds
+      Real v1 = _fp->v_from_p_T(_pressure_min, _temperature_min);
+      Real v2 = _fp->v_from_p_T(_pressure_max, _temperature_min);
+      Real v3 = _fp->v_from_p_T(_pressure_min, _temperature_max);
+      Real v4 = _fp->v_from_p_T(_pressure_max, _temperature_max);
+      _v_min = std::min({v1, v2, v3, v4});
+      _v_max = std::max({v1, v2, v3, v4});
+    }
     else
       mooseWarning("Unable to compute grid bounds in specific volume. Please specify the v_min/max "
                    "parameters");
@@ -2686,7 +2687,15 @@ TabulatedFluidProperties::createVEGridVectors()
   createVGridVector();
   if (!_e_bounds_specified)
   {
-    if (_fp)
+    // if csv exists, get max and min values from csv file
+    if (_interpolate_internal_energy)
+    {
+      _e_min = *std::min_element(_properties[_internal_energy_idx].begin(),
+                                 _properties[_internal_energy_idx].end());
+      _e_max = *std::max_element(_properties[_internal_energy_idx].begin(),
+                                 _properties[_internal_energy_idx].end());
+    }
+    else if (_fp)
     {
       // extreme values of internal energy for the grid bounds
       Real e1 = _fp->e_from_p_T(_pressure_min, _temperature_min);
@@ -2696,14 +2705,6 @@ TabulatedFluidProperties::createVEGridVectors()
       _e_min = std::min({e1, e2, e3, e4});
       _e_max = std::max({e1, e2, e3, e4});
     }
-    // if csv exists, get max and min values from csv file
-    else if (_interpolate_internal_energy)
-    {
-      _e_min = *std::min_element(_properties[_internal_energy_idx].begin(),
-                                 _properties[_internal_energy_idx].end());
-      _e_max = *std::max_element(_properties[_internal_energy_idx].begin(),
-                                 _properties[_internal_energy_idx].end());
-    }
     else
       mooseWarning("Unable to compute grid bounds in internal energy. Please specify the e_min/max "
                    "parameters");

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

@@ -175,7 +175,7 @@
     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'
+    interpolated_properties = 'density viscosity internal_energy'
   []
 []