OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #463 from akva2/janitoring

Browse Source 
Some janitoring
This commit is contained in:
Bård Skaflestad 2021-06-21 15:36:57 +02:00 committed by GitHub
commit 0eb0d51186
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.hpp
View File

@ -222,7 +222,7 @@ public:
bool operator==(const ConstantCompressibilityBrinePvt<Scalar>& data) const
{
return this->waterReferenceDensity() == data.waterReferenceDensity() &&
return this->waterReferenceDensity_ == data.waterReferenceDensity_ &&
this->referencePressure() == data.referencePressure() &&
this->formationVolumeTables() == data.formationVolumeTables() &&
this->compressibilityTables() == data.compressibilityTables() &&

4
opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
View File

@ -297,8 +297,8 @@ public:
bool operator==(const ConstantCompressibilityOilPvt<Scalar>& data) const
{
return this->oilReferenceDensity() == data.oilReferenceDensity() &&
this->oilReferencePressure() == data.oilReferencePressure() &&
return this->oilReferenceDensity_ == data.oilReferenceDensity_ &&
this->oilReferencePressure_ == data.oilReferencePressure_ &&
this->oilReferenceFormationVolumeFactor() == data.oilReferenceFormationVolumeFactor() &&
this->oilCompressibility() == data.oilCompressibility() &&
this->oilViscosity() == data.oilViscosity() &&

2
opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp
View File

@ -230,7 +230,7 @@ public:
bool operator==(const ConstantCompressibilityWaterPvt<Scalar>& data) const
{
return this->waterReferenceDensity() == data.waterReferenceDensity() &&
return this->waterReferenceDensity_ == data.waterReferenceDensity_ &&
this->waterReferencePressure() == data.waterReferencePressure() &&
this->waterReferenceFormationVolumeFactor() == data.waterReferenceFormationVolumeFactor() &&
this->waterCompressibility() == data.waterCompressibility() &&

2
opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp
View File

@ -300,7 +300,7 @@ public:
bool operator==(const DeadOilPvt<Scalar>& data) const
{
return this->oilReferenceDensity() == data.oilReferenceDensity() &&
return this->oilReferenceDensity_ == data.oilReferenceDensity_ &&
this->inverseOilB() == data.inverseOilB() &&
this->oilMu() == data.oilMu() &&
this->inverseOilBMu() == data.inverseOilBMu();

4
opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
View File

@ -645,8 +645,8 @@ public:
bool operator==(const LiveOilPvt<Scalar>& data) const
{
return this->gasReferenceDensity() == data.gasReferenceDensity() &&
this->oilReferenceDensity() == data.oilReferenceDensity() &&
return this->gasReferenceDensity_ == data.gasReferenceDensity_ &&
this->oilReferenceDensity_ == data.oilReferenceDensity_ &&
this->inverseOilBTable() == data.inverseOilBTable() &&
this->oilMuTable() == data.oilMuTable() &&
this->inverseOilBMuTable() == data.inverseOilBMuTable() &&

5
opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp
View File

@ -320,7 +320,6 @@ public:
size_t nRv = 20;
size_t nP = samplePoints.size()*2;
Scalar rhogRef = gasReferenceDensity_[regionIdx];
Scalar rhooRef = oilReferenceDensity_[regionIdx];
TabulatedOneDFunction gasFormationVolumeFactor;
@ -681,8 +680,8 @@ public:
bool operator==(const WetGasPvt<Scalar>& data) const
{
return this->gasReferenceDensity() == data.gasReferenceDensity() &&
this->oilReferenceDensity() == data.oilReferenceDensity() &&
return this->gasReferenceDensity_ == data.gasReferenceDensity_ &&
this->oilReferenceDensity_ == data.oilReferenceDensity_ &&
this->inverseGasB() == data.inverseGasB() &&
this->inverseSaturatedGasB() == data.inverseSaturatedGasB() &&
this->gasMu() == data.gasMu() &&

6
opm/material/thermal/EclThermalLawManager.hpp
View File

@ -24,13 +24,13 @@
* \file
* \copydoc Opm::EclThermalLawManager
*/
#ifndef OPM_ECL_THERMAL_LAW_MANAGER_HPP
#define OPM_ECL_THERMAL_LAW_MANAGER_HPP
#if ! HAVE_ECL_INPUT
#error "Eclipse input support in opm-common is required to use the ECL thermal law manager!"
#endif
#ifndef OPM_ECL_THERMAL_LAW_MANAGER_HPP
#define OPM_ECL_THERMAL_LAW_MANAGER_HPP
#include "EclSolidEnergyLawMultiplexer.hpp"
#include "EclSolidEnergyLawMultiplexerParams.hpp"