8000 Make use of named functions to compute secondary variables by chleh · Pull Request #1315 · ufz/ogs · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Make use of named functions to compute secondary variables #1315

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 29 commits into from
Aug 17, 2016
Merged

Make use of named functions to compute secondary variables #1315

merged 29 commits into from
Aug 17, 2016

Conversation

chleh
Copy link
Collaborator
@chleh chleh commented Jul 7, 2016 •
edited
Loading

Follow-up of #1314

TODO

  • docu

@chleh chleh force-pushed the use-named-functions branch 2 times, most recently from 215e763 to 6cd587e Compare July 26, 2016 07:40
@chleh chleh force-pushed the use-named-functions branch from 6cd587e to bd5ba05 Compare July 28, 2016 06:58
@ogsbot
Copy link
Member
ogsbot commented Jul 28, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/655/

@ogsbot
Copy link
Member
ogsbot commented Jul 28, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/2431/

@chleh chleh force-pushed the use-named-functions branch from bd5ba05 to 7d60c01 Compare August 4, 2016 17:53
@chleh chleh mentioned this pull request Aug 9, 2016
Merged
2 tasks
@chleh chleh force-pushed the use-named-functions branch from 6a0ebbe to 57fe4d0 Compare August 9, 2016 14:26
@ogsbot
Copy link
Member
ogsbot commented Aug 9, 2016

Jenkins: OGS-6/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Mac-PRs/2349/

@ogsbot
Copy link
Member
ogsbot commented Aug 9, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/2484/

@ogsbot
Copy link
Member
ogsbot commented Aug 9, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/707/

@ogsbot
Copy link
Member
ogsbot commented Aug 9, 2016

Jenkins: OGS-6/Gui/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Mac-PRs/2336/

@chleh chleh mentioned this pull request Aug 10, 2016
Merged
@chleh
Copy link
Collaborator Author
chleh commented Aug 10, 2016

Jenkins, test this please.

TomFischer
TomFischer reviewed Aug 11, 2016
View reviewed changes
ProcessLib/GlobalVectorFromNamedFunction.cpp
// TODO maybe fill args via callback mechanism or remove this class entirely.
// Caution: The order of args will be the same as the order of the
// components in the global vector!
for (std::size_t i = 0; i < n_args; ++i) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i -> component_id

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to keep it as it is. The relation between number of arguments and number of components should be clear from the comment and the assertion.

@endJunction
Copy link
Member

For discussion: Can the GWF Darcy velocities also be tested as the fct_solid_density in TES? The necessary changes would be only the extra data in the Tests/Data, isn't it?

@chleh
Copy link
Collaborator Author
chleh commented Aug 15, 2016

Yes, they can. In fact, the Darcy velocities could have been tested ever since. They don't need named functions.

endJunction
endJunction reviewed Aug 15, 2016
View reviewed changes
ProcessLib/ProcessOutput.cpp
}
if (already_output.find(external_variable_name) != already_output.end())
continue;
already_output.insert(external_variable_name);
Copy link
Member
@endJunction endJunction Aug 15, 2016 •
edited by chleh
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just technical thing:
Instead of searching and inserting, you could use the return value of std::map::insert, which is a pair of iterator and boolean, the latter indicating success/failure of the insertion. :white_check_mark:

@endJunction
Copy link
Member

Technically OK. ⏩

chleh added 19 commits August 17, 2016 08:47
@chleh
[PL] class that creates a global vector from the results of named fun…
f1c4727 
…ction calls
@chleh
[PL] "global" context to evaluate a secondary variable using named fu…
d0b842a 
…nctions
@chleh
[PL] process owns named functions
1d9ec99
@chleh
[PL] TES uses named functions
78210b8
@chleh
[PL] changed includes
5dca603
@chleh
[PL] fixed explicit ctor error
a5df30c
@chleh
]PL] fixes after rebase
9c7220d
@chleh
[PL] added docu
f2acbb4
8000 @chleh
[PL] added docu
c9be60c
@chleh
[PL] added docu
6380a7f
@chleh
[PL] added docu
0ed9b82
@chleh
[PL] fixed compilation error
98d7b06
@chleh
[PL] code review changes.
d63cf5f 
* context: class -> struct
* global vector from named fct: result_cache -> result
* cached 2ndary var: fixed member name
@chleh
[Data] changed 2ndary var configuration
861c74e
@chleh
[PL] updated std::set usage
f16efdb
@chleh
[PL] added docu
fe3466a
@chleh
[PL] added final
5ff1414
@chleh
[Data] changed some attributes
5932e84
@chleh
[PL] made variable names match the docu
c6bbe42
@chleh chleh force-pushed the use-named-functions branch from 9d098fa to c6bbe42 Compare August 17, 2016 07:25
@chleh
Copy link
Collaborator Author
chleh commented Aug 17, 2016

Thanks for the review.

@ogsbot
Copy link
Member
ogsbot commented Aug 17, 2016

Jenkins: OGS-6/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Mac-PRs/2427/

@ogsbot
Copy link
Member
ogsbot commented Aug 17, 2016

Jenkins: OGS-6/Gui/Gui-Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Gui-Linux-PRs/2508/

@ogsbot
Copy link
Member
ogsbot commented Aug 17, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/2563/

@ogsbot
Copy link
Member
ogsbot commented Aug 17, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/786/

@chleh
Copy link
Collaborator Author
chleh commented Aug 17, 2016

Jenkins, test this please.

@chleh chleh merged commit 045c4f2 into ufz:master Aug 17, 2016
@chleh chleh deleted the use-named-functions branch August 17, 2016 08:41
@ogsbot
Copy link
Member
ogsbot commented Jun 19, 2020

OpenGeoSys development has been moved to GitLab.

See this pull request on GitLab.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chleh @ogsbot @endJunction @TomFischer
0