OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

FlowGenericProblem: convert data to appropriate Scalar type

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-04-12 17:06:27 +02:00
parent ae38896b1c
commit 6ad616bd98
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
opm/simulators/flow/FlowGenericProblem_impl.hpp
View File

@ -146,8 +146,10 @@ readRockParameters_(const std::vector<Scalar>& cellCenterDepths,
{ {
const auto& comp = rock_config.comp(); const auto& comp = rock_config.comp();
rockParams_.clear(); rockParams_.clear();
for (const auto& c : comp) for (const auto& c : comp) {
rockParams_.push_back( { c.pref, c.compressibility } ); rockParams_.push_back({static_cast<Scalar>(c.pref),
static_cast<Scalar>(c.compressibility)});
}
} }
// read the parameters for water-induced rock compaction // read the parameters for water-induced rock compaction
@ -495,21 +497,28 @@ readBlackoilExtentionsInitialConditions_(std::size_t numDof,
bool enablePolymerMolarWeight, bool enablePolymerMolarWeight,
bool enableMICP) bool enableMICP)
{ {
if (enableSolvent) { auto getArray = [](const std::vector<double>& input)
if (eclState_.fieldProps().has_double("SSOL")) {
solventSaturation_ = eclState_.fieldProps().get_double("SSOL"); if constexpr (std::is_same_v<Scalar,double>) {
else return input;
solventSaturation_.resize(numDof, 0.0); } else {
return std::vector<Scalar>{input.begin(), input.end()};
}
};
//if (eclState_.fieldProps().has_double("SSOL")) if (enableSolvent) {
// solventRsw_ = eclState_.fieldProps().get_double("SSOL"); if (eclState_.fieldProps().has_double("SSOL")) {
//else solventSaturation_ = getArray(eclState_.fieldProps().get_double("SSOL"));
solventRsw_.resize(numDof, 0.0); } else {
solventSaturation_.resize(numDof, 0.0);
}
solventRsw_.resize(numDof, 0.0);
} }
if (enablePolymer) { if (enablePolymer) {
if (eclState_.fieldProps().has_double("SPOLY")) { if (eclState_.fieldProps().has_double("SPOLY")) {
polymer_.concentration = eclState_.fieldProps().get_double("SPOLY"); polymer_.concentration = getArray(eclState_.fieldProps().get_double("SPOLY"));
} else { } else {
polymer_.concentration.resize(numDof, 0.0); polymer_.concentration.resize(numDof, 0.0);
} }
@ -517,7 +526,7 @@ readBlackoilExtentionsInitialConditions_(std::size_t numDof,
if (enablePolymerMolarWeight) { if (enablePolymerMolarWeight) {
if (eclState_.fieldProps().has_double("SPOLYMW")) { if (eclState_.fieldProps().has_double("SPOLYMW")) {
polymer_.moleWeight = eclState_.fieldProps().get_double("SPOLYMW"); polymer_.moleWeight = getArray(eclState_.fieldProps().get_double("SPOLYMW"));
} else { } else {
polymer_.moleWeight.resize(numDof, 0.0); polymer_.moleWeight.resize(numDof, 0.0);
} }
@ -525,27 +534,27 @@ readBlackoilExtentionsInitialConditions_(std::size_t numDof,
if (enableMICP) { if (enableMICP) {
if (eclState_.fieldProps().has_double("SMICR")) { if (eclState_.fieldProps().has_double("SMICR")) {
micp_.microbialConcentration = eclState_.fieldProps().get_double("SMICR"); micp_.microbialConcentration = getArray(eclState_.fieldProps().get_double("SMICR"));
} else { } else {
micp_.microbialConcentration.resize(numDof, 0.0); micp_.microbialConcentration.resize(numDof, 0.0);
} }
if (eclState_.fieldProps().has_double("SOXYG")) { if (eclState_.fieldProps().has_double("SOXYG")) {
micp_.oxygenConcentration = eclState_.fieldProps().get_double("SOXYG"); micp_.oxygenConcentration = getArray(eclState_.fieldProps().get_double("SOXYG"));
} else { } else {
micp_.oxygenConcentration.resize(numDof, 0.0); micp_.oxygenConcentration.resize(numDof, 0.0);
} }
if (eclState_.fieldProps().has_double("SUREA")) { if (eclState_.fieldProps().has_double("SUREA")) {
micp_.ureaConcentration = eclState_.fieldProps().get_double("SUREA"); micp_.ureaConcentration = getArray(eclState_.fieldProps().get_double("SUREA"));
} else { } else {
micp_.ureaConcentration.resize(numDof, 0.0); micp_.ureaConcentration.resize(numDof, 0.0);
} }
if (eclState_.fieldProps().has_double("SBIOF")) { if (eclState_.fieldProps().has_double("SBIOF")) {
micp_.biofilmConcentration = eclState_.fieldProps().get_double("SBIOF"); micp_.biofilmConcentration = getArray(eclState_.fieldProps().get_double("SBIOF"));
} else { } else {
micp_.biofilmConcentration.resize(numDof, 0.0); micp_.biofilmConcentration.resize(numDof, 0.0);
} }
if (eclState_.fieldProps().has_double("SCALC")) { if (eclState_.fieldProps().has_double("SCALC")) {
micp_.calciteConcentration = eclState_.fieldProps().get_double("SCALC"); micp_.calciteConcentration = getArray(eclState_.fieldProps().get_double("SCALC"));
} else { } else {
micp_.calciteConcentration.resize(numDof, 0.0); micp_.calciteConcentration.resize(numDof, 0.0);
} }