Skip to content

Commit

Permalink
added check that optimization does not define both file and input mea…
Browse files Browse the repository at this point in the history
…surement datas. idaholab#21885
  • Loading branch information
lynnmunday authored and MengnanLi91 committed Jan 4, 2023
1 parent add6b34 commit 5b03570
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion modules/optimization/src/reporters/OptimizationData.C
Expand Up @@ -42,6 +42,12 @@ OptimizationData::validParams()
"file_value", "value", "measurement value column name from csv file being read in");

params.addParam<VariableName>("variable", "Variable to sample at measurement points.");

params.addParamNamesToGroup("measurement_points measurement_values measurement_times",
"Input Measurement Data");
params.addParamNamesToGroup(
"measurement_file file_xcoord file_ycoord file_zcoord file_time file_value",
"File Measurement Data");
return params;
}

Expand All @@ -68,7 +74,10 @@ OptimizationData::OptimizationData(const InputParameters & parameters)
Moose::VarFieldType::VAR_FIELD_STANDARD)
: nullptr)
{
if (isParamValid("measurement_file"))
if (isParamValid("measurement_file") && isParamValid("measurement_points"))
mooseError("Input file can only define a single input for measurement data. Use only "
"measurement_file or measurement_points, but never both");
else if (isParamValid("measurement_file"))
readMeasurementsFromFile();
else if (isParamValid("measurement_points"))
readMeasurementsFromInput();
Expand Down

0 comments on commit 5b03570

Please sign in to comment.