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

Fix slow code

Browse Source 
Avoid checking summaryConfig at every cell
Add temporary fix around issue with RPTSCHED in restartConfig
This commit is contained in:
Tor Harald Sandve 2018-01-23 09:46:56 +01:00
parent 5fa7b130dc
commit eca5d8aff5
3 changed files with 104 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ebos/collecttoiorank.hh
View File

@ -501,6 +501,20 @@ namespace Ewoms
return globalRanks_; return globalRanks_;
} }
bool isGlobalIdxOnThisRank(const unsigned globalIdx) const
{
if ( ! isParallel() )
{
return true;
}
// the last indexMap is the local one
const IndexMapType& indexMap = indexMaps_.back();
if( indexMap.empty() )
OPM_THROW(std::logic_error,"index map is not created on this rank");
return std::find(indexMap.begin(), indexMap.end(), globalIdx) != indexMap.end();
}
protected: protected:
P2PCommunicatorType toIORankComm_; P2PCommunicatorType toIORankComm_;
IndexMapType globalCartesianIndex_; IndexMapType globalCartesianIndex_;

138
ebos/ecloutputblackoilmodule.hh
View File

@ -105,13 +105,15 @@ public:
: simulator_(simulator) : simulator_(simulator)
{ {
createLocalFipnum_(); createLocalFipnum_();
firstStep_ = true;
} }
/*! /*!
* \brief Allocate memory for the scalar fields we would like to * \brief Allocate memory for the scalar fields we would like to
* write to ECL output files * write to ECL output files
*/ */
void allocBuffers(unsigned bufferSize, unsigned reportStepNum, const Opm::RestartConfig& restartConfig, const bool substep, const bool log) template<class CollectDataToIORankType>
void allocBuffers(unsigned bufferSize, unsigned reportStepNum, const bool substep, const bool log, const CollectDataToIORankType& collectToIORank)
{ {
if (!std::is_same<Discretization, Ewoms::EcfvDiscretization<TypeTag> >::value) if (!std::is_same<Discretization, Ewoms::EcfvDiscretization<TypeTag> >::value)
@ -119,15 +121,30 @@ public:
// Summary output is for all steps // Summary output is for all steps
const Opm::SummaryConfig summaryConfig = simulator_.gridManager().summaryConfig(); const Opm::SummaryConfig summaryConfig = simulator_.gridManager().summaryConfig();
blockValues_.clear();
// block values
if (firstStep_) { // SummaryConfig doesn't change.
for( const auto& node : summaryConfig ) {
if (node.type() == ECL_SMSPEC_BLOCK_VAR) {
if(collectToIORank.isGlobalIdxOnThisRank(node.num() - 1)) {
std::pair<std::string, int> key = std::make_pair(node.keyword(), node.num());
blockValues_[key] = 0.0;
}
}
}
firstStep_ = false;
}
// Only output RESTART_AUXILIARY asked for by the user. // Only output RESTART_AUXILIARY asked for by the user.
const Opm::RestartConfig& restartConfig = simulator_.gridManager().eclState().getRestartConfig();
std::map<std::string, int> rstKeywords = restartConfig.getRestartKeywords(reportStepNum); std::map<std::string, int> rstKeywords = restartConfig.getRestartKeywords(reportStepNum);
for (auto& keyValue : rstKeywords) { for (auto& keyValue : rstKeywords) {
keyValue.second = restartConfig.getKeyword(keyValue.first, reportStepNum); keyValue.second = restartConfig.getKeyword(keyValue.first, reportStepNum);
} }
outputFipRestart_ = false; outputFipRestart_ = false;
computeFip_ = false;
// Fluid in place // Fluid in place
for (int i = 0; i<FIPDataType::numFipValues; i++) { for (int i = 0; i<FIPDataType::numFipValues; i++) {
if (!substep || summaryConfig.require3DField(stringOfEnumIndex_(i))) { if (!substep || summaryConfig.require3DField(stringOfEnumIndex_(i))) {
@ -136,6 +153,9 @@ public:
outputFipRestart_ = true; outputFipRestart_ = true;
} }
fip_[i].resize(bufferSize, 0.0); fip_[i].resize(bufferSize, 0.0);
computeFip_ = true;
} else {
fip_[i].clear();
} }
} }
if (!substep || summaryConfig.hasKeyword("FPR") || summaryConfig.hasKeyword("FPRP") || summaryConfig.hasKeyword("RPR")) { if (!substep || summaryConfig.hasKeyword("FPR") || summaryConfig.hasKeyword("FPRP") || summaryConfig.hasKeyword("RPR")) {
@ -143,11 +163,17 @@ public:
pvHydrocarbon_.resize(bufferSize, 0.0); pvHydrocarbon_.resize(bufferSize, 0.0);
pPv_.resize(bufferSize, 0.0); pPv_.resize(bufferSize, 0.0);
pPvHydrocarbon_.resize(bufferSize, 0.0); pPvHydrocarbon_.resize(bufferSize, 0.0);
} else {
pvHydrocarbon_.clear();
pPv_.clear();
pPvHydrocarbon_.clear();
} }
// TODO: There seems to be an issue with mixing of RPTRST and RPTSCHED
// keywords in restartConfig.
// For now output basic fields for all ordinary steps
outputRestart_ = false; outputRestart_ = false;
// Only provide restart on restart steps if (substep)
if (!restartConfig.getWriteRestartFile(reportStepNum) || substep)
return; return;
outputRestart_ = true; outputRestart_ = true;
@ -189,6 +215,10 @@ public:
krnSwMdcGo_.resize(bufferSize,0.0); krnSwMdcGo_.resize(bufferSize,0.0);
} }
// Only provide restart on restart steps
if (!restartConfig.getWriteRestartFile(reportStepNum) || substep)
return;
if (FluidSystem::enableDissolvedGas() && rstKeywords["RSSAT"] > 0) { if (FluidSystem::enableDissolvedGas() && rstKeywords["RSSAT"] > 0) {
rstKeywords["RSSAT"] = 0; rstKeywords["RSSAT"] = 0;
gasDissolutionFactor_.resize(bufferSize,0.0); gasDissolutionFactor_.resize(bufferSize,0.0);
@ -293,12 +323,12 @@ public:
*/ */
void processElement(const ElementContext& elemCtx) void processElement(const ElementContext& elemCtx)
{ {
typedef Opm::MathToolbox<Evaluation> Toolbox; typedef Opm::MathToolbox<Evaluation> Toolbox;
if (!std::is_same<Discretization, Ewoms::EcfvDiscretization<TypeTag> >::value) if (!std::is_same<Discretization, Ewoms::EcfvDiscretization<TypeTag> >::value)
return; return;
const Opm::SummaryConfig& summaryConfig = simulator_.gridManager().summaryConfig();
for (unsigned dofIdx = 0; dofIdx < elemCtx.numPrimaryDof(/*timeIdx=*/0); ++dofIdx) { for (unsigned dofIdx = 0; dofIdx < elemCtx.numPrimaryDof(/*timeIdx=*/0); ++dofIdx) {
const auto& intQuants = elemCtx.intensiveQuantities(dofIdx, /*timeIdx=*/0); const auto& intQuants = elemCtx.intensiveQuantities(dofIdx, /*timeIdx=*/0);
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
@ -521,61 +551,67 @@ public:
} }
} }
Scalar fip[FluidSystem::numPhases]; if (computeFip_) {
for (unsigned phase = 0; phase < FluidSystem::numPhases; ++phase) { Scalar fip[FluidSystem::numPhases];
if (!FluidSystem::phaseIsActive(phase)) { for (unsigned phase = 0; phase < FluidSystem::numPhases; ++phase) {
continue; if (!FluidSystem::phaseIsActive(phase)) {
continue;
}
const double b = Toolbox::value(fs.invB(phase));
const double s = Toolbox::value(fs.saturation(phase));
fip[phase] = b * s * pv;
} }
const double b = Toolbox::value(fs.invB(phase)); if (FluidSystem::phaseIsActive(oilPhaseIdx) && fip_[FIPDataType::OilInPlace].size() > 0)
const double s = Toolbox::value(fs.saturation(phase)); fip_[FIPDataType::OilInPlace][globalDofIdx] = fip[oilPhaseIdx];
fip[phase] = b * s * pv; if (FluidSystem::phaseIsActive(gasPhaseIdx) && fip_[FIPDataType::GasInPlace].size() > 0)
} fip_[FIPDataType::GasInPlace][globalDofIdx] = fip[gasPhaseIdx];
if (FluidSystem::phaseIsActive(waterPhaseIdx) && fip_[FIPDataType::WaterInPlace].size() > 0)
fip_[FIPDataType::WaterInPlace][globalDofIdx] = fip[waterPhaseIdx];
if (FluidSystem::phaseIsActive(oilPhaseIdx) && fip_[FIPDataType::OilInPlace].size() > 0) // Store the pure oil and gas FIP
fip_[FIPDataType::OilInPlace][globalDofIdx] = fip[oilPhaseIdx]; if (FluidSystem::phaseIsActive(oilPhaseIdx) && fip_[FIPDataType::OilInPlaceInLiquidPhase].size() > 0)
if (FluidSystem::phaseIsActive(gasPhaseIdx) && fip_[FIPDataType::GasInPlace].size() > 0) fip_[FIPDataType::OilInPlaceInLiquidPhase][globalDofIdx] = fip[oilPhaseIdx];
fip_[FIPDataType::GasInPlace][globalDofIdx] = fip[gasPhaseIdx];
if (FluidSystem::phaseIsActive(waterPhaseIdx) && fip_[FIPDataType::WaterInPlace].size() > 0)
fip_[FIPDataType::WaterInPlace][globalDofIdx] = fip[waterPhaseIdx];
// Store the pure oil and gas FIP if (FluidSystem::phaseIsActive(gasPhaseIdx) && fip_[FIPDataType::GasInPlaceInGasPhase].size() > 0)
if (FluidSystem::phaseIsActive(oilPhaseIdx) && fip_[FIPDataType::OilInPlaceInLiquidPhase].size() > 0) fip_[FIPDataType::GasInPlaceInGasPhase][globalDofIdx] = fip[gasPhaseIdx];
fip_[FIPDataType::OilInPlaceInLiquidPhase][globalDofIdx] = fip[oilPhaseIdx];
if (FluidSystem::phaseIsActive(gasPhaseIdx) && fip_[FIPDataType::GasInPlaceInGasPhase].size() > 0) if (FluidSystem::phaseIsActive(oilPhaseIdx) && FluidSystem::phaseIsActive(gasPhaseIdx)) {
fip_[FIPDataType::GasInPlaceInGasPhase][globalDofIdx] = fip[gasPhaseIdx]; // Gas dissolved in oil and vaporized oil
Scalar gipl = Toolbox::value(fs.Rs()) * fip[oilPhaseIdx];
Scalar oipg = Toolbox::value(fs.Rv()) * fip[gasPhaseIdx];
if (fip_[FIPDataType::GasInPlaceInGasPhase].size() > 0)
fip_[FIPDataType::GasInPlaceInLiquidPhase][globalDofIdx] = gipl;
if (fip_[FIPDataType::OilInPlaceInGasPhase].size() > 0)
fip_[FIPDataType::OilInPlaceInGasPhase][globalDofIdx] = oipg;
if (FluidSystem::phaseIsActive(oilPhaseIdx) && FluidSystem::phaseIsActive(gasPhaseIdx)) { // Add dissolved gas and vaporized oil to total FIP
// Gas dissolved in oil and vaporized oil if (fip_[FIPDataType::OilInPlace].size() > 0)
Scalar gipl = Toolbox::value(fs.Rs()) * fip[oilPhaseIdx]; fip_[FIPDataType::OilInPlace][globalDofIdx] += oipg;
Scalar oipg = Toolbox::value(fs.Rv()) * fip[gasPhaseIdx]; if (fip_[FIPDataType::GasInPlace].size() > 0)
if (fip_[FIPDataType::GasInPlaceInGasPhase].size() > 0) fip_[FIPDataType::GasInPlace][globalDofIdx] += gipl;
fip_[FIPDataType::GasInPlaceInLiquidPhase][globalDofIdx] = gipl; }
if (fip_[FIPDataType::OilInPlaceInGasPhase].size() > 0)
fip_[FIPDataType::OilInPlaceInGasPhase][globalDofIdx] = oipg;
// Add dissolved gas and vaporized oil to total FIP
if (fip_[FIPDataType::OilInPlace].size() > 0)
fip_[FIPDataType::OilInPlace][globalDofIdx] += oipg;
if (fip_[FIPDataType::GasInPlace].size() > 0)
fip_[FIPDataType::GasInPlace][globalDofIdx] += gipl;
} }
// Adding block values // Adding block values
const auto globalIdx = elemCtx.simulator().gridManager().grid().globalCell()[globalDofIdx]; const auto globalIdx = elemCtx.simulator().gridManager().grid().globalCell()[globalDofIdx];
for( const auto& node : summaryConfig ) { for( auto& val : blockValues_ ) {
if (node.type() == ECL_SMSPEC_BLOCK_VAR) { const auto& key = val.first;
int global_index = node.num() - 1; int global_index = key.second - 1;
std::pair<std::string, int> key = std::make_pair(node.keyword(), node.num()); if (global_index == globalIdx) {
if (global_index == globalIdx) { if (key.first == "BWSAT") {
if (key.first == "BWSAT") { val.second = Toolbox::value(fs.saturation(waterPhaseIdx));
blockValues_[key] = Toolbox::value(fs.saturation(waterPhaseIdx)); } else if (key.first == "BGSAT") {
} else if (key.first == "BGSAT") { val.second = Toolbox::value(fs.saturation(gasPhaseIdx));
blockValues_[key] = Toolbox::value(fs.saturation(gasPhaseIdx)); } else if (key.first == "BPR") {
} else if (key.first == "BPR") { std::cout << "BPR set "<<Toolbox::value(fs.pressure(oilPhaseIdx)) << std::endl;
blockValues_[key] = Toolbox::value(fs.pressure(oilPhaseIdx)); val.second = Toolbox::value(fs.pressure(oilPhaseIdx));
} } else {
std::string logstring = "Keyword '";
logstring.append(key.first);
logstring.append("' is unhandled for output to file.");
Opm::OpmLog::warning("Unhandled output keyword", logstring);
} }
} }
} }
@ -1182,6 +1218,8 @@ private:
bool outputRestart_; bool outputRestart_;
bool outputFipRestart_; bool outputFipRestart_;
bool firstStep_;
bool computeFip_;
ScalarBuffer saturation_[numPhases]; ScalarBuffer saturation_[numPhases];
ScalarBuffer oilPressure_; ScalarBuffer oilPressure_;

4
ebos/eclwriter.hh
View File

@ -140,7 +140,7 @@ public:
const auto& gridView = simulator_.gridManager().gridView(); const auto& gridView = simulator_.gridManager().gridView();
int numElements = gridView.size(/*codim=*/0); int numElements = gridView.size(/*codim=*/0);
bool log = collectToIORank_.isIORank(); bool log = collectToIORank_.isIORank();
eclOutputModule_.allocBuffers(numElements, episodeIdx, simulator_.gridManager().eclState().getRestartConfig(), substep, log); eclOutputModule_.allocBuffers(numElements, episodeIdx, substep, log, collectToIORank_);
ElementContext elemCtx(simulator_); ElementContext elemCtx(simulator_);
ElementIterator elemIt = gridView.template begin</*codim=*/0>(); ElementIterator elemIt = gridView.template begin</*codim=*/0>();
@ -218,7 +218,7 @@ public:
unsigned episodeIdx = simulator_.episodeIndex(); unsigned episodeIdx = simulator_.episodeIndex();
const auto& gridView = simulator_.gridManager().gridView(); const auto& gridView = simulator_.gridManager().gridView();
unsigned numElements = gridView.size(/*codim=*/0); unsigned numElements = gridView.size(/*codim=*/0);
eclOutputModule_.allocBuffers(numElements, episodeIdx, simulator_.gridManager().eclState().getRestartConfig(), false, false); eclOutputModule_.allocBuffers(numElements, episodeIdx, false, false, collectToIORank_);
auto restart_values = eclIO_->loadRestart(solution_keys, extra_keys); auto restart_values = eclIO_->loadRestart(solution_keys, extra_keys);
for (unsigned elemIdx = 0; elemIdx < numElements; ++elemIdx) { for (unsigned elemIdx = 0; elemIdx < numElements; ++elemIdx) {