OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 17:32:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for PR

Browse Source
This commit is contained in:
babrodtk committed 2015-08-19 12:48:20 +02:00
1 parent e89a40ec99
commit 407512382a
3 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/autodiff/VFPHelpers.hpp
+1 -1
View File
@@ -747,7 +747,7 @@ ADB getValue(
* @param TABLE Type of table to use, e.g., VFPInjTable, VFPProdTable. * @param TABLE Type of table to use, e.g., VFPInjTable, VFPProdTable.
*/ */
template <typename TYPE, typename TABLE> template <typename TYPE, typename TABLE>
ADB gather_vars(const std::vector<const TABLE*>& well_tables, ADB combineADBVars(const std::vector<const TABLE*>& well_tables,
const ADB& aqua, const ADB& aqua,
const ADB& liquid, const ADB& liquid,
const ADB& vapour) { const ADB& vapour) {
opm/autodiff/VFPInjProperties.cpp
+1 -1
View File
@@ -123,7 +123,7 @@ VFPInjProperties::ADB VFPInjProperties::bhp(const std::vector<int>& table_id,
} }
//Get the right FLO variable for each well as a single ADB //Get the right FLO variable for each well as a single ADB
const ADB flo = detail::gather_vars<VFPInjTable::FLO_TYPE>(well_tables, aqua, liquid, vapour); const ADB flo = detail::combineADBVars<VFPInjTable::FLO_TYPE>(well_tables, aqua, liquid, vapour);
//Compute the BHP for each well independently //Compute the BHP for each well independently
for (int i=0; i<nw; ++i) { for (int i=0; i<nw; ++i) {
opm/autodiff/VFPProdProperties.cpp
+3 -3
View File
@@ -113,9 +113,9 @@ VFPProdProperties::ADB VFPProdProperties::bhp(const std::vector<int>& table_id,
} }
//Get the right FLO/GFR/WFR variable for each well as a single ADB //Get the right FLO/GFR/WFR variable for each well as a single ADB
const ADB flo = detail::gather_vars<VFPProdTable::FLO_TYPE>(well_tables, aqua, liquid, vapour); const ADB flo = detail::combineADBVars<VFPProdTable::FLO_TYPE>(well_tables, aqua, liquid, vapour);
const ADB wfr = detail::gather_vars<VFPProdTable::WFR_TYPE>(well_tables, aqua, liquid, vapour); const ADB wfr = detail::combineADBVars<VFPProdTable::WFR_TYPE>(well_tables, aqua, liquid, vapour);
const ADB gfr = detail::gather_vars<VFPProdTable::GFR_TYPE>(well_tables, aqua, liquid, vapour); const ADB gfr = detail::combineADBVars<VFPProdTable::GFR_TYPE>(well_tables, aqua, liquid, vapour);
//Compute the BHP for each well independently //Compute the BHP for each well independently
for (int i=0; i<nw; ++i) { for (int i=0; i<nw; ++i) {