-
Notifications
You must be signed in to change notification settings - Fork 112
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 support for GSATPROD in the input/output code #4188
Open
totto82
wants to merge
1
commit into
OPM:master
Choose a base branch
from
totto82:gsatprod
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
Copyright 2019 Equinor ASA. | ||
|
||
This file is part of the Open Porous Media project (OPM). | ||
|
||
OPM is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
|
||
OPM is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
|
||
You should have received a copy of the GNU General Public License | ||
along with OPM. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#include <opm/input/eclipse/Schedule/Group/GSatProd.hpp> | ||
#include <stdexcept> | ||
|
||
namespace Opm { | ||
|
||
GSatProd GSatProd::serializationTestObject() | ||
{ | ||
GSatProd result; | ||
result.groups = { {"test1", {1.0,2.0,3.0,4.0,5.0} } }; | ||
|
||
return result; | ||
} | ||
|
||
bool GSatProd::has(const std::string& name) const { | ||
return (groups.find(name) != groups.end()); | ||
} | ||
|
||
|
||
const GSatProd::GSatProdGroup& GSatProd::get(const std::string& name) const { | ||
|
||
auto it = groups.find(name); | ||
if (it == groups.end()) | ||
throw std::invalid_argument("Current GSatPRod obj. does not contain '" + name + "'."); | ||
else | ||
return it->second; | ||
} | ||
|
||
void GSatProd::add(const std::string& name, const double& oil_rate, | ||
const double& gas_rate, const double& water_rate, | ||
const double& resv_rate, const double& glift_rate) { | ||
|
||
GSatProd::GSatProdGroup& group = groups[name]; | ||
|
||
group.oil_rate = oil_rate; | ||
group.gas_rate = gas_rate; | ||
group.water_rate = water_rate; | ||
group.resv_rate = resv_rate; | ||
group.glift_rate = glift_rate; | ||
} | ||
|
||
|
||
size_t GSatProd::size() const { | ||
return groups.size(); | ||
} | ||
|
||
bool GSatProd::operator==(const GSatProd& data) const { | ||
return this->groups == data.groups; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
/* | ||
Copyright 2024 Equinor ASA. | ||
|
||
This file is part of the Open Porous Media project (OPM). | ||
|
||
OPM is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
|
||
OPM is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
|
||
You should have received a copy of the GNU General Public License | ||
along with OPM. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#ifndef GSATPROD_H | ||
#define GSATPROD_H | ||
|
||
#include <map> | ||
#include <string> | ||
|
||
namespace Opm { | ||
|
||
class SummaryState; | ||
|
||
class GSatProd { | ||
public: | ||
struct GSatProdGroup { | ||
double oil_rate; | ||
double gas_rate; | ||
double water_rate; | ||
double resv_rate; | ||
double glift_rate; | ||
|
||
bool operator==(const GSatProdGroup& data) const { | ||
return oil_rate == data.oil_rate && | ||
gas_rate == data.gas_rate && | ||
water_rate == data.water_rate && | ||
resv_rate == data.resv_rate && | ||
glift_rate == data.glift_rate; | ||
} | ||
|
||
template<class Serializer> | ||
void serializeOp(Serializer& serializer) | ||
{ | ||
serializer(oil_rate); | ||
serializer(gas_rate); | ||
serializer(water_rate); | ||
serializer(resv_rate); | ||
serializer(glift_rate); | ||
} | ||
}; | ||
|
||
static GSatProd serializationTestObject(); | ||
|
||
bool has(const std::string& name) const; | ||
const GSatProdGroup& get(const std::string& name) const; | ||
void add(const std::string& name, const double& oil_rate, | ||
const double& gas_rate, const double& water_rate, | ||
const double& resv_rate, const double& glift_rate); | ||
size_t size() const; | ||
|
||
bool operator==(const GSatProd& data) const; | ||
|
||
template<class Serializer> | ||
void serializeOp(Serializer& serializer) | ||
{ | ||
serializer(groups); | ||
} | ||
|
||
private: | ||
std::map<std::string, GSatProdGroup> groups; | ||
}; | ||
|
||
} | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
@bska Could this have any unintended effects? I need to accumulate the satalite production to the "F" output.