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

ConfigTree -- Follow-Up PR #955

Merged
merged 13 commits into from
Jan 17, 2016
Merged

ConfigTree -- Follow-Up PR #955

merged 13 commits into from
Jan 17, 2016

Conversation

chleh
Copy link
Collaborator

@chleh chleh commented Jan 14, 2016

This PR completes the transition to the new ConfigTree for project files.

Changes:

  • make a member mutable and all methods const in order to be able to pass temporary instances directly to function calls
  • change parsing of the project file completely to the new ConfigTree
  • addresses two comments by @endJunction from ConfigTree with some checks added #912

TODO (subsequent PR):

  • remove the old ConfigTree code
  • rename the new ConfigTree

_tree = other._tree;
other._tree = nullptr;
_path = other._path;
_visited_params = std::move(other._visited_params);
Copy link
Member

Choose a reason for hiding this comment

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

Why are the other variables copied and not moved?

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 improved the move assignment quite a bit.

@bilke
Copy link
Member

bilke commented Jan 15, 2016

👍

const + mutable enable use as temporary variables
move assignment complements move construction
@chleh
Copy link
Collaborator Author

chleh commented Jan 15, 2016

Due to #951 there was a non-trivial rebase necessary. You might want to recheck ProcessLib/Process and ProcessLib/GWFlowProcess.

The last two commits address comments by Dima. The third last commit improves move-assignment and adds a test for that.

@endJunction
Copy link
Member

@chleh
Copy link
Collaborator Author

chleh commented Jan 15, 2016

Just found a bug for PETSC. Resolved in the last commit. I think that will go without further review. But there really should be a working PETSC build on Jenkins...

@ogsbot
Copy link
Member

ogsbot commented Jan 15, 2016

Build finished. No test results found.

@ogsbot
Copy link
Member

ogsbot commented Jan 15, 2016

Build finished. No test results found.
Jenkins: OGS-6/Gui/Gui-Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Gui-Linux-PRs/992/

@ogsbot
Copy link
Member

ogsbot commented Jan 15, 2016

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

@endJunction
Copy link
Member

@chleh Go ahead. We will fix PETSc tests and possible bugs in the next few days.
I assume that jenkins' failures are not related to the PR.

chleh added a commit that referenced this pull request Jan 17, 2016
@chleh chleh merged commit 778b727 into ufz:master Jan 17, 2016
@chleh chleh deleted the config-tree-fup branch January 17, 2016 18:28
@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
4 participants