Correctly handle user-set gap_geometry_type closes idaholab#9578

liuusu · Oct 4, 2017 · b01226f · b01226f
1 parent bff023b
commit b01226f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 48 deletions.
diff --git a/modules/heat_conduction/include/bcs/GapHeatTransfer.h b/modules/heat_conduction/include/bcs/GapHeatTransfer.h
@@ -24,7 +24,7 @@ class GapHeatTransfer : public IntegratedBC
 public:
   GapHeatTransfer(const InputParameters & parameters);
 
-  virtual void computeResidual() override;
+  virtual void initialSetup() override;
 
 protected:
   virtual Real computeQpResidual() override;

diff --git a/modules/heat_conduction/include/materials/GapConductance.h b/modules/heat_conduction/include/materials/GapConductance.h
@@ -49,7 +49,7 @@ class GapConductance : public Material
                               Real & r2,
                               Real & radius);
 
-  virtual void computeProperties() override;
+  virtual void initialSetup() override;
 
 protected:
   virtual void computeQpProperties() override;

diff --git a/modules/heat_conduction/src/actions/ThermalContactBCsAction.C b/modules/heat_conduction/src/actions/ThermalContactBCsAction.C
@@ -12,6 +12,7 @@
 #include "MooseApp.h"
 #include "Conversion.h"
 #include "AddVariableAction.h"
+#include "GapConductance.h"
 
 template <>
 InputParameters
@@ -45,6 +46,7 @@ validParams<ThermalContactBCsAction>()
       "save_in", "The Auxiliary Variable to (optionally) save the boundary flux in");
   params.addParam<bool>(
       "quadrature", false, "Whether or not to use quadrature point based gap heat transfer");
+  params += GapConductance::actionParameters();
 
   return params;
 }

diff --git a/modules/heat_conduction/src/bcs/GapHeatTransfer.C b/modules/heat_conduction/src/bcs/GapHeatTransfer.C
@@ -140,16 +140,10 @@ GapHeatTransfer::GapHeatTransfer(const InputParameters & parameters)
 }
 
 void
-GapHeatTransfer::computeResidual()
+GapHeatTransfer::initialSetup()
 {
-  if (!_gap_geometry_params_set)
-  {
-    _gap_geometry_params_set = true;
-    GapConductance::setGapGeometryParameters(
-        _pars, _assembly.coordSystem(), _gap_geometry_type, _p1, _p2);
-  }
-
-  IntegratedBC::computeResidual();
+  GapConductance::setGapGeometryParameters(
+      _pars, _assembly.coordSystem(), _gap_geometry_type, _p1, _p2);
 }
 
 Real

diff --git a/modules/heat_conduction/src/materials/GapConductance.C b/modules/heat_conduction/src/materials/GapConductance.C
@@ -47,14 +47,6 @@ validParams<GapConductance>()
                         "then required.");
   params.addParam<BoundaryName>("paired_boundary", "The boundary to be penetrated");
 
-  // Deprecated parameter
-  MooseEnum coord_types("default XYZ");
-  params.addDeprecatedParam<MooseEnum>(
-      "coord_type",
-      coord_types,
-      "Gap calculation type (default or XYZ).",
-      "The functionality of this parameter is replaced by 'gap_geometry_type'.");
-
   params.addParam<Real>("stefan_boltzmann", 5.669e-8, "The Stefan-Boltzmann constant");
 
   params.addParam<bool>("use_displaced_mesh",
@@ -168,6 +160,12 @@ GapConductance::GapConductance(const InputParameters & parameters)
   }
 }
 
+void
+GapConductance::initialSetup()
+{
+  setGapGeometryParameters(_pars, _coord_sys, _gap_geometry_type, _p1, _p2);
+}
+
 void
 GapConductance::setGapGeometryParameters(const InputParameters & params,
                                          const Moose::CoordinateSystemType coord_sys,
@@ -179,23 +177,6 @@ GapConductance::setGapGeometryParameters(const InputParameters & params,
   {
     gap_geometry_type =
         GapConductance::GAP_GEOMETRY(int(params.get<MooseEnum>("gap_geometry_type")));
-    if (params.isParamSetByUser("coord_type"))
-      ::mooseError("Deprecated parameter 'coord_type' cannot be used together with "
-                   "'gap_geometry_type' in GapConductance");
-  }
-  else if (params.isParamSetByUser("coord_type"))
-  {
-    if (params.get<MooseEnum>("coord_type") == "XYZ")
-      gap_geometry_type = GapConductance::PLATE;
-    else
-    {
-      if (coord_sys == Moose::COORD_XYZ)
-        gap_geometry_type = GapConductance::PLATE;
-      else if (coord_sys == Moose::COORD_RZ)
-        gap_geometry_type = GapConductance::CYLINDER;
-      else if (coord_sys == Moose::COORD_RSPHERICAL)
-        gap_geometry_type = GapConductance::SPHERE;
-    }
   }
   else
   {
@@ -257,18 +238,6 @@ GapConductance::setGapGeometryParameters(const InputParameters & params,
   }
 }
 
-void
-GapConductance::computeProperties()
-{
-  if (!_gap_geometry_params_set)
-  {
-    _gap_geometry_params_set = true;
-    setGapGeometryParameters(_pars, _coord_sys, _gap_geometry_type, _p1, _p2);
-  }
-
-  Material::computeProperties();
-}
-
 void
 GapConductance::computeQpProperties()
 {