consolidate the unit system to opm-parser

since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
This commit is contained in:
Andreas Lauser
2016-10-10 17:23:03 +02:00
parent edb57704f9
commit 07707ecc30
27 changed files with 27 additions and 260 deletions

View File

@@ -38,7 +38,7 @@
#include <opm/core/pressure/msmfem/partition.h>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <array>
#include <iostream>

View File

@@ -32,7 +32,7 @@
#include <sstream>
#include <iostream>
#include <opm/parser/eclipse/Units/ConversionFactors.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>

View File

@@ -34,7 +34,7 @@
#include <opm/core/pressure/msmfem/partition.h>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <array>
#include <iostream>

View File

@@ -33,7 +33,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <string>
#include <iostream>

View File

@@ -53,7 +53,7 @@
#include <boost/bind.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
using namespace Opm::prefix;
using namespace Opm::unit;