Merge pull request #4382 from akva2/units_hpp_cleanups

Units.hpp: some cleanup

opm/simulators/flow/BlackoilModelEbos.hpp

@@ -37,7 +37,6 @@
 
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
-#include <opm/input/eclipse/Units/Units.hpp>
 
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #include <opm/simulators/flow/countGlobalCells.hpp>

opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp

@@ -15,6 +15,7 @@
 #include <opm/grid/utility/StopWatch.hpp>
 
 #include <opm/input/eclipse/Schedule/ScheduleState.hpp>
+#include <opm/input/eclipse/Units/Units.hpp>
 
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>

opm/simulators/wells/MultisegmentWell_impl.hpp

@@ -22,6 +22,7 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 
 #include <opm/input/eclipse/Schedule/MSW/Valve.hpp>
+#include <opm/input/eclipse/Units/Units.hpp>
 
 #include <opm/material/densead/EvaluationFormat.hpp>
 

opm/simulators/wells/StandardWell_impl.hpp

@@ -21,6 +21,8 @@
 
 #include <opm/common/Exceptions.hpp>
 
+#include <opm/input/eclipse/Units/Units.hpp>
+
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/wells/StandardWellAssemble.hpp>
 #include <opm/simulators/wells/VFPHelpers.hpp>