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

Merge pull request #931 from joakim-hove/unit-system-vector-overlaod

Browse Source 
Added vector overload of unit onversion methods.
This commit is contained in:
jokva
2016-10-06 13:10:39 +02:00
committed by GitHub
parent f73d7f66ae 0d4bfdea2d
commit 1fc4fa633b
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opm/parser/eclipse/Units/UnitSystem.cpp
View File

@@ -447,6 +447,21 @@ namespace {
return this->measure_table_to_si[ static_cast< int >( m ) ] * val;
}
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; };
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; };
std::transform( data.begin() , data.end() , data.begin() , scale);
}
const char* UnitSystem::name( measure m ) const {
return this->unit_name_table[ static_cast< int >( m ) ];
}

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

@@ -22,6 +22,7 @@
#include <string>
#include <map>
#include <vector>
#include <memory>
namespace Opm {
@@ -81,6 +82,8 @@ namespace Opm {
double from_si( measure, double ) const;
double to_si( measure, double ) const;
void from_si( measure, std::vector<double>& ) const;
void to_si( measure, std::vector<double>& ) const;
const char* name( measure ) const;
static UnitSystem * newMETRIC();

13
opm/parser/eclipse/Units/tests/UnitTests.cpp
View File

@@ -213,3 +213,16 @@ BOOST_AUTO_TEST_CASE(LabUnitConversions) {
BOOST_CHECK_CLOSE( 1.0 , lab->from_si( q.m , q.f ) , 1.0e-10 );
}
}
BOOST_AUTO_TEST_CASE( VectorConvert ) {
std::vector<double> d0 = {1,2,3};
std::vector<double> d1 = {1,2,3};
UnitSystem * units = UnitSystem::newLAB();
units->from_si( UnitSystem::measure::pressure , d0 );
for (size_t i = 0; i < d1.size(); i++)
BOOST_CHECK_EQUAL( units->from_si( UnitSystem::measure::pressure , d1[i] ) , d0[i]);
delete units;
}