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

clean-up saltved implementation based on code review

Browse Source
This commit is contained in:
Tor Harald Sandve 2020-08-18 10:55:37 +02:00
parent 491b532a6a
commit 9d72b6ad1a
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/equil/equilibrationhelpers.hh
View File

@ -612,7 +612,7 @@ private:
*/
class EquilReg
{
using TabulatedFunction = typename Opm::Tabulated1DFunction<double>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
public:
/**

9
ebos/equil/initstateequil.hh
View File

@ -149,7 +149,7 @@ namespace PhasePressODE {
template <class FluidSystem>
class Water
{
using TabulatedFunction = typename Opm::Tabulated1DFunction<double>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
public:
Water(const double temp,
const TabulatedFunction& saltVdTable,
@ -530,7 +530,6 @@ private:
double gravity_;
int nsample_;
double temperature_{ 273.15 + 20 };
double saltConcentration_{0.0};
std::unique_ptr<OPress> oil_{};
std::unique_ptr<GPress> gas_{};
@ -1746,8 +1745,8 @@ private:
if (saltvdTables.empty()) {
std::vector<double> x = {0.0,1.0};
std::vector<double> y = {0.0,0.0};
for (size_t i = 0; i < numEquilReg; ++i) {
saltVdTable_[i].setXYContainers(x,y);
for (auto& table : this->saltVdTable_) {
table.setXYContainers(x, y);
}
} else {
for (size_t i = 0; i < saltvdTables.size(); ++i) {
@ -1765,7 +1764,7 @@ private:
std::vector< std::shared_ptr<Miscibility::RsFunction> > rsFunc_;
std::vector< std::shared_ptr<Miscibility::RsFunction> > rvFunc_;
using TabulatedFunction = typename Opm::Tabulated1DFunction<double>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<TabulatedFunction> saltVdTable_;
std::vector<int> regionPvtIdx_;
Vec temperature_;

6
tests/test_equil.cc
View File

@ -182,7 +182,7 @@ void test_PhasePressure()
using TypeTag = TTAG(TestEquilTypeTag);
using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
using TabulatedFunction = typename Opm::Tabulated1DFunction<double>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<double> x = {0.0,100.0};
std::vector<double> y = {0.0,0.0};
TabulatedFunction trivialSaltVdTable = TabulatedFunction(2, x, y);
@ -241,7 +241,7 @@ void test_CellSubset()
const Opm::EquilRecord record[] = { mkEquilRecord( 0, 1e5, 2.5, -0.075e5, 0, 0 ),
mkEquilRecord( 5, 1.35e5, 7.5, -0.225e5, 5, 0 ) };
using TabulatedFunction = typename Opm::Tabulated1DFunction<double>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<double> x = {0.0,100.0};
std::vector<double> y = {0.0,0.0};
TabulatedFunction trivialSaltVdTable = TabulatedFunction(2, x, y);
@ -345,7 +345,7 @@ void test_RegMapping()
auto simulator = initSimulator<TypeTag>("equil_base.DATA");
initDefaultFluidSystem<TypeTag>();
using TabulatedFunction = typename Opm::Tabulated1DFunction<double>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<double> x = {0.0,100.0};
std::vector<double> y = {0.0,0.0};
TabulatedFunction trivialSaltVdTable = TabulatedFunction(2, x, y);