Skip to content

Commit

Permalink
Address review comments. Refs #18931
Browse files Browse the repository at this point in the history
  • Loading branch information
aprilnovak committed Sep 27, 2021
1 parent 07450ff commit 933313e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion framework/include/userobject/LayeredBase.h
Expand Up @@ -74,7 +74,7 @@ class LayeredBase : private Restartable
* Get direction of the layers
* @return layer direction
*/
const unsigned int & direction() const { return _direction; }
const unsigned int direction() const { return _direction; }

virtual void initialize();
virtual void finalize();
Expand Down
33 changes: 17 additions & 16 deletions test/tests/userobjects/nearest_point_layered_average/tests
@@ -1,15 +1,15 @@
[Tests]
[./test]
[test]
type = 'Exodiff'
input = 'nearest_point_layered_average.i'
cli_args = "UserObjects/npla/points='0.25 0 0.25 0.75 0 0.25 0.25 0 0.75 0.75 0 0.75'"
exodiff = 'nearest_point_layered_average_out.e'
requirement = 'The system shall compute layered averages that computed from the closest values for a list of points that are explicitly specified in an input file'
design = 'NearestPointLayeredAverage.md'
issues = '#1878'
[../]
[]

[./from_file]
[from_file]
type = 'Exodiff'
input = 'nearest_point_layered_average.i'
cli_args = "UserObjects/npla/points_file='points.txt'"
Expand All @@ -18,19 +18,19 @@
design = 'NearestPointLayeredAverage.md'
issues = '#12356'
prereq = test
[../]
[]

[./error_missing_point_spec]
[error_missing_point_spec]
type = RunException
input = 'nearest_point_layered_average.i'
expect_err = "npla: You need to supply either 'points' or 'points_file' parameter\."
prereq = test
requirement = 'The system shall report an error when points are not specified in an input file nor an external file when computing nearest point layered averages'
design = 'NearestPointLayeredAverage.md'
issues = '#12356'
[../]
[]

[./error_conflicting_point_spec]
[error_conflicting_point_spec]
type = RunException
input = 'nearest_point_layered_average.i'
cli_args = "UserObjects/npla/points='0.25 0 0.25' UserObjects/npla/points_file='points.txt'"
Expand All @@ -39,9 +39,9 @@
requirement = 'The system shall report an error when points are specified both in an input file and an external file when computing nearest point layered averages'
design = 'NearestPointLayeredAverage.md'
issues = '#12356'
[../]
[]

[./error_not_enough_points_in_a_file]
[error_not_enough_points_in_a_file]
type = RunException
input = 'nearest_point_layered_average.i'
cli_args = "UserObjects/npla/points_file='bad_points.txt'"
Expand All @@ -50,31 +50,32 @@
requirement = 'The system shall report an error when there is not enough coordinates specified in an external file specifing the point for computing nearest point layered averages'
design = 'NearestPointLayeredAverage.md'
issues = '#12356'
[../]
[]

[./nearest_radius]
[nearest_radius]
type = 'Exodiff'
input = 'nearest_radius_layered_average.i'
exodiff = 'nearest_radius_layered_average_out.e'
requirement = 'The system shall compute layered averages for concentric cylindrical rings with equal thickness for a list of points that correspond to the average radius of each ring'
design = 'NearestRadiusLayeredAverage.md'
issues = '#16829'
[../]
[]

[./points_from_uo]
[points_from_uo]
type = 'CSVDiff'
input = 'points_from_uo.i'
csvdiff = 'points_from_uo_out_spatial_from_uo_0002.csv'
requirement = 'The system shall compute layered averages computed from the closest values for a list of points and output to a spatial vector postprocessor with one point per unique nearest point and layer'
design = 'NearestPointLayeredAverage.md'
issues = '#18931'
[../]
[./radius_points_from_uo]
[]

[radius_points_from_uo]
type = 'CSVDiff'
input = 'radius_points_from_uo.i'
csvdiff = 'radius_points_from_uo_out_spatial_from_uo_0002.csv'
requirement = 'The system shall compute radial layered averages computed from the closest values for a list of points and output to a spatial vector postprocessor with one point per unique nearest point and layer'
design = 'NearestRadiusLayeredAverage.md'
issues = '#18931'
[../]
[]
[]
9 changes: 5 additions & 4 deletions test/tests/userobjects/nearest_point_layered_integral/tests
@@ -1,18 +1,19 @@
[Tests]
[./from_file]
[from_file]
type = 'Exodiff'
input = 'nearest_point_layered_integral.i'
exodiff = 'nearest_point_layered_integral_out.e'
requirement = 'The system shall compute layered integrals that computed from the closest values for a list of points that are specified in an external file'
design = 'NearestPointLayeredIntegral.md'
issues = '#14717'
[../]
[./points_from_uo]
[]

[points_from_uo]
type = 'CSVDiff'
input = 'points_from_uo.i'
csvdiff = 'points_from_uo_out_spatial_from_uo_0002.csv'
requirement = 'The system shall compute layered integrals computed from the closest values for a list of points and output to a spatial vector postprocessor with one point per unique nearest point and layer'
design = 'NearestPointLayeredIntegral.md'
issues = '#18931'
[../]
[]
[]
4 changes: 2 additions & 2 deletions test/tests/vectorpostprocessors/nearest_point_integral/tests
@@ -1,10 +1,10 @@
[Tests]
[./points_from_uo]
[points_from_uo]
type = 'CSVDiff'
input = 'nearest_point_integral.i'
csvdiff = 'nearest_point_integral_out_spatial_from_uo_0002.csv'
requirement = 'The system shall compute integrals computed from the closest values for a list of points and output to a spatial vector postprocessor with one point per point'
design = 'NearestPointIntegralVariablePostprocessor.md'
issues = '#18931'
[../]
[]
[]

0 comments on commit 933313e

Please sign in to comment.