From 392dc8557d5e8fc2cef7e95f1c0b26b6fda81d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Mon, 30 May 2016 14:15:17 +0200 Subject: [PATCH] 2 -> To --- opm/core/utility/Compat.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/opm/core/utility/Compat.hpp b/opm/core/utility/Compat.hpp index 61b7bd2c..4e41abca 100644 --- a/opm/core/utility/Compat.hpp +++ b/opm/core/utility/Compat.hpp @@ -67,7 +67,7 @@ inline std::vector< double >& stripe( const std::vector< double >& v, -inline data::Solution sim2solution( const SimulationDataContainer& reservoir, +inline data::Solution simToSolution( const SimulationDataContainer& reservoir, PhaseUsage phases ) { using ds = data::Solution::key; @@ -109,7 +109,7 @@ inline data::Solution sim2solution( const SimulationDataContainer& reservoir, -inline void solution2sim( const data::Solution& sol, +inline void solutionToSim( const data::Solution& sol, PhaseUsage phases, SimulationDataContainer& state ) { using ds = data::Solution::key; @@ -154,7 +154,13 @@ inline void solution2sim( const data::Solution& sol, -inline void wells2state( const data::Wells& wells, WellState& state ) { + + + + + + +inline void wellsToState( const data::Wells& wells, WellState& state ) { state.bhp() = wells.bhp; state.temperature() = wells.temperature; state.wellRates() = wells.well_rate;