Moved writeECLData and writeVtkData to opm/core/io subdirs.

CMakeLists_files.cmake

@@ -58,7 +58,9 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/core/GridManager.cpp
 	opm/core/io/eclipse/EclipseGridInspector.cpp
 	opm/core/io/eclipse/EclipseGridParser.cpp
+	opm/core/io/eclipse/writeECLData.cpp
 	opm/core/io/vag/vag.cpp
+	opm/core/io/vtk/writeVtkData.cpp
 	opm/core/linalg/call_umfpack.c
 	opm/core/linalg/LinearSolverAGMG.cpp
 	opm/core/linalg/LinearSolverFactory.cpp
@@ -124,8 +126,6 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/core/utility/StopWatch.cpp
 	opm/core/utility/VelocityInterpolation.cpp
 	opm/core/utility/WachspressCoord.cpp
-	opm/core/utility/writeECLData.cpp
-	opm/core/utility/writeVtkData.cpp
 	opm/core/wells/InjectionSpecification.cpp
 	opm/core/wells/ProductionSpecification.cpp
 	opm/core/wells/WellCollection.cpp
@@ -206,7 +206,9 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/io/eclipse/CornerpointChopper.hpp
 	opm/core/io/eclipse/EclipseGridParser.hpp
 	opm/core/io/eclipse/EclipseGridInspector.hpp
+	opm/core/io/eclipse/writeECLData.hpp
 	opm/core/io/vag/vag.hpp
+	opm/core/io/vtk/writeVtkData.hpp
 	opm/core/linalg/blas_lapack.h
 	opm/core/linalg/LinearSolverAGMG.hpp
 	opm/core/linalg/LinearSolverFactory.hpp
@@ -245,7 +247,6 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/utility/miscUtilitiesBlackoil.hpp
 	opm/core/utility/MonotCubicInterpolator.hpp
 	opm/core/utility/UniformTableLinear.hpp
-	opm/core/utility/writeVtkData.hpp
 	opm/core/utility/Average.hpp
 	opm/core/utility/Factory.hpp
 	opm/core/utility/VelocityInterpolation.hpp
@@ -258,7 +259,6 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/utility/RootFinders.hpp
 	opm/core/utility/SparseTable.hpp
 	opm/core/utility/have_boost_redef.hpp
-	opm/core/utility/writeECLData.hpp
 	opm/core/grid/CellQuadrature.hpp
 	opm/core/grid/cornerpoint_grid.h
 	opm/core/grid/cpgpreprocess/geometry.h

examples/import_rewrite.cpp

@@ -7,7 +7,7 @@
 #include <boost/filesystem/convenience.hpp>
 
 #ifdef HAVE_ERT
-#include <opm/core/utility/writeECLData.hpp>
+#include <opm/core/io/eclipse/writeECLData.hpp>
 #include <ert/util/util.h>
 #include <ert/ecl/ecl_util.h>
 #include <ert/ecl/ecl_kw.h>

examples/sim_wateroil.cpp

@@ -33,7 +33,7 @@
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>

examples/spu_2p.cpp

@@ -49,7 +49,7 @@
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
@@ -95,7 +95,7 @@
 
 
 #ifdef HAVE_ERT
-#include <opm/core/utility/writeECLData.hpp>
+#include <opm/core/io/eclipse/writeECLData.hpp>
 #endif
 
 

opm/core/io/eclipse/writeECLData.cpp

@@ -23,7 +23,7 @@
 #endif
 
 #include <opm/core/grid.h>
-#include <opm/core/utility/writeECLData.hpp>
+#include <opm/core/io/eclipse/writeECLData.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 

opm/core/io/vtk/writeVtkData.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>

opm/core/simulator/SimulatorCompressibleTwophase.cpp

@@ -34,7 +34,7 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 

opm/core/simulator/SimulatorIncompTwophase.cpp

@@ -34,7 +34,7 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 
 #include <opm/core/wells/WellsManager.hpp>

tutorials/tutorial1.cpp

@@ -36,7 +36,7 @@
 /// \internal [including headers] 
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <iostream>
 #include <fstream>
 #include <vector>

tutorials/tutorial2.cpp

@@ -35,7 +35,7 @@
 
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <iostream>
 #include <fstream>
 #include <vector>

tutorials/tutorial3.cpp

@@ -29,7 +29,7 @@
 #include <cassert>
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/linalg/LinearSolverUmfpack.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
 #include <opm/core/pressure/FlowBCManager.hpp>

tutorials/tutorial4.cpp

@@ -29,7 +29,7 @@
 #include <cassert>
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/linalg/LinearSolverUmfpack.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
 #include <opm/core/pressure/FlowBCManager.hpp>