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

moveLogCall&ProtectField

Browse Source
This commit is contained in:
goncalvesmachadoc 2021-12-01 16:13:53 +01:00
parent 52d096c46a
commit 8b001e2e75
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ebos/eclgenericoutputblackoilmodule.cc
View File

@ -128,14 +128,14 @@ outputCumLog(size_t reportStepNum, const bool substep, bool forceDisableCumOutpu
tmp_names[0] = gname;
if (tmp_names[0] == "FIELD"){
tmp_values[2] = st.get("FOPT"); //WellCumDataType::OilProd
tmp_values[3] = st.get("FWPT"); //WellCumDataType::WaterProd
tmp_values[4] = st.get("FGPT"); //WellCumDataType::GasProd
tmp_values[5] = st.get("FVPT");//WellCumDataType::FluidResVolProd
tmp_values[6] = st.get("FOIT"); //WellCumDataType::OilInj
tmp_values[7] = st.get("FWIT"); //WellCumDataType::WaterInj
tmp_values[8] = st.get("FGIT"); //WellCumDataType::GasInj
tmp_values[9] = st.get("FVIT");//WellCumDataType::FluidResVolInj
tmp_values[2] = st.get("FOPT", 0.0); //WellCumDataType::OilProd
tmp_values[3] = st.get("FWPT", 0.0); //WellCumDataType::WaterProd
tmp_values[4] = st.get("FGPT", 0.0); //WellCumDataType::GasProd
tmp_values[5] = st.get("FVPT", 0.0);//WellCumDataType::FluidResVolProd
tmp_values[6] = st.get("FOIT", 0.0); //WellCumDataType::OilInj
tmp_values[7] = st.get("FWIT", 0.0); //WellCumDataType::WaterInj
tmp_values[8] = st.get("FGIT", 0.0); //WellCumDataType::GasInj
tmp_values[9] = st.get("FVIT", 0.0);//WellCumDataType::FluidResVolInj
}
else {
tmp_values[2] = get("GOPT"); //WellCumDataType::OilProd
@ -292,12 +292,12 @@ outputProdLog(size_t reportStepNum,
tmp_names[0] = gname;
if (tmp_names[0] == "FIELD"){
tmp_values[2] = st.get("FOPR"); //WellProdDataType::OilRate
tmp_values[3] = st.get("FWPR"); //WellProdDataType::WaterRate
tmp_values[4] = st.get("FGPR"); //WellProdDataType::GasRate
tmp_values[5] = st.get("FVPR"); //WellProdDataType::FluidResVol
tmp_values[6] = st.get("FWCT"); //WellProdDataType::WaterCut
tmp_values[7] = st.get("FGOR"); //WellProdDataType::GasOilRatio
tmp_values[2] = st.get("FOPR", 0.0); //WellProdDataType::OilRate
tmp_values[3] = st.get("FWPR", 0.0); //WellProdDataType::WaterRate
tmp_values[4] = st.get("FGPR", 0.0); //WellProdDataType::GasRate
tmp_values[5] = st.get("FVPR", 0.0); //WellProdDataType::FluidResVol
tmp_values[6] = st.get("FWCT", 0.0); //WellProdDataType::WaterCut
tmp_values[7] = st.get("FGOR", 0.0); //WellProdDataType::GasOilRatio
} else {
tmp_values[2] = get("GOPR"); //WellProdDataType::OilRate
tmp_values[3] = get("GWPR"); //WellProdDataType::WaterRate
@ -409,10 +409,10 @@ outputInjLog(size_t reportStepNum, const bool substep, bool forceDisableInjOutpu
tmp_names[0] = gname;
if (tmp_names[0] == "FIELD"){
tmp_values[2] = st.get("FOIR");//WellInjDataType::OilRate
tmp_values[3] = st.get("FWIR"); //WellInjDataType::WaterRate
tmp_values[4] = st.get("FGIR"); //WellInjDataType::GasRate
tmp_values[5] = st.get("FVIR");//WellInjDataType::FluidResVol
tmp_values[2] = st.get("FOIR", 0.0);//WellInjDataType::OilRate
tmp_values[3] = st.get("FWIR", 0.0); //WellInjDataType::WaterRate
tmp_values[4] = st.get("FGIR", 0.0); //WellInjDataType::GasRate
tmp_values[5] = st.get("FVIR", 0.0);//WellInjDataType::FluidResVol
}
else {
tmp_values[2] = get("GOIR");//WellInjDataType::OilRate

7
ebos/eclwriter.hh
View File

@ -203,9 +203,6 @@ public:
bool forceDisableProdOutput = false;
bool forceDisableInjOutput = false;
bool forceDisableCumOutput = false;
eclOutputModule_->outputProdLog(reportStepNum, isSubStep, forceDisableProdOutput);
eclOutputModule_->outputInjLog(reportStepNum, isSubStep, forceDisableInjOutput);
eclOutputModule_->outputCumLog(reportStepNum, isSubStep, forceDisableCumOutput);
// Add TCPU
if (totalCpuTime != 0.0) {
@ -226,6 +223,10 @@ public:
summaryState(), udqState(),
inplace,
eclOutputModule_->initialInplace());
eclOutputModule_->outputProdLog(reportStepNum, isSubStep, forceDisableProdOutput);
eclOutputModule_->outputInjLog(reportStepNum, isSubStep, forceDisableInjOutput);
eclOutputModule_->outputCumLog(reportStepNum, isSubStep, forceDisableCumOutput);
}
void writeOutput(bool isSubStep)