Merge pull request #13363 from dschwen/phase_field_tests_2975

Fixing phase field tests in parallel

modules/phase_field/include/ics/PFCFreezingIC.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "InitialCondition.h"
+#include "RandomICBase.h"
 
 // Forward Declarations
 class PFCFreezingIC;
@@ -24,7 +24,7 @@ InputParameters validParams<PFCFreezingIC>();
  * \todo For the FCC this returns 0. This cannot be right, yet it satisfies the (probably bogus)
  * test.
  */
-class PFCFreezingIC : public InitialCondition
+class PFCFreezingIC : public RandomICBase
 {
 public:
   PFCFreezingIC(const InputParameters & parameters);
@@ -52,4 +52,3 @@ class PFCFreezingIC : public InitialCondition
 
   unsigned int _icdim;
 };
-

modules/phase_field/include/ics/PolycrystalRandomIC.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "InitialCondition.h"
+#include "RandomICBase.h"
 
 // Forward Declarations
 class PolycrystalRandomIC;
@@ -20,7 +20,7 @@ InputParameters validParams<PolycrystalRandomIC>();
 /**
  * Random initial condition for a polycrystalline material
  */
-class PolycrystalRandomIC : public InitialCondition
+class PolycrystalRandomIC : public RandomICBase
 {
 public:
   PolycrystalRandomIC(const InputParameters & parameters);
@@ -32,4 +32,3 @@ class PolycrystalRandomIC : public InitialCondition
   const unsigned int _op_index;
   const unsigned int _random_type;
 };
-

modules/phase_field/src/action/BicrystalBoundingBoxICAction.C

@@ -19,7 +19,8 @@ InputParameters
 validParams<BicrystalBoundingBoxICAction>()
 {
   InputParameters params = validParams<Action>();
-  params.addClassDescription("Bicrystal using a bounding box");
+  params.addClassDescription("Constructs a bicrystal, where one grain is on the inside of "
+                             "the box and the other grain is the outside of the box");
   params.addRequiredParam<std::string>("var_name_base", "specifies the base name of the variables");
   params.addRequiredParam<unsigned int>("op_num", "Number of grains, should be 2");
   params.addRequiredParam<Real>("x1", "The x coordinate of the lower left-hand corner of the box");
@@ -37,7 +38,7 @@ BicrystalBoundingBoxICAction::BicrystalBoundingBoxICAction(const InputParameters
     _op_num(getParam<unsigned int>("op_num"))
 {
   if (_op_num != 2)
-    paramError("op_num", "op_num must equal 2 for bicrystal ICs");
+    paramError("op_num", "Must equal 2 for bicrystal ICs");
 }
 
 void
@@ -59,7 +60,7 @@ BicrystalBoundingBoxICAction::act()
     poly_params.set<VariableName>("variable") = var_name;
     if (op == 0)
     {
-      // Values for bounding box
+      // Values for bounding box grain
       poly_params.set<Real>("inside") = 1.0;
       poly_params.set<Real>("outside") = 0.0;
     }

modules/phase_field/src/ics/PFCFreezingIC.C

@@ -16,7 +16,7 @@ template <>
 InputParameters
 validParams<PFCFreezingIC>()
 {
-  InputParameters params = validParams<InitialCondition>();
+  InputParameters params = validParams<RandomICBase>();
   params.addRequiredParam<Real>("x1",
                                 "The x coordinate of the lower left-hand corner of the frozen box");
   params.addRequiredParam<Real>("y1",
@@ -38,13 +38,11 @@ validParams<PFCFreezingIC>()
   params.addParam<MooseEnum>(
       "crystal_structure", crystal_structures, "The type of crystal structure");
 
-  params.addParam<unsigned int>("seed", 0, "Seed value for the random number generator");
-
   return params;
 }
 
 PFCFreezingIC::PFCFreezingIC(const InputParameters & parameters)
-  : InitialCondition(parameters),
+  : RandomICBase(parameters),
     _x1(getParam<Real>("x1")),
     _y1(getParam<Real>("y1")),
     _z1(getParam<Real>("z1")),
@@ -67,8 +65,6 @@ PFCFreezingIC::PFCFreezingIC(const InputParameters & parameters)
   for (unsigned int i = 0; i < LIBMESH_DIM; i++)
     mooseAssert(_range(i) >= 0.0, "x1, y1 or z1 is not less than x2, y2 or z2");
 
-  MooseRandom::seed(getParam<unsigned int>("seed"));
-
   if (_range(1) == 0.0)
     _icdim = 1;
   else if (_range(2) < 1.0e-10 * _range(0))
@@ -83,7 +79,7 @@ PFCFreezingIC::value(const Point & p)
   // If out of bounds, set random value
   for (unsigned int i = 0; i < LIBMESH_DIM; i++)
     if (p(i) < _bottom_left(i) || p(i) > _top_right(i))
-      return _min + _val_range * MooseRandom::rand();
+      return _min + _val_range * generateRandom();
 
   // If in bounds, set sinusoid IC to make atoms
   Real val = 0.0;

modules/phase_field/src/ics/PolycrystalRandomIC.C

@@ -16,17 +16,16 @@ template <>
 InputParameters
 validParams<PolycrystalRandomIC>()
 {
-  InputParameters params = validParams<InitialCondition>();
+  InputParameters params = validParams<RandomICBase>();
   params.addClassDescription("Random initial condition for a polycrystalline material");
   params.addRequiredParam<unsigned int>("op_num", "Number of order parameters");
   params.addRequiredParam<unsigned int>("op_index", "The index for the current order parameter");
-  params.addRequiredParam<unsigned int>("random_type",
-                                        "Type of random grain structure (formerly called 'typ')");
+  params.addRequiredParam<unsigned int>("random_type", "Type of random grain structure");
   return params;
 }
 
 PolycrystalRandomIC::PolycrystalRandomIC(const InputParameters & parameters)
-  : InitialCondition(parameters),
+  : RandomICBase(parameters),
     _op_num(getParam<unsigned int>("op_num")),
     _op_index(getParam<unsigned int>("op_index")),
     _random_type(getParam<unsigned int>("random_type"))
@@ -37,7 +36,7 @@ Real
 PolycrystalRandomIC::value(const Point & p)
 {
   Point cur_pos = p;
-  Real val = MooseRandom::rand();
+  Real val = generateRandom();
 
   switch (_random_type)
   {

modules/phase_field/src/materials/GBAnisotropyBase.C

@@ -31,7 +31,7 @@ validParams<GBAnisotropyBase>()
                                     "Name of the file containing: 1)GB mobility prefactor; 2) GB "
                                     "migration activation energy; 3)GB energy");
   params.addRequiredParam<bool>("inclination_anisotropy",
-                                "The GB anisotropy ininclination would be considered if true");
+                                "The GB anisotropy inclination would be considered if true");
   params.addRequiredCoupledVarWithAutoBuild(
       "v", "var_name_base", "op_num", "Array of coupled variables");
   return params;

modules/phase_field/src/materials/GBEvolutionBase.C

@@ -69,14 +69,14 @@ GBEvolutionBase::computeQpProperties()
 {
   const Real length_scale4 = _length_scale * _length_scale * _length_scale * _length_scale;
 
-  // Convert to lengthscale^4/(eV*timescale);
-  Real M0 = _GBmob0 * _time_scale / (_JtoeV * length_scale4);
-
   // GB mobility Derivative
   Real dM_GBdT;
 
   if (_GBMobility < 0)
   {
+    // Convert to lengthscale^4/(eV*timescale);
+    const Real M0 = _GBmob0 * _time_scale / (_JtoeV * length_scale4);
+
     _M_GB[_qp] = M0 * std::exp(-_Q / (_kb * _T[_qp]));
     dM_GBdT = _M_GB[_qp] * _Q / (_kb * _T[_qp] * _T[_qp]);
   }

modules/phase_field/src/materials/MultiBarrierFunctionMaterial.C

@@ -25,7 +25,7 @@ validParams<MultiBarrierFunctionMaterial>()
                         false,
                         "Make the g zero in [0:1] so it only contributes to "
                         "enforcing the eta range and not to the phase "
-                        "transformation berrier.");
+                        "transformation barrier.");
   params.addRequiredCoupledVar("etas", "eta_i order parameters, one for each h");
   return params;
 }
@@ -62,7 +62,6 @@ MultiBarrierFunctionMaterial::computeQpProperties()
 
     if (_well_only && n >= 0.0 && n <= 1.0)
     {
-      _prop_g[_qp] = 0.0;
       (*_prop_dg[i])[_qp] = 0.0;
       (*_prop_d2g[i])[_qp] = 0.0;
       continue;