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

adapting to the interface change of VFP related in parser.

Browse Source
This commit is contained in:
Kai Bao 2018-04-20 11:29:22 +02:00
parent d9b215ec70
commit 78cc2b8ca4
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/VFPInjProperties.cpp
View File

@ -61,9 +61,9 @@ VFPInjProperties::VFPInjProperties(const VFPInjTable* table){
VFPInjProperties::VFPInjProperties(const std::map<int, VFPInjTable>& tables) {
VFPInjProperties::VFPInjProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& tables) {
for (const auto& table : tables) {
m_tables[table.first] = &(table.second);
m_tables[table.first] = table.second.get();
}
}

2
opm/autodiff/VFPInjProperties.hpp
View File

@ -57,7 +57,7 @@ public:
* Takes *no* ownership of data.
* @param inj_tables A map of different VFPINJ tables.
*/
explicit VFPInjProperties(const std::map<int, VFPInjTable>& inj_tables);
explicit VFPInjProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& inj_tables);
/**
* Linear interpolation of bhp as function of the input parameters.

4
opm/autodiff/VFPProdProperties.cpp
View File

@ -48,9 +48,9 @@ VFPProdProperties::VFPProdProperties(const VFPProdTable* table){
VFPProdProperties::VFPProdProperties(const std::map<int, VFPProdTable>& tables) {
VFPProdProperties::VFPProdProperties(const std::map<int, std::shared_ptr<const VFPProdTable> >& tables) {
for (const auto& table : tables) {
m_tables[table.first] = &(table.second);
m_tables[table.first] = table.second.get();
}
}

2
opm/autodiff/VFPProdProperties.hpp
View File

@ -61,7 +61,7 @@ public:
* Takes *no* ownership of data.
* @param prod_tables A map of different VFPPROD tables.
*/
explicit VFPProdProperties(const std::map<int, VFPProdTable>& prod_tables);
explicit VFPProdProperties(const std::map<int, std::shared_ptr<const VFPProdTable> >& prod_tables);
/**
* Linear interpolation of bhp as function of the input parameters.

4
opm/autodiff/VFPProperties.cpp
View File

@ -38,8 +38,8 @@ VFPProperties::VFPProperties(const VFPInjTable* inj_table, const VFPProdTable* p
}
}
VFPProperties::VFPProperties(const std::map<int, VFPInjTable>& inj_tables,
const std::map<int, VFPProdTable>& prod_tables) {
VFPProperties::VFPProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& inj_tables,
const std::map<int, std::shared_ptr<const VFPProdTable> >& prod_tables) {
m_inj.reset(new VFPInjProperties(inj_tables));
m_prod.reset(new VFPProdProperties(prod_tables));
}

4
opm/autodiff/VFPProperties.hpp
View File

@ -52,8 +52,8 @@ public:
* @param inj_tables A map of different VFPINJ tables.
* @param prod_tables A map of different VFPPROD tables.
*/
VFPProperties(const std::map<int, VFPInjTable>& inj_tables,
const std::map<int, VFPProdTable>& prod_tables);
VFPProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& inj_tables,
const std::map<int, std::shared_ptr<const VFPProdTable> >& prod_tables);
/**
* Returns the VFP properties for injection wells