More clarifying what fluid properties object is built how in unit tests

Author: GiudGiud

modules/fluid_properties/unit/include/TabulatedBicubicFluidPropertiesTest.h

@@ -53,7 +53,7 @@ class TabulatedBicubicFluidPropertiesTest : public MooseObjectUnitTest
     _fe_problem->addUserObject("TabulatedBicubicFluidProperties", "tab_fp_ve", tab_uo_ve_params);
     _tab_ve_from_pT = &_fe_problem->getUserObject<TabulatedBicubicFluidProperties>("tab_fp_ve");
 
-    // Tabulation  in (p, T) built from another FluidProperties, specifically for testing generation
+    // Tabulation in (p, T) built from another FluidProperties, specifically for testing generation
     InputParameters tab_gen_uo_params = _factory.getValidParams("TabulatedBicubicFluidProperties");
     tab_gen_uo_params.set<UserObjectName>("fp") = "co2_fp";
     tab_gen_uo_params.set<Real>("temperature_min") = 400;
@@ -63,8 +63,8 @@ class TabulatedBicubicFluidPropertiesTest : public MooseObjectUnitTest
     tab_gen_uo_params.set<unsigned int>("num_T") = 6;
     tab_gen_uo_params.set<unsigned int>("num_p") = 6;
     tab_gen_uo_params.set<MultiMooseEnum>("interpolated_properties") = properties;
-    _fe_problem->addUserObject("TabulatedBicubicFluidProperties", "tab_gen_fp", tab_gen_uo_params);
-    _tab_gen_fp = &_fe_problem->getUserObject<TabulatedBicubicFluidProperties>("tab_gen_fp");
+    _fe_problem->addUserObject("TabulatedBicubicFluidProperties", "tab_pT_from_fp_gen", tab_gen_uo_params);
+    _tab_pT_from_fp_gen = &_fe_problem->getUserObject<TabulatedBicubicFluidProperties>("tab_pT_from_fp_gen");
 
     // Tabulation  in (v, e) built from another FluidProperties
     InputParameters tab_direct_ve_params =
@@ -81,8 +81,6 @@ class TabulatedBicubicFluidPropertiesTest : public MooseObjectUnitTest
     // set newton parameters for inversion
     tab_direct_ve_params.set<Real>("T_initial_guess") = 450;
     tab_direct_ve_params.set<Real>("p_initial_guess") = 1.5e6;
-    // tab_direct_ve_params.set<Real>("tolerance") = 1e-6;
-    tab_direct_ve_params.set<unsigned int>("max_newton_its") = 300;
     MultiMooseEnum properties_ve(
         "density enthalpy viscosity k c cv cp entropy pressure temperature",
         "density enthalpy viscosity k c cv cp entropy pressure temperature");
@@ -138,7 +136,7 @@ class TabulatedBicubicFluidPropertiesTest : public MooseObjectUnitTest
   // For testing values
   const TabulatedBicubicFluidProperties * _tab_pT_from_fp;
   const TabulatedBicubicFluidProperties * _tab_ve_from_pT;
-  const TabulatedBicubicFluidProperties * _tab_gen_fp;
+  const TabulatedBicubicFluidProperties * _tab_pT_from_fp_gen;
   const TabulatedBicubicFluidProperties * _tab_ve_from_fp;
 
   // These properties are for testing errors and warnings

modules/fluid_properties/unit/src/TabulatedBicubicFluidPropertiesTest.C

@@ -887,17 +887,17 @@ TEST_F(TabulatedBicubicFluidPropertiesTest, generateTabulatedData)
   Real p = 1.5e6;
   Real T = 450.0;
 
-  // Generate the tabulated data
-  const_cast<TabulatedBicubicFluidProperties *>(_tab_gen_fp)->initialSetup();
-
-  REL_TEST(_tab_gen_fp->rho_from_p_T(p, T), _co2_fp->rho_from_p_T(p, T), 1.0e-4);
-  REL_TEST(_tab_gen_fp->h_from_p_T(p, T), _co2_fp->h_from_p_T(p, T), 1.0e-4);
-  REL_TEST(_tab_gen_fp->e_from_p_T(p, T), _co2_fp->e_from_p_T(p, T), 1.0e-4);
-  REL_TEST(_tab_gen_fp->mu_from_p_T(p, T), _co2_fp->mu_from_p_T(p, T), 1.0e-4);
-  REL_TEST(_tab_gen_fp->k_from_p_T(p, T), _co2_fp->k_from_p_T(p, T), 1.0e-4);
-  REL_TEST(_tab_gen_fp->cp_from_p_T(p, T), _co2_fp->cp_from_p_T(p, T), 1.0e-4);
-  REL_TEST(_tab_gen_fp->cv_from_p_T(p, T), _co2_fp->cv_from_p_T(p, T), 1.0e-4);
-  REL_TEST(_tab_gen_fp->s_from_p_T(p, T), _co2_fp->s_from_p_T(p, T), 1.0e-4);
+  // Generate the tabulated data from the CO2 fluid properties
+  const_cast<TabulatedBicubicFluidProperties *>(_tab_pT_from_fp_gen)->initialSetup();
+
+  REL_TEST(_tab_pT_from_fp_gen->rho_from_p_T(p, T), _co2_fp->rho_from_p_T(p, T), 1.0e-4);
+  REL_TEST(_tab_pT_from_fp_gen->h_from_p_T(p, T), _co2_fp->h_from_p_T(p, T), 1.0e-4);
+  REL_TEST(_tab_pT_from_fp_gen->e_from_p_T(p, T), _co2_fp->e_from_p_T(p, T), 1.0e-4);
+  REL_TEST(_tab_pT_from_fp_gen->mu_from_p_T(p, T), _co2_fp->mu_from_p_T(p, T), 1.0e-4);
+  REL_TEST(_tab_pT_from_fp_gen->k_from_p_T(p, T), _co2_fp->k_from_p_T(p, T), 1.0e-4);
+  REL_TEST(_tab_pT_from_fp_gen->cp_from_p_T(p, T), _co2_fp->cp_from_p_T(p, T), 1.0e-4);
+  REL_TEST(_tab_pT_from_fp_gen->cv_from_p_T(p, T), _co2_fp->cv_from_p_T(p, T), 1.0e-4);
+  REL_TEST(_tab_pT_from_fp_gen->s_from_p_T(p, T), _co2_fp->s_from_p_T(p, T), 1.0e-4);
 }
 
 // Test that all fluid properties are properly passed back to the given user object