OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1203 from andlaus/fix_measures

Browse Source 
respect the fact that non-SI temperature may be offset from zero
This commit is contained in:
Joakim Hove 2018-01-31 17:53:15 +01:00 committed by GitHub
commit a496158ed6
3 changed files with 137 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/Units/UnitSystem.hpp
View File

@ -104,6 +104,7 @@ namespace Opm {
std::string m_name;
UnitType m_unittype;
std::map< std::string , Dimension > m_dimensions;
const double* measure_table_to_si_offset;
const double* measure_table_from_si;
const double* measure_table_to_si;
const char* const* unit_name_table;

138
src/opm/parser/eclipse/Units/UnitSystem.cpp
View File

@ -38,6 +38,35 @@ namespace {
* metric and field arrays. C++ does not support designated initializers, so
* this cannot be done in a declaration-order independent matter.
*/
static const double from_metric_offset[] = {
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
Metric::TemperatureOffset,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
};
static const double to_metric[] = {
1,
@ -129,6 +158,36 @@ namespace {
"KJ", /* energy */
};
static const double from_field_offset[] = {
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
Field::TemperatureOffset,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
};
static const double to_field[] = {
1,
1 / Field::Length,
@ -219,6 +278,36 @@ namespace {
"BTU", /* energy */
};
static const double from_lab_offset[] = {
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
Lab::TemperatureOffset,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
};
static const double to_lab[] = {
1,
1 / Lab::Length,
@ -309,6 +398,36 @@ namespace {
"J", /* energy */
};
static const double from_pvt_m_offset[] = {
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
PVT_M::TemperatureOffset,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
};
static const double to_pvt_m[] = {
1,
1 / PVT_M::Length,
@ -408,24 +527,28 @@ namespace {
m_name = "Metric";
this->measure_table_from_si = to_metric;
this->measure_table_to_si = from_metric;
this->measure_table_to_si_offset = from_metric_offset;
this->unit_name_table = metric_names;
break;
case(UnitType::UNIT_TYPE_FIELD):
m_name = "Field";
this->measure_table_from_si = to_field;
this->measure_table_to_si = from_field;
this->measure_table_to_si_offset = from_field_offset;
this->unit_name_table = field_names;
break;
case(UnitType::UNIT_TYPE_LAB):
m_name = "Lab";
this->measure_table_from_si = to_lab;
this->measure_table_to_si = from_lab;
this->measure_table_to_si_offset = from_lab_offset;
this->unit_name_table = lab_names;
break;
case(UnitType::UNIT_TYPE_PVT_M):
m_name = "PVT-M";
this->measure_table_from_si = to_pvt_m;
this->measure_table_to_si = from_pvt_m;
this->measure_table_to_si_offset = from_pvt_m_offset;
this->unit_name_table = pvt_m_names;
break;
default:
@ -554,6 +677,7 @@ namespace {
&& std::equal( this->m_dimensions.begin(),
this->m_dimensions.end(),
rhs.m_dimensions.begin() )
&& this->measure_table_to_si_offset == rhs.measure_table_to_si_offset
&& this->measure_table_from_si == rhs.measure_table_from_si
&& this->measure_table_to_si == rhs.measure_table_to_si
&& this->unit_name_table == rhs.unit_name_table;
@ -564,23 +688,29 @@ namespace {
}
double UnitSystem::from_si( measure m, double val ) const {
return this->measure_table_from_si[ static_cast< int >( m ) ] * val;
return
this->measure_table_from_si[ static_cast< int >( m ) ]
* (val - this->measure_table_to_si_offset[ static_cast< int >( m ) ]);
}
double UnitSystem::to_si( measure m, double val ) const {
return this->measure_table_to_si[ static_cast< int >( m ) ] * val;
return
this->measure_table_to_si[ static_cast< int >( m ) ]*val
+ this->measure_table_to_si_offset[ static_cast< int >( m ) ];
}
void UnitSystem::from_si( measure m, std::vector<double>& data ) const {
double factor = this->measure_table_from_si[ static_cast< int >( m ) ];
auto scale = [=](double x) { return x * factor; };
double offset = this->measure_table_to_si_offset[ static_cast< int >( m ) ];
auto scale = [=](double x) { return (x - offset) * factor; };
std::transform( data.begin() , data.end() , data.begin() , scale);
}
void UnitSystem::to_si( measure m, std::vector<double>& data) const {
double factor = this->measure_table_to_si[ static_cast< int >( m ) ];
auto scale = [=](double x) { return x * factor; };
double offset = this->measure_table_to_si_offset[ static_cast< int >( m ) ];
auto scale = [=](double x) { return x * factor + offset; };
std::transform( data.begin() , data.end() , data.begin() , scale);
}

4
tests/parser/UnitTests.cpp
View File

@ -301,7 +301,7 @@ BOOST_AUTO_TEST_CASE(PVT_M_UNITS)
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::density , 1.0 ) , 1.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::pressure , 1.0 ) , 101325.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::temperature_absolute , 1.0 ) , 1.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::temperature , 1.0 ) , 1.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::temperature , 1.0 ) , 274.15 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::viscosity , 1.0 ) , 1.0e-3 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::permeability , 1.0 ) , 9.869232667160129e-16 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.to_si( Meas::liquid_surface_volume , 1.0 ) , 1.0 , 1.0e-10 );
@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE(PVT_M_UNITS)
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::density , 1.0 ) , 1.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::pressure , 1.0 ) , 9.869232667160129e-06 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::temperature_absolute , 1.0 ) , 1.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::temperature , 1.0 ) , 1.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::temperature , 274.15 ) , 1.0 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::viscosity , 1.0 ) , 1.0e+3 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::permeability , 1.0 ) , 1.01325e+15 , 1.0e-10 );
BOOST_CHECK_CLOSE( pvt_m.from_si( Meas::liquid_surface_volume , 1.0 ) , 1.0 , 1.0e-10 );