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

Switch to Passing VFP Wrapper Tables as References

Browse Source 
We don't need to copy those mapping tables on each call.
This commit is contained in:
Bård Skaflestad 2021-11-04 18:07:49 +01:00
parent 869de90b56
commit 07d6de3bbc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/wells/VFPHelpers.cpp
View File

@ -590,7 +590,7 @@ T getGFR(const VFPProdTable& table,
} }
template <typename T> template <typename T>
const T& getTable(const std::map<int, std::reference_wrapper<const T>> tables, int table_id) const T& getTable(const std::map<int, std::reference_wrapper<const T>>& tables, int table_id)
{ {
auto entry = tables.find(table_id); auto entry = tables.find(table_id);
if (entry == tables.end()) { if (entry == tables.end()) {
@ -628,8 +628,8 @@ VFPInjTable::FLO_TYPE getType(const VFPInjTable& table)
return table.getFloType(); return table.getFloType();
} }
template const VFPInjTable& getTable<VFPInjTable>(const std::map<int, std::reference_wrapper<const VFPInjTable>>, int); template const VFPInjTable& getTable<VFPInjTable>(const std::map<int, std::reference_wrapper<const VFPInjTable>>&, int);
template const VFPProdTable& getTable<VFPProdTable>(const std::map<int, std::reference_wrapper<const VFPProdTable>>, int); template const VFPProdTable& getTable<VFPProdTable>(const std::map<int, std::reference_wrapper<const VFPProdTable>>&, int);
#define INSTANCE(...) \ #define INSTANCE(...) \
template __VA_ARGS__ getFlo(const VFPInjTable&, const __VA_ARGS__&, const __VA_ARGS__&, const __VA_ARGS__&); \ template __VA_ARGS__ getFlo(const VFPInjTable&, const __VA_ARGS__&, const __VA_ARGS__&, const __VA_ARGS__&); \

4
opm/simulators/wells/VFPHelpers.hpp
View File

@ -149,13 +149,13 @@ VFPEvaluation bhp(const VFPInjTable& table,
* Returns the table from the map if found, or throws an exception * Returns the table from the map if found, or throws an exception
*/ */
template <typename T> template <typename T>
const T& getTable(const std::map<int, std::reference_wrapper<const T>> tables, int table_id); const T& getTable(const std::map<int, std::reference_wrapper<const T>>& tables, int table_id);
/** /**
* Check whether we have a table with the table number * Check whether we have a table with the table number
*/ */
template <typename T> template <typename T>
bool hasTable(const std::map<int, std::reference_wrapper<const T>> tables, int table_id) { bool hasTable(const std::map<int, std::reference_wrapper<const T>>& tables, int table_id) {
const auto entry = tables.find(table_id); const auto entry = tables.find(table_id);
return (entry != tables.end() ); return (entry != tables.end() );
} }