Skip to content
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

Integration order in project files. #1464

Merged
merged 10 commits into from
Oct 7, 2016

Conversation

endJunction
Copy link
Member

Until now the integration order was hardcoded into default value of 2 in Process class.
I introduced a new tag <integration_order> for each <process> which is parsed and propagated to the Process ctor.

Copy link
Collaborator

@chleh chleh left a comment

Choose a reason for hiding this comment

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

I think the integration order is still hard-coded in the flux process. What about that?

@@ -266,6 +266,10 @@ void ProjectData::parseProcesses(BaseLib::ConfigTree const& processes_config,
//! \ogs_file_param{process__type}
auto const name = process_config.getConfigParameter<std::string>("name");

//! \ogs_file_param{process__integration_order}
Copy link
Collaborator

@chleh chleh Oct 5, 2016

Choose a reason for hiding this comment

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

This comment has to be in the line before getConfigParameter. I.e., please move it down one line. ✅

@endJunction
Copy link
Member Author

Updated the surface flux too; the integration order is same as in the caller process (GWF in this case).

@chleh
Copy link
Collaborator

chleh commented Oct 5, 2016

👍

1 similar comment
@wenqing
Copy link
Member

wenqing commented Oct 5, 2016

👍

@endJunction
Copy link
Member Author

Please rebase to 6.0.7 before merging.

@endJunction endJunction force-pushed the IntegrationOrderInput branch 3 times, most recently from b4aad6e to dca8a27 Compare October 6, 2016 12:18
@endJunction
Copy link
Member Author

Jenkins, test this please!

@endJunction endJunction merged commit 9ae5f58 into ufz:master Oct 7, 2016
@endJunction endJunction deleted the IntegrationOrderInput branch October 7, 2016 10:47
@wenqing
Copy link
Member

wenqing commented Oct 7, 2016

@endJunction In the data repository, branch IntegrationOrder is not merged to master.
Another issue: The order can only be 2. If it is 1, the least square extrapolation does not work.. The order of 1 is unnecessary.

@endJunction
Copy link
Member Author

@wenqing Yes, thanks forgot to update the Tests/Data.

@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants