Skip to content

Commit 4e5cd57

Browse files
committed
moving location where _num_points_from_provider is filled out of the constructor and to initial setup where it is used. No longer initializing it to zero when it will be filled later.
1 parent c6fa3fb commit 4e5cd57

1 file changed

Lines changed: 8 additions & 26 deletions

File tree

modules/solid_mechanics/src/userobjects/CrackFrontDefinition.C

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,6 @@ CrackFrontDefinition::CrackFrontDefinition(const InputParameters & parameters)
159159
"CrackFrontDefinition error: since boundary is defined, "
160160
"crack_front_points_provider should not be added.");
161161

162-
// number_points_from_provider is optional - will be auto-detected in initialSetup()
163-
// for mesh-based providers
164-
if (isParamValid("number_points_from_provider"))
165-
_num_points_from_provider = getParam<unsigned int>("number_points_from_provider");
166-
else
167-
_num_points_from_provider = 0; // Will be set in initialSetup() for mesh-based providers
168-
169162
_geom_definition_method = CRACK_GEOM_DEFINITION::CRACK_FRONT_POINTS;
170163
}
171164
else if (isParamValid("number_points_from_provider"))
@@ -300,25 +293,10 @@ CrackFrontDefinition::initialSetup()
300293
_use_mesh_cutter = true;
301294

302295
// Automatically get number of crack front points from mesh-based provider
303-
if (_num_points_from_provider == 0)
304-
{
305-
_num_points_from_provider = _crack_front_points_provider->getNumberOfCrackFrontPoints();
306-
mooseInfo("CrackFrontDefinition: Automatically detected ",
307-
_num_points_from_provider,
308-
" crack front points from mesh-based provider");
309-
}
310-
else
311-
{
312-
auto xfem_cutter_points = _crack_front_points_provider->getNumberOfCrackFrontPoints();
313-
if (_num_points_from_provider != xfem_cutter_points)
314-
paramError("number_points_from_provider",
315-
"This must match the number of points provided by the XFEM cutter "
316-
"object."
317-
"\n number_points_from_provider: ",
318-
_num_points_from_provider,
319-
"\n XFEM Crack Front Points: ",
320-
xfem_cutter_points);
321-
}
296+
_num_points_from_provider = _crack_front_points_provider->getNumberOfCrackFrontPoints();
297+
mooseInfo("CrackFrontDefinition: Automatically detected ",
298+
_num_points_from_provider,
299+
" crack front points from mesh-based provider");
322300

323301
if (_direction_method != DIRECTION_METHOD::CURVED_CRACK_FRONT)
324302
paramError("crack_direction_method",
@@ -329,6 +307,10 @@ CrackFrontDefinition::initialSetup()
329307
"'crack_mouth_boundary' cannot be set when using a "
330308
"'crack_front_points_provider' that uses an XFEM cutter mesh");
331309
}
310+
else if (isParamValid("number_points_from_provider"))
311+
{
312+
_num_points_from_provider = getParam<unsigned int>("number_points_from_provider");
313+
}
332314
else if (_num_points_from_provider == 0)
333315
{
334316
paramError(

0 commit comments

Comments
 (0)