mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 07:00:17 -05:00
#13269 Read VFP data without unit conversion
- read VFP data using readers with no unit conversion - remove existing unit conversion - make sure correct units are displayed in UI for both Metric and Field
This commit is contained in:
1 parent
40078cf8a8
commit
102a9feb32
10 files changed
+229
-311
No files matched your search
@@ -29,13 +29,14 @@
|
||||
|
||||
#include "RifVfpInjTable.h"
|
||||
|
||||
#include "cafAssert.h"
|
||||
|
||||
#include <opm/input/eclipse/Deck/DeckItem.hpp>
|
||||
#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
|
||||
#include <opm/input/eclipse/Deck/DeckRecord.hpp>
|
||||
#include <opm/input/eclipse/Parser/ParserKeywords/V.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cmath>
|
||||
#include <stdexcept>
|
||||
|
||||
@@ -235,8 +236,8 @@ double RifVfpInjTable::operator()( size_t thpIdx, size_t floIdx ) const
|
||||
size_t nt = m_thpData.size();
|
||||
size_t nf = m_floData.size();
|
||||
|
||||
assert( thpIdx < nt );
|
||||
assert( floIdx < nf );
|
||||
CAF_ASSERT( thpIdx < nt );
|
||||
CAF_ASSERT( floIdx < nf );
|
||||
|
||||
size_t index = thpIdx + nt * floIdx;
|
||||
return m_data[index];
|
||||
@@ -250,8 +251,8 @@ double& RifVfpInjTable::operator()( size_t thpIdx, size_t floIdx )
|
||||
size_t nt = m_thpData.size();
|
||||
size_t nf = m_floData.size();
|
||||
|
||||
assert( thpIdx < nt );
|
||||
assert( floIdx < nf );
|
||||
CAF_ASSERT( thpIdx < nt );
|
||||
CAF_ASSERT( floIdx < nf );
|
||||
|
||||
size_t index = thpIdx + nt * floIdx;
|
||||
return m_data[index];
|
||||
|
||||
Reference in new issue
Block a user