Merge pull request #13016 from snschune/remove_NSSpecificVolumeAux_13015

Remove NSSpecificVolumeAux
idaholab · Mar 12, 2019 · 355ddee · 355ddee
2 parents 913f3c7 + 2952093
commit 355ddee
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 95 deletions.
diff --git a/modules/navier_stokes/doc/content/source/auxkernels/NSSpecificVolumeAux.md b/modules/navier_stokes/doc/content/source/auxkernels/NSSpecificVolumeAux.md
diff --git a/modules/navier_stokes/include/actions/AddNavierStokesKernelsAction.h b/modules/navier_stokes/include/actions/AddNavierStokesKernelsAction.h
@@ -60,7 +60,7 @@ class AddNavierStokesKernelsAction : public NSAction
   void addNSEnthalpyAux();
   void addNSMachAux();
   void addNSInternalEnergyAux();
-  void addNSSpecificVolumeAux();
+  void addSpecificVolumeComputation();
 
   // Name of the FluidProperties object to pass on to Kernels
   UserObjectName _fp_name;

diff --git a/modules/navier_stokes/include/auxkernels/NSSpecificVolumeAux.h b/modules/navier_stokes/include/auxkernels/NSSpecificVolumeAux.h
diff --git a/modules/navier_stokes/src/actions/AddNavierStokesKernelsAction.C b/modules/navier_stokes/src/actions/AddNavierStokesKernelsAction.C
@@ -69,7 +69,7 @@ AddNavierStokesKernelsAction::act()
   addNSEnthalpyAux();
   addNSMachAux();
   addNSInternalEnergyAux();
-  addNSSpecificVolumeAux();
+  addSpecificVolumeComputation();
   for (unsigned int component = 0; component < _dim; ++component)
     addNSVelocityAux(component);
 }
@@ -125,15 +125,19 @@ AddNavierStokesKernelsAction::addNSSUPGEnergy()
 }
 
 void
-AddNavierStokesKernelsAction::addNSSpecificVolumeAux()
+AddNavierStokesKernelsAction::addSpecificVolumeComputation()
 {
-  const std::string kernel_type = "NSSpecificVolumeAux";
+  const std::string kernel_type = "ParsedAux";
 
   InputParameters params = _factory.getValidParams(kernel_type);
   params.set<AuxVariableName>("variable") = NS::specific_volume;
 
-  // coupled variables
+  // arguments
-  params.set<CoupledName>(NS::density) = {NS::density};
+  params.set<CoupledName>("args") = {NS::density};
+
+  // expression
+  std::string function = "if(" + NS::density + " = 0, 1e10, 1 / " + NS::density + ")";
+  params.set<std::string>("function") = function;
 
   _problem->addAuxKernel(kernel_type, "specific_volume_auxkernel", params);
 }

diff --git a/modules/navier_stokes/src/auxkernels/NSSpecificVolumeAux.C b/modules/navier_stokes/src/auxkernels/NSSpecificVolumeAux.C