allow constructing JFunc from variables

also add equality operator
This commit is contained in:
Arne Morten Kvarving
2019-11-29 09:57:25 +01:00
parent 73be14b7b8
commit 39ab36819e
2 changed files with 32 additions and 0 deletions

View File

@@ -32,7 +32,11 @@ public:
enum class Flag { BOTH, WATER, GAS };
enum class Direction { XY, X, Y, Z };
JFunc();
explicit JFunc(const Deck& deck);
JFunc(Flag flag, double ow, double go,
double alpha, double beta, Direction dir);
double alphaFactor() const;
double betaFactor() const;
double goSurfaceTension() const;
@@ -40,6 +44,8 @@ public:
const Flag& flag() const;
const Direction& direction() const;
bool operator==(const JFunc& data) const;
private:
Flag m_flag; // JFUNC flag: WATER, GAS, or BOTH. Default BOTH
double m_owSurfaceTension; // oil-wat surface tension. Required if flag is BOTH or WATER