-
Notifications
You must be signed in to change notification settings - Fork 1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor PiecewiseBase add coarsened tabulated linear function #14221
Conversation
Job Documentation on a65861b wanted to post the following: View the site here This comment will be updated on new commits. |
9165efd
to
b449763
Compare
Looks ok - but I bet you can fix the breakage before this goes in. |
I cannot fix pronghorn (no idea where those exodiffs come from...) or mastodon (ping @sveerara), but I fixed bison. |
b449763
to
13fc591
Compare
70f3d96
to
ab7e1b9
Compare
5c43315
to
e2b8401
Compare
@milljm the Minimum gcc civet environment is missing the numpy python package (which is present everywhere else)
|
[./prepare_data] | ||
type = RunCommand | ||
command = './generate_data.py' | ||
requirement = "Generate the fine tabulated function data for the coarsened_piecewise_linear test" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the following, so this test is properly skipped, if numpy is not available:
required_python_packages = 'numpy'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it make sense to just modify the script to not use numpy if that's an issue? Do we have systems where numpy isn't available?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think there are systems where MOOSE is available, but it is impossible to get numpy. The test boxes certainly have it and my priority is to make those run as efficiently as possible.
e2b8401
to
06b4ff3
Compare
@sveerara, Mastodon is the only app that fails now with
I think the fix is simply to include |
@dschwen, I will add this fix now to MASTODON. Thanks! |
I have added a merged request to Mastodon (258) to be merged after this one gets merged. |
@bwspenc would you mind taking a look at this to wrap it up? |
@bwspenc - ping |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall, looks good. Just minor stuff. It looks like some conflicts need to be resolved too. Sorry about not getting to this sooner.
framework/doc/content/source/functions/CoarsenedPiecewiseLinear.md
Outdated
Show resolved
Hide resolved
framework/doc/content/source/vectorpostprocessors/PiecewiseFunctionTabulate.md
Outdated
Show resolved
Hide resolved
[./prepare_data] | ||
type = RunCommand | ||
command = './generate_data.py' | ||
requirement = "Generate the fine tabulated function data for the coarsened_piecewise_linear test" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it make sense to just modify the script to not use numpy if that's an issue? Do we have systems where numpy isn't available?
06b4ff3
to
edac05e
Compare
Mastodon fix is still needed, but Swetha mentioned that is has been ready for a month. |
@dschwen - I can merge the Mastodon patch (1 liner). It has to go in after this one though. |
Thanks @permcody , the failure above is a seemingly unrelated python unittest TIMEOUT |
@bwspenc could you please re-review this? |
Please re-review. I think we can reasonably request numpy to be installed in a MOOSE environment.
♫ 🎶♪ All I want for Christmas is @bwspenc's rev-youuuuuuuu... ♫ 🎶♪ |
Merry Christmas! |
"All function data, supplied in abscissa, ordinate pairs"); | ||
params.addParam<std::vector<Real>>("x", "The abscissa values"); | ||
params.addParam<std::vector<Real>>("y", "The ordinate values"); | ||
params.addParam<FileName>("data_file", "File holding CSV data for use with Piecewise"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aie! How did these sneak in...I created PiecewiseBase
so I could make a custom linear function with inputs not like x
and y
, but rather ramp_rates
, and hold_times
, while still allowing me to pass it to IterationAdaptiveDT
, which requires a PiecewiseBase
. I think I need to make a PiecewiseBaseBase
now :(
It looks like PiecewiseBase
is only used in PiecewiseConstant
and PiecewiseLinearBase
, at least in MOOSE. Maybe I can just move these input parameters into those two files...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, you took away Piecewise
which gave me the flexibility I needed to not rely on input parameters to build my interpolation @dschwen!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tophmatthews, is it maybe this PR? Was the problem you raised ever solved?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I thought I fixed this...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's what he deserves for snatching that username away from you :-D
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right! Doesn't seem to be active either. :)
I had some refactoring to do on piecewise function. I will need help fixing app fallout (Mastodon in particular). This PR adds a new Piecewise Linear function that performs a coarsening of the supplied data. (this makes sense mainly for data supplied as CSV files)
Refs #14220