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

Add a model of Curve for capillary pressure saturation #1578

Merged
merged 5 commits into from
Nov 28, 2016

Conversation

wenqing
Copy link
Member

@wenqing wenqing commented Nov 25, 2016

This PR:
1 adds a model of Curve for capillary pressure saturation,
2. changes some member names starting with an underscore and followed by a capital letter,
3. moves common members of capillary pressure saturation classes to their base class,
4. corrects some documentations.

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.

Looks good.

{
public:
CapillaryPressureSaturationCurve(
std::unique_ptr<MathLib::PiecewiseLinearMonotonicCurve>& curve_data)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Since you move from this, please use &&. (and std::move on the caller side).

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks. Changed

@@ -32,6 +32,7 @@ std::unique_ptr<CapillaryPressureSaturation> createCapillaryPressureModel(
BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
BaseLib::ConfigTree::onwarning);
auto const& sub_config = conf.getConfigSubtree("capillary_pressure");
sub_config.ignoreConfigAttribute("id");
Copy link
Member

Choose a reason for hiding this comment

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

Why the ignore? If for later extensions, please add a todo comment.

Copy link
Member Author

Choose a reason for hiding this comment

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

Added by a mistake during the rebasing. Removed,

@wenqing
Copy link
Member Author

wenqing commented Nov 28, 2016

Any further comments?

@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