OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added method equals in BlackoilState.hpp

Browse Source
This commit is contained in:
Joakim Hove 2013-10-28 17:42:32 +01:00
parent 847a8f4f7a
commit 877829f43a
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
opm/core/simulator/BlackoilState.hpp
View File

@ -19,6 +19,7 @@
#ifndef OPM_BLACKOILSTATE_HEADER_INCLUDED #ifndef OPM_BLACKOILSTATE_HEADER_INCLUDED
#define OPM_BLACKOILSTATE_HEADER_INCLUDED #define OPM_BLACKOILSTATE_HEADER_INCLUDED
#include <math.h>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/props/BlackoilPropertiesInterface.hpp> #include <opm/core/props/BlackoilPropertiesInterface.hpp>
@ -82,6 +83,22 @@ namespace Opm
return num_phases_; return num_phases_;
} }
bool equals(const BlackoilState& other, double epsilon = 1e-8) const {
bool equal = (num_phases_ == other.num_phases_);
equal = equal && (vectorApproxEqual( pressure() , other.pressure() , epsilon));
equal = equal && (vectorApproxEqual( facepressure() , other.facepressure() , epsilon));
equal = equal && (vectorApproxEqual( faceflux() , other.faceflux() , epsilon));
equal = equal && (vectorApproxEqual( surfacevol() , other.surfacevol() , epsilon));
equal = equal && (vectorApproxEqual( saturation() , other.saturation() , epsilon));
equal = equal && (vectorApproxEqual( gasoilratio() , other.gasoilratio() , epsilon));
return equal;
}
std::vector<double>& pressure () { return press_ ; } std::vector<double>& pressure () { return press_ ; }
std::vector<double>& facepressure() { return fpress_; } std::vector<double>& facepressure() { return fpress_; }
std::vector<double>& faceflux () { return flux_ ; } std::vector<double>& faceflux () { return flux_ ; }
@ -104,6 +121,19 @@ namespace Opm
std::vector<double> surfvol_; std::vector<double> surfvol_;
std::vector<double> sat_ ; std::vector<double> sat_ ;
std::vector<double> gor_ ; std::vector<double> gor_ ;
static bool vectorApproxEqual(const std::vector<double>& v1, const std::vector<double>& v2 , double epsilon) {
if (v1.size() != v2.size())
return false;
for (size_t i = 0; i < v1.size(); i++)
if (fabs(v1[i] - v2[i]) > epsilon * (fabs(v1[i]) + fabs(v2[i])))
return false;
return true;
}
}; };
} // namespace Opm } // namespace Opm