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

Some whitespace cleanup and remove unused includes in Aquifetp

Browse Source
This commit is contained in:
Joakim Hove
2019-12-08 14:04:07 +01:00
parent 709373086d
commit bbbe2c88ef
2 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
opm/parser/eclipse/EclipseState/Aquifetp.hpp
View File

@@ -25,49 +25,39 @@
This includes the logic for parsing as well as the associated tables. It is meant to be used by opm-grid and opm-simulators in order to
implement the Fetkovich analytical aquifer model in OPM Flow.
*/
#include <memory>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/A.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
#include <boost/concept_check.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp>
namespace Opm {
class Aquifetp {
public:
class Aquifetp {
public:
struct AQUFETP_data{
struct AQUFETP_data{
// Aquifer ID
int aquiferID;
// Table IDs
int inftableID, pvttableID;
std::vector<int> cell_id;
// Variables constants
double J, // Specified Productivity Index
rho, // water density in the aquifer
C_t, // total rock compressibility
V0, // initial volume of water in aquifer
d0; // aquifer datum depth
// Aquifer ID
int aquiferID;
// Table IDs
int inftableID, pvttableID;
std::vector<int> cell_id;
// Variables constants
double J, // Specified Productivity Index
rho, // water density in the aquifer
C_t, // total rock compressibility
V0, // initial volume of water in aquifer
d0; // aquifer datum depth
std::shared_ptr<double> p0; //Initial aquifer pressure at datum depth d0 - nullptr if the pressure has been defaulted.
};
Aquifetp(const Deck& deck);
const std::vector<Aquifetp::AQUFETP_data>& getAquifers() const;
int getAqPvtTabID(size_t aquiferIndex);
private:
std::vector<Aquifetp::AQUFETP_data> m_aqufetp;
};
Aquifetp(const Deck& deck);
const std::vector<Aquifetp::AQUFETP_data>& getAquifers() const;
int getAqPvtTabID(size_t aquiferIndex);
private:
std::vector<Aquifetp::AQUFETP_data> m_aqufetp;
};
}

20
src/opm/parser/eclipse/EclipseState/Aquifetp.cpp
View File

@@ -22,30 +22,30 @@
namespace Opm {
Aquifetp::Aquifetp(const Deck& deck)
{
{
if (!deck.hasKeyword("AQUFETP"))
return;
const auto& aqufetpKeyword = deck.getKeyword("AQUFETP");
for (auto& aqufetpRecord : aqufetpKeyword){
Aquifetp::AQUFETP_data data;
data.aquiferID = aqufetpRecord.getItem("AQUIFER_ID").template get<int>(0);
data.d0 = aqufetpRecord.getItem("DAT_DEPTH").getSIDouble(0);
data.C_t = aqufetpRecord.getItem("C_T").getSIDouble(0);
data.pvttableID = aqufetpRecord.getItem("TABLE_NUM_WATER_PRESS").template get<int>(0);
data.V0 = aqufetpRecord.getItem("V0").getSIDouble(0);
data.V0 = aqufetpRecord.getItem("V0").getSIDouble(0);
data.J = aqufetpRecord.getItem("PI").getSIDouble(0);
if (aqufetpRecord.getItem("P0").hasValue(0) )
{
double * raw_ptr = new double ( aqufetpRecord.getItem("P0").getSIDouble(0));
data.p0.reset( raw_ptr );
}
m_aqufetp.push_back( std::move(data) );
}
{
double * raw_ptr = new double ( aqufetpRecord.getItem("P0").getSIDouble(0));
data.p0.reset( raw_ptr );
}
m_aqufetp.push_back( std::move(data) );
}
}
const std::vector<Aquifetp::AQUFETP_data>& Aquifetp::getAquifers() const