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.

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

Save and Restore ICD Scaling Factor for SICDs Too #3978

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Save and Restore ICD Scaling Factor for SICDs Too #3978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a211a39
Fix Unit Conversion Factor
bska Mar 8, 2024
3a6d3fb
Varnish Segment Implementation
bska Mar 8, 2024
8571440
Add RstSegment Constructors for Devices
bska Mar 8, 2024
410a439
Switch to Using Type Specific Device Constructors
bska Mar 8, 2024
85f23e6
Uncouple Restart Segments from Segment Type
bska Mar 8, 2024
66a5922
Load AICD Exponents From Restart File
bska Mar 8, 2024
8e13a3a
Save and Restart ICD Scaling Factor for SICDs Too
bska Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
109 changes: 69 additions & 40 deletions opm/input/eclipse/Schedule/MSW/AICD.cpp
View file
Open in desktop
Expand Up @@ -17,20 +17,30 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/


#include <opm/input/eclipse/Schedule/MSW/AICD.hpp>
#include <opm/input/eclipse/Parser/ParserKeywords/W.hpp>

#include <opm/io/eclipse/rst/segment.hpp>

#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
#include <opm/input/eclipse/Deck/DeckRecord.hpp>

#include <opm/input/eclipse/Parser/ParserKeywords/W.hpp>

#include "FromWSEG.hpp"

#include <map>
#include <string>
#include <utility>
#include <vector>

namespace Opm {

AutoICD AutoICD::serializationTestObject() {
AutoICD AutoICD::serializationTestObject()
{
AutoICD aicd;

static_cast<SICD&>(aicd) = SICD::serializationTestObject();

aicd.m_flow_rate_exponent = 1.0;
aicd.m_visc_exponent = 2.0;
aicd.m_oil_density_exponent = 3.0;
Expand All @@ -39,78 +49,97 @@ AutoICD AutoICD::serializationTestObject() {
aicd.m_oil_viscosity_exponent = 6.0;
aicd.m_water_viscosity_exponent = 7.0;
aicd.m_gas_viscosity_exponent = 8.0;

return aicd;
}

using AICD = ParserKeywords::WSEGAICD;
AutoICD::AutoICD(const DeckRecord& record) :
SICD(record),
m_flow_rate_exponent(record.getItem<AICD::FLOW_RATE_EXPONENT>().get<double>(0)),
m_visc_exponent(record.getItem<AICD::VISC_EXPONENT>().get<double>(0)),
m_oil_density_exponent(record.getItem<AICD::OIL_FLOW_FRACTION>().get<double>(0)),
m_water_density_exponent(record.getItem<AICD::WATER_FLOW_FRACTION>().get<double>(0)),
m_gas_density_exponent(record.getItem<AICD::GAS_FLOW_FRACTION>().get<double>(0)),
m_oil_viscosity_exponent(record.getItem<AICD::OIL_VISC_FRACTION>().get<double>(0)),
m_water_viscosity_exponent(record.getItem<AICD::WATER_VISC_FRACTION>().get<double>(0)),
m_gas_viscosity_exponent(record.getItem<AICD::GAS_VISC_FRACTION>().get<double>(0))
{

}

AutoICD::AutoICD(const DeckRecord& record)
: SICD { record }
, m_flow_rate_exponent (record.getItem<AICD::FLOW_RATE_EXPONENT>().get<double>(0))
, m_visc_exponent (record.getItem<AICD::VISC_EXPONENT>().get<double>(0))
, m_oil_density_exponent (record.getItem<AICD::OIL_FLOW_FRACTION>().get<double>(0))
, m_water_density_exponent (record.getItem<AICD::WATER_FLOW_FRACTION>().get<double>(0))
, m_gas_density_exponent (record.getItem<AICD::GAS_FLOW_FRACTION>().get<double>(0))
, m_oil_viscosity_exponent (record.getItem<AICD::OIL_VISC_FRACTION>().get<double>(0))
, m_water_viscosity_exponent(record.getItem<AICD::WATER_VISC_FRACTION>().get<double>(0))
, m_gas_viscosity_exponent (record.getItem<AICD::GAS_VISC_FRACTION>().get<double>(0))
{}

AutoICD::AutoICD(const RestartIO::RstSegment& rstSegment)
: SICD { rstSegment }
, m_flow_rate_exponent (rstSegment.aicd_flowrate_exponent)
, m_visc_exponent (rstSegment.aicd_viscosity_exponent)
, m_oil_density_exponent (rstSegment.aicd_oil_dens_exponent)
, m_water_density_exponent (rstSegment.aicd_wat_dens_exponent)
, m_gas_density_exponent (rstSegment.aicd_gas_dens_exponent)
, m_oil_viscosity_exponent (rstSegment.aicd_oil_visc_exponent)
, m_water_viscosity_exponent(rstSegment.aicd_wat_visc_exponent)
, m_gas_viscosity_exponent (rstSegment.aicd_gas_visc_exponent)
{}

// the function will return a map
// [
// "WELL1" : [<seg1, aicd1>, <seg2, aicd2> ...]
// ....
std::map<std::string, std::vector<std::pair<int, AutoICD> > >
AutoICD::fromWSEGAICD(const DeckKeyword& wsegaicd) {
std::map<std::string, std::vector<std::pair<int, AutoICD>>>
AutoICD::fromWSEGAICD(const DeckKeyword& wsegaicd)
{
return fromWSEG<AutoICD>(wsegaicd);
}


bool AutoICD::operator==(const AutoICD& other) const {
return SICD::operator==(other) &&
this->m_flow_rate_exponent == other.m_flow_rate_exponent &&
this->m_visc_exponent == other.m_visc_exponent &&
this->m_oil_density_exponent == other.m_oil_density_exponent &&
this->m_water_density_exponent == other.m_water_density_exponent &&
this->m_gas_density_exponent == other.m_gas_density_exponent &&
this->m_oil_viscosity_exponent == other.m_oil_viscosity_exponent &&
this->m_water_viscosity_exponent == other.m_water_viscosity_exponent &&
this->m_gas_viscosity_exponent == other.m_gas_viscosity_exponent;
bool AutoICD::operator==(const AutoICD& other) const
{
return SICD::operator==(other)
&& (this->m_flow_rate_exponent == other.m_flow_rate_exponent)
&& (this->m_visc_exponent == other.m_visc_exponent)
&& (this->m_oil_density_exponent == other.m_oil_density_exponent)
&& (this->m_water_density_exponent == other.m_water_density_exponent)
&& (this->m_gas_density_exponent == other.m_gas_density_exponent)
&& (this->m_oil_viscosity_exponent == other.m_oil_viscosity_exponent)
&& (this->m_water_viscosity_exponent == other.m_water_viscosity_exponent)
&& (this->m_gas_viscosity_exponent == other.m_gas_viscosity_exponent)
;
}

double AutoICD::flowRateExponent() const {
double AutoICD::flowRateExponent() const
{
return this->m_flow_rate_exponent;
}

double AutoICD::viscExponent() const {
double AutoICD::viscExponent() const
{
return this->m_visc_exponent;
}

double AutoICD::oilDensityExponent() const {
double AutoICD::oilDensityExponent() const
{
return this->m_oil_density_exponent;
}

double AutoICD::waterDensityExponent() const {
double AutoICD::waterDensityExponent() const
{
return this->m_water_density_exponent;
}

double AutoICD::gasDensityExponent() const {
double AutoICD::gasDensityExponent() const
{
return this->m_gas_density_exponent;
}

double AutoICD::oilViscExponent() const {
double AutoICD::oilViscExponent() const
{
return this->m_oil_viscosity_exponent;
}

double AutoICD::waterViscExponent() const {
double AutoICD::waterViscExponent() const
{
return this->m_water_viscosity_exponent;
}

double AutoICD::gasViscExponent() const {
double AutoICD::gasViscExponent() const
{
return this->m_gas_viscosity_exponent;
}


}
} // namespace Opm
40 changes: 25 additions & 15 deletions opm/input/eclipse/Schedule/MSW/AICD.hpp
View file
Open in desktop
Expand Up @@ -20,30 +20,40 @@
#ifndef AICD_HPP_HEADER_INCLUDED
#define AICD_HPP_HEADER_INCLUDED

#include <opm/input/eclipse/Schedule/MSW/SICD.hpp>

#include <map>
#include <string>
#include <utility>
#include <vector>
#include <string>

#include <opm/input/eclipse/Schedule/MSW/SICD.hpp>

namespace Opm {

class DeckRecord;
class DeckKeyword;

class AutoICD : public SICD {
} // namespace Opm

namespace Opm { namespace RestartIO {
struct RstSegment;
}} // namespace Opm::RestartIO

namespace Opm {

class AutoICD : public SICD
{
public:
AutoICD() = default;
explicit AutoICD(const DeckRecord& record);
explicit AutoICD(const RestartIO::RstSegment& rstSegment);

static AutoICD serializationTestObject();

// the function will return a map
// [
// "WELL1" : [<seg1, aicd1>, <seg2, aicd2> ...]
// ....
static std::map<std::string, std::vector<std::pair<int, AutoICD> > >
static std::map<std::string, std::vector<std::pair<int, AutoICD>>>
fromWSEGAICD(const DeckKeyword& wsegaicd);

bool operator==(const AutoICD& data) const;
Expand Down Expand Up @@ -72,15 +82,15 @@ namespace Opm {
double gasViscExponent() const;

private:
double m_flow_rate_exponent;
double m_visc_exponent;
double m_oil_density_exponent;
double m_water_density_exponent;
double m_gas_density_exponent;
double m_oil_viscosity_exponent;
double m_water_viscosity_exponent;
double m_gas_viscosity_exponent;
double m_flow_rate_exponent {};
double m_visc_exponent {};
double m_oil_density_exponent {};
double m_water_density_exponent {};
double m_gas_density_exponent {};
double m_oil_viscosity_exponent {};
double m_water_viscosity_exponent {};
double m_gas_viscosity_exponent {};
};
}
} // namespace Opm

#endif
#endif // AICD_HPP_HEADER_INCLUDED