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

Merge pull request #2452 from blattms/use-region-temperature-cleaned

Browse Source 
Use correct region temperature when calculating RS/RV
This commit is contained in:
Bård Skaflestad
2020-04-02 15:08:53 +02:00
committed by GitHub
parent e8145656de fed22e5189
commit 74368c5f98
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compareECLFiles.cmake
View File

@@ -535,8 +535,8 @@ if(MPI_FOUND)
add_test_compare_parallel_simulation(CASENAME spe1_thermal
FILENAME SPE1CASE2_THERMAL
SIMULATOR flow
ABS_TOL ${abs_tol_parallel}
REL_TOL 1e-1
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR spe1
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8)

20
ebos/equil/initstateequil.hh
View File

@@ -1070,7 +1070,7 @@ private:
void updateInitialTemperature_(const Opm::EclipseState& eclState)
{
// Get the initial temperature data
std::vector<double> tempiData = eclState.fieldProps().get_global_double("TEMPI");
std::vector<double> tempiData = eclState.fieldProps().get_double("TEMPI");
temperature_ = tempiData;
}
@@ -1137,8 +1137,10 @@ private:
if (oil && gas) {
const int oilpos = FluidSystem::oilPhaseIdx;
const int gaspos = FluidSystem::gasPhaseIdx;
const Vec rsVals = computeRs(grid, cells, pressures[oilpos], temperature_, *(rsFunc_[r]), sat[gaspos]);
const Vec rvVals = computeRs(grid, cells, pressures[gaspos], temperature_, *(rvFunc_[r]), sat[oilpos]);
std::vector<double> regionTemperature(cells.size());
copyToRegion(temperature_, cells, regionTemperature);
const Vec rsVals = computeRs(grid, cells, pressures[oilpos], regionTemperature, *(rsFunc_[r]), sat[gaspos]);
const Vec rvVals = computeRs(grid, cells, pressures[gaspos], regionTemperature, *(rvFunc_[r]), sat[oilpos]);
copyFromRegion(rsVals, cells, rs_);
copyFromRegion(rvVals, cells, rv_);
}
@@ -1158,6 +1160,18 @@ private:
}
}
template <class CellRangeType>
void copyToRegion(const Vec& source,
const CellRangeType& cells,
Vec& destination)
{
auto d = destination.begin();
auto c = cells.begin();
const auto e = cells.end();
for (; c != e; ++c, ++d) {
*d = source[*c];
}
}
};
} // namespace DeckDependent
} // namespace EQUIL