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:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user