diff --git a/AMDiS/Reinit/src/HL_SignedDist.h b/AMDiS/Reinit/src/HL_SignedDist.h
index ed360609f8f652f3c674ba067a781d15a1a8ad19..f76380e647e82951f4f89bf2bf309921149d5bb0 100644
--- a/AMDiS/Reinit/src/HL_SignedDist.h
+++ b/AMDiS/Reinit/src/HL_SignedDist.h
@@ -5,7 +5,7 @@
#include "AdaptInfo.h"
#include "DOFVector.h"
#include "ElementFunction.h"
-#include "FileWriter.h"
+#include "io/FileWriter.h"
#include "FixVec.h"
#include "Flag.h"
#include "Parameters.h"
diff --git a/AMDiS/Reinit/src/VelocityExt.h b/AMDiS/Reinit/src/VelocityExt.h
index 51a34fd532dade89c53ed50cc4e6a2a269f43800..65debf8e4c678d51d12e01a561b4e9b1381044f1 100644
--- a/AMDiS/Reinit/src/VelocityExt.h
+++ b/AMDiS/Reinit/src/VelocityExt.h
@@ -4,7 +4,7 @@
#include "AdaptInfo.h"
#include "DOFVector.h"
#include "Element.h"
-#include "FileWriter.h"
+#include "io/FileWriter.h"
#include "FixVec.h"
using namespace AMDiS;
diff --git a/AMDiS/bin/Makefile.in b/AMDiS/bin/Makefile.in
index 2afe484d65f9ed1156c04f16c879a3fa4e1a738e..fcc580f5884549096899b213e64a6573a9615e25 100644
--- a/AMDiS/bin/Makefile.in
+++ b/AMDiS/bin/Makefile.in
@@ -109,11 +109,11 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/parallel/ElementObjectData.h \
$(SOURCE_DIR)/parallel/ElementObjectData.cc \
$(SOURCE_DIR)/DOFIndexed.h $(SOURCE_DIR)/DOFIndexed.cc \
- $(SOURCE_DIR)/GNUPlotWriter.h $(SOURCE_DIR)/GNUPlotWriter.cc \
- $(SOURCE_DIR)/VertexVector.h $(SOURCE_DIR)/VertexVector.cc \
- $(SOURCE_DIR)/PeriodicBC.h $(SOURCE_DIR)/PeriodicBC.cc \
- $(SOURCE_DIR)/Recovery.h $(SOURCE_DIR)/Recovery.cc \
- $(SOURCE_DIR)/RecoveryEstimator.h \
+ $(SOURCE_DIR)/io/GNUPlotWriter.h \
+ $(SOURCE_DIR)/io/GNUPlotWriter.cc $(SOURCE_DIR)/VertexVector.h \
+ $(SOURCE_DIR)/VertexVector.cc $(SOURCE_DIR)/PeriodicBC.h \
+ $(SOURCE_DIR)/PeriodicBC.cc $(SOURCE_DIR)/Recovery.h \
+ $(SOURCE_DIR)/Recovery.cc $(SOURCE_DIR)/RecoveryEstimator.h \
$(SOURCE_DIR)/RecoveryEstimator.cc \
$(SOURCE_DIR)/ResidualEstimator.h \
$(SOURCE_DIR)/ResidualEstimator.cc $(SOURCE_DIR)/Cholesky.h \
@@ -139,10 +139,10 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/ProblemInterpolVec.h \
$(SOURCE_DIR)/ProblemInterpolVec.cc \
$(SOURCE_DIR)/Serializable.h $(SOURCE_DIR)/BallProject.h \
- $(SOURCE_DIR)/CylinderProject.h $(SOURCE_DIR)/MacroInfo.h \
- $(SOURCE_DIR)/MacroInfo.cc $(SOURCE_DIR)/MacroReader.h \
- $(SOURCE_DIR)/MacroReader.cc $(SOURCE_DIR)/ValueReader.h \
- $(SOURCE_DIR)/ValueReader.cc $(SOURCE_DIR)/Projection.h \
+ $(SOURCE_DIR)/CylinderProject.h $(SOURCE_DIR)/io/MacroInfo.h \
+ $(SOURCE_DIR)/io/MacroInfo.cc $(SOURCE_DIR)/io/MacroReader.h \
+ $(SOURCE_DIR)/io/MacroReader.cc $(SOURCE_DIR)/io/ValueReader.h \
+ $(SOURCE_DIR)/io/ValueReader.cc $(SOURCE_DIR)/Projection.h \
$(SOURCE_DIR)/Projection.cc $(SOURCE_DIR)/SubAssembler.h \
$(SOURCE_DIR)/SubAssembler.cc \
$(SOURCE_DIR)/ZeroOrderAssembler.h \
@@ -162,9 +162,10 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/DirichletBC.cc $(SOURCE_DIR)/RobinBC.h \
$(SOURCE_DIR)/RobinBC.cc $(SOURCE_DIR)/AbstractFunction.h \
$(SOURCE_DIR)/ProblemStatBase.h $(SOURCE_DIR)/DOFContainer.h \
- $(SOURCE_DIR)/FileWriter.h $(SOURCE_DIR)/FileWriter.hh \
- $(SOURCE_DIR)/FileWriter.cc $(SOURCE_DIR)/ElementFileWriter.h \
- $(SOURCE_DIR)/ElementFileWriter.cc $(SOURCE_DIR)/ElInfo.cc \
+ $(SOURCE_DIR)/io/FileWriter.h $(SOURCE_DIR)/io/FileWriter.hh \
+ $(SOURCE_DIR)/io/FileWriter.cc \
+ $(SOURCE_DIR)/io/ElementFileWriter.h \
+ $(SOURCE_DIR)/io/ElementFileWriter.cc $(SOURCE_DIR)/ElInfo.cc \
$(SOURCE_DIR)/ElInfoStack.h $(SOURCE_DIR)/ElInfoStack.cc \
$(SOURCE_DIR)/OperatorTerm.h $(SOURCE_DIR)/OperatorTerm.cc \
$(SOURCE_DIR)/ZeroOrderTerm.h $(SOURCE_DIR)/ZeroOrderTerm.cc \
@@ -204,7 +205,6 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/RefinementManager1d.h \
$(SOURCE_DIR)/RefinementManager2d.h \
$(SOURCE_DIR)/RefinementManager3d.h \
- $(SOURCE_DIR)/TecPlotWriter.h $(SOURCE_DIR)/TecPlotWriter.hh \
$(SOURCE_DIR)/Tetrahedron.h $(SOURCE_DIR)/Traverse.h \
$(SOURCE_DIR)/Triangle.h $(SOURCE_DIR)/NonLinSolver.h \
$(SOURCE_DIR)/NonLinSolver.hh $(SOURCE_DIR)/ProblemInstat.h \
@@ -214,8 +214,8 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/NonLinUpdater.h $(SOURCE_DIR)/NonLinUpdater.cc \
$(SOURCE_DIR)/Newton.h $(SOURCE_DIR)/Newton.hh \
$(SOURCE_DIR)/NewtonFS.h $(SOURCE_DIR)/NewtonFS.hh \
- $(SOURCE_DIR)/GridWriter.h $(SOURCE_DIR)/GridWriter.hh \
- $(SOURCE_DIR)/ValueWriter.h $(SOURCE_DIR)/QPsiPhi.cc \
+ $(SOURCE_DIR)/io/GridWriter.h $(SOURCE_DIR)/io/GridWriter.hh \
+ $(SOURCE_DIR)/io/ValueWriter.h $(SOURCE_DIR)/QPsiPhi.cc \
$(SOURCE_DIR)/BasisFunction.cc $(SOURCE_DIR)/Boundary.cc \
$(SOURCE_DIR)/CoarseningManager.cc \
$(SOURCE_DIR)/CoarseningManager1d.cc \
@@ -226,7 +226,7 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/ElInfo3d.cc $(SOURCE_DIR)/FiniteElemSpace.cc \
$(SOURCE_DIR)/FixVec.cc $(SOURCE_DIR)/Global.cc \
$(SOURCE_DIR)/Lagrange.cc $(SOURCE_DIR)/Line.cc \
- $(SOURCE_DIR)/MacroElement.cc $(SOURCE_DIR)/MacroWriter.cc \
+ $(SOURCE_DIR)/MacroElement.cc $(SOURCE_DIR)/io/MacroWriter.cc \
$(SOURCE_DIR)/Parameters.cc $(SOURCE_DIR)/Parametric.cc \
$(SOURCE_DIR)/Quadrature.cc $(SOURCE_DIR)/RCNeighbourList.cc \
$(SOURCE_DIR)/RefinementManager.cc \
@@ -236,14 +236,14 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/Tetrahedron.cc $(SOURCE_DIR)/Traverse.cc \
$(SOURCE_DIR)/TraverseParallel.h \
$(SOURCE_DIR)/TraverseParallel.cc $(SOURCE_DIR)/Triangle.cc \
- $(SOURCE_DIR)/TecPlotWriter.cc $(SOURCE_DIR)/ValueWriter.cc \
- $(SOURCE_DIR)/VtkWriter.h $(SOURCE_DIR)/VtkWriter.cc \
- $(SOURCE_DIR)/PngWriter.h $(SOURCE_DIR)/PngWriter.cc \
- $(SOURCE_DIR)/PovrayWriter.h $(SOURCE_DIR)/PovrayWriter.cc \
- $(SOURCE_DIR)/DataCollector.h $(SOURCE_DIR)/DataCollector.cc \
- $(SOURCE_DIR)/ElementInfo.h $(SOURCE_DIR)/VertexInfo.h \
- $(SOURCE_DIR)/PeriodicInfo.h $(SOURCE_DIR)/OpenMP.h \
- $(SOURCE_DIR)/ScalableQuadrature.h \
+ $(SOURCE_DIR)/io/ValueWriter.cc $(SOURCE_DIR)/io/VtkWriter.h \
+ $(SOURCE_DIR)/io/VtkWriter.cc $(SOURCE_DIR)/io/PngWriter.h \
+ $(SOURCE_DIR)/io/PngWriter.cc $(SOURCE_DIR)/io/PovrayWriter.h \
+ $(SOURCE_DIR)/io/PovrayWriter.cc \
+ $(SOURCE_DIR)/io/DataCollector.h \
+ $(SOURCE_DIR)/io/DataCollector.cc $(SOURCE_DIR)/ElementInfo.h \
+ $(SOURCE_DIR)/VertexInfo.h $(SOURCE_DIR)/PeriodicInfo.h \
+ $(SOURCE_DIR)/OpenMP.h $(SOURCE_DIR)/ScalableQuadrature.h \
$(SOURCE_DIR)/ScalableQuadrature.cc $(SOURCE_DIR)/SubElInfo.h \
$(SOURCE_DIR)/SubElInfo.cc $(SOURCE_DIR)/SolutionDataStorage.h \
$(SOURCE_DIR)/SolutionDataStorage.hh \
@@ -252,8 +252,8 @@ am__libamdis_la_SOURCES_DIST = $(SOURCE_DIR)/parallel/StdMpi.h \
$(SOURCE_DIR)/parallel/InteriorBoundary.h \
$(SOURCE_DIR)/parallel/InteriorBoundary.cc \
$(SOURCE_DIR)/Debug.h $(SOURCE_DIR)/Debug.cc \
- $(SOURCE_DIR)/ArhReader.h $(SOURCE_DIR)/ArhReader.cc \
- $(SOURCE_DIR)/ArhWriter.h $(SOURCE_DIR)/ArhWriter.cc \
+ $(SOURCE_DIR)/io/ArhReader.h $(SOURCE_DIR)/io/ArhReader.cc \
+ $(SOURCE_DIR)/io/ArhWriter.h $(SOURCE_DIR)/io/ArhWriter.cc \
$(SOURCE_DIR)/time/RosenbrockAdaptInstationary.h \
$(SOURCE_DIR)/time/RosenbrockAdaptInstationary.cc \
$(SOURCE_DIR)/time/RosenbrockStationary.h \
@@ -318,11 +318,11 @@ am_libamdis_la_OBJECTS = $(am__objects_2) libamdis_la-DOFIndexed.lo \
libamdis_la-RefinementManager2d.lo \
libamdis_la-RefinementManager3d.lo libamdis_la-Tetrahedron.lo \
libamdis_la-Traverse.lo libamdis_la-TraverseParallel.lo \
- libamdis_la-Triangle.lo libamdis_la-TecPlotWriter.lo \
- libamdis_la-ValueWriter.lo libamdis_la-VtkWriter.lo \
- libamdis_la-PngWriter.lo libamdis_la-PovrayWriter.lo \
- libamdis_la-DataCollector.lo libamdis_la-ScalableQuadrature.lo \
- libamdis_la-SubElInfo.lo libamdis_la-ElementDofIterator.lo \
+ libamdis_la-Triangle.lo libamdis_la-ValueWriter.lo \
+ libamdis_la-VtkWriter.lo libamdis_la-PngWriter.lo \
+ libamdis_la-PovrayWriter.lo libamdis_la-DataCollector.lo \
+ libamdis_la-ScalableQuadrature.lo libamdis_la-SubElInfo.lo \
+ libamdis_la-ElementDofIterator.lo \
libamdis_la-InteriorBoundary.lo libamdis_la-Debug.lo \
libamdis_la-ArhReader.lo libamdis_la-ArhWriter.lo \
libamdis_la-RosenbrockAdaptInstationary.lo \
@@ -513,7 +513,7 @@ INCLUDES = $(AMDIS_INCLUDES) $(PARALLEL_INCLUDES) $(TEMPLATE_INCLUDES)
libamdis_la_SOURCES = \
$(PARALLEL_AMDIS_SOURCES) \
$(SOURCE_DIR)/DOFIndexed.h $(SOURCE_DIR)/DOFIndexed.cc \
-$(SOURCE_DIR)/GNUPlotWriter.h $(SOURCE_DIR)/GNUPlotWriter.cc \
+$(SOURCE_DIR)/io/GNUPlotWriter.h $(SOURCE_DIR)/io/GNUPlotWriter.cc \
$(SOURCE_DIR)/VertexVector.h $(SOURCE_DIR)/VertexVector.cc \
$(SOURCE_DIR)/PeriodicBC.h $(SOURCE_DIR)/PeriodicBC.cc \
$(SOURCE_DIR)/Recovery.h $(SOURCE_DIR)/Recovery.cc \
@@ -538,9 +538,9 @@ $(SOURCE_DIR)/ProblemInterpolVec.h $(SOURCE_DIR)/ProblemInterpolVec.cc \
$(SOURCE_DIR)/Serializable.h \
$(SOURCE_DIR)/BallProject.h \
$(SOURCE_DIR)/CylinderProject.h \
-$(SOURCE_DIR)/MacroInfo.h $(SOURCE_DIR)/MacroInfo.cc \
-$(SOURCE_DIR)/MacroReader.h $(SOURCE_DIR)/MacroReader.cc \
-$(SOURCE_DIR)/ValueReader.h $(SOURCE_DIR)/ValueReader.cc \
+$(SOURCE_DIR)/io/MacroInfo.h $(SOURCE_DIR)/io/MacroInfo.cc \
+$(SOURCE_DIR)/io/MacroReader.h $(SOURCE_DIR)/io/MacroReader.cc \
+$(SOURCE_DIR)/io/ValueReader.h $(SOURCE_DIR)/io/ValueReader.cc \
$(SOURCE_DIR)/Projection.h $(SOURCE_DIR)/Projection.cc \
$(SOURCE_DIR)/SubAssembler.h $(SOURCE_DIR)/SubAssembler.cc \
$(SOURCE_DIR)/ZeroOrderAssembler.h $(SOURCE_DIR)/ZeroOrderAssembler.cc \
@@ -559,8 +559,8 @@ $(SOURCE_DIR)/RobinBC.h $(SOURCE_DIR)/RobinBC.cc \
$(SOURCE_DIR)/AbstractFunction.h \
$(SOURCE_DIR)/ProblemStatBase.h \
$(SOURCE_DIR)/DOFContainer.h \
-$(SOURCE_DIR)/FileWriter.h $(SOURCE_DIR)/FileWriter.hh $(SOURCE_DIR)/FileWriter.cc \
-$(SOURCE_DIR)/ElementFileWriter.h $(SOURCE_DIR)/ElementFileWriter.cc \
+$(SOURCE_DIR)/io/FileWriter.h $(SOURCE_DIR)/io/FileWriter.hh $(SOURCE_DIR)/io/FileWriter.cc \
+$(SOURCE_DIR)/io/ElementFileWriter.h $(SOURCE_DIR)/io/ElementFileWriter.cc \
$(SOURCE_DIR)/ElInfo.cc \
$(SOURCE_DIR)/ElInfoStack.h $(SOURCE_DIR)/ElInfoStack.cc \
$(SOURCE_DIR)/OperatorTerm.h $(SOURCE_DIR)/OperatorTerm.cc \
@@ -606,7 +606,6 @@ $(SOURCE_DIRe)/RefinementManager.h \
$(SOURCE_DIR)/RefinementManager1d.h \
$(SOURCE_DIR)/RefinementManager2d.h \
$(SOURCE_DIR)/RefinementManager3d.h \
-$(SOURCE_DIR)/TecPlotWriter.h $(SOURCE_DIR)/TecPlotWriter.hh \
$(SOURCE_DIR)/Tetrahedron.h \
$(SOURCE_DIR)/Traverse.h \
$(SOURCE_DIR)/Triangle.h \
@@ -617,8 +616,8 @@ $(SOURCE_DIR)/ProblemNonLin.h $(SOURCE_DIR)/ProblemNonLin.cc \
$(SOURCE_DIR)/NonLinUpdater.h $(SOURCE_DIR)/NonLinUpdater.cc \
$(SOURCE_DIR)/Newton.h $(SOURCE_DIR)/Newton.hh \
$(SOURCE_DIR)/NewtonFS.h $(SOURCE_DIR)/NewtonFS.hh \
-$(SOURCE_DIR)/GridWriter.h $(SOURCE_DIR)/GridWriter.hh \
-$(SOURCE_DIR)/ValueWriter.h \
+$(SOURCE_DIR)/io/GridWriter.h $(SOURCE_DIR)/io/GridWriter.hh \
+$(SOURCE_DIR)/io/ValueWriter.h \
$(SOURCE_DIR)/QPsiPhi.cc \
$(SOURCE_DIR)/BasisFunction.cc \
$(SOURCE_DIR)/Boundary.cc \
@@ -638,7 +637,7 @@ $(SOURCE_DIR)/Global.cc \
$(SOURCE_DIR)/Lagrange.cc \
$(SOURCE_DIR)/Line.cc \
$(SOURCE_DIR)/MacroElement.cc \
-$(SOURCE_DIR)/MacroWriter.cc \
+$(SOURCE_DIR)/io/MacroWriter.cc \
$(SOURCE_DIR)/Parameters.cc \
$(SOURCE_DIR)/Parametric.cc \
$(SOURCE_DIR)/Quadrature.cc \
@@ -651,12 +650,11 @@ $(SOURCE_DIR)/Tetrahedron.cc \
$(SOURCE_DIR)/Traverse.cc \
$(SOURCE_DIR)/TraverseParallel.h $(SOURCE_DIR)/TraverseParallel.cc \
$(SOURCE_DIR)/Triangle.cc \
-$(SOURCE_DIR)/TecPlotWriter.cc \
-$(SOURCE_DIR)/ValueWriter.cc \
-$(SOURCE_DIR)/VtkWriter.h $(SOURCE_DIR)/VtkWriter.cc \
-$(SOURCE_DIR)/PngWriter.h $(SOURCE_DIR)/PngWriter.cc \
-$(SOURCE_DIR)/PovrayWriter.h $(SOURCE_DIR)/PovrayWriter.cc \
-$(SOURCE_DIR)/DataCollector.h $(SOURCE_DIR)/DataCollector.cc \
+$(SOURCE_DIR)/io/ValueWriter.cc \
+$(SOURCE_DIR)/io/VtkWriter.h $(SOURCE_DIR)/io/VtkWriter.cc \
+$(SOURCE_DIR)/io/PngWriter.h $(SOURCE_DIR)/io/PngWriter.cc \
+$(SOURCE_DIR)/io/PovrayWriter.h $(SOURCE_DIR)/io/PovrayWriter.cc \
+$(SOURCE_DIR)/io/DataCollector.h $(SOURCE_DIR)/io/DataCollector.cc \
$(SOURCE_DIR)/ElementInfo.h \
$(SOURCE_DIR)/VertexInfo.h \
$(SOURCE_DIR)/PeriodicInfo.h \
@@ -667,8 +665,8 @@ $(SOURCE_DIR)/SolutionDataStorage.h $(SOURCE_DIR)/SolutionDataStorage.hh \
$(SOURCE_DIR)/ElementDofIteartor.h $(SOURCE_DIR)/ElementDofIterator.cc \
$(SOURCE_DIR)/parallel/InteriorBoundary.h $(SOURCE_DIR)/parallel/InteriorBoundary.cc \
$(SOURCE_DIR)/Debug.h $(SOURCE_DIR)/Debug.cc \
-$(SOURCE_DIR)/ArhReader.h $(SOURCE_DIR)/ArhReader.cc \
-$(SOURCE_DIR)/ArhWriter.h $(SOURCE_DIR)/ArhWriter.cc \
+$(SOURCE_DIR)/io/ArhReader.h $(SOURCE_DIR)/io/ArhReader.cc \
+$(SOURCE_DIR)/io/ArhWriter.h $(SOURCE_DIR)/io/ArhWriter.cc \
$(SOURCE_DIR)/time/RosenbrockAdaptInstationary.h $(SOURCE_DIR)/time/RosenbrockAdaptInstationary.cc \
$(SOURCE_DIR)/time/RosenbrockStationary.h $(SOURCE_DIR)/time/RosenbrockStationary.cc \
$(SOURCE_DIR)/time/RosenbrockMethod.h $(SOURCE_DIR)/time/RosenbrockMethod.cc
@@ -868,7 +866,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-SubAssembler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-SubElInfo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-SurfaceQuadrature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-TecPlotWriter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Tetrahedron.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Traverse.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-TraverseParallel.Plo@am__quote@
@@ -973,12 +970,12 @@ libamdis_la-DOFIndexed.lo: $(SOURCE_DIR)/DOFIndexed.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-DOFIndexed.lo `test -f '$(SOURCE_DIR)/DOFIndexed.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/DOFIndexed.cc
-libamdis_la-GNUPlotWriter.lo: $(SOURCE_DIR)/GNUPlotWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-GNUPlotWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-GNUPlotWriter.Tpo -c -o libamdis_la-GNUPlotWriter.lo `test -f '$(SOURCE_DIR)/GNUPlotWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/GNUPlotWriter.cc
+libamdis_la-GNUPlotWriter.lo: $(SOURCE_DIR)/io/GNUPlotWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-GNUPlotWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-GNUPlotWriter.Tpo -c -o libamdis_la-GNUPlotWriter.lo `test -f '$(SOURCE_DIR)/io/GNUPlotWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/GNUPlotWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-GNUPlotWriter.Tpo $(DEPDIR)/libamdis_la-GNUPlotWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/GNUPlotWriter.cc' object='libamdis_la-GNUPlotWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/GNUPlotWriter.cc' object='libamdis_la-GNUPlotWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-GNUPlotWriter.lo `test -f '$(SOURCE_DIR)/GNUPlotWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/GNUPlotWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-GNUPlotWriter.lo `test -f '$(SOURCE_DIR)/io/GNUPlotWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/GNUPlotWriter.cc
libamdis_la-VertexVector.lo: $(SOURCE_DIR)/VertexVector.cc
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-VertexVector.lo -MD -MP -MF $(DEPDIR)/libamdis_la-VertexVector.Tpo -c -o libamdis_la-VertexVector.lo `test -f '$(SOURCE_DIR)/VertexVector.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/VertexVector.cc
@@ -1099,26 +1096,26 @@ libamdis_la-ProblemInterpolVec.lo: $(SOURCE_DIR)/ProblemInterpolVec.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ProblemInterpolVec.lo `test -f '$(SOURCE_DIR)/ProblemInterpolVec.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ProblemInterpolVec.cc
-libamdis_la-MacroInfo.lo: $(SOURCE_DIR)/MacroInfo.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MacroInfo.lo -MD -MP -MF $(DEPDIR)/libamdis_la-MacroInfo.Tpo -c -o libamdis_la-MacroInfo.lo `test -f '$(SOURCE_DIR)/MacroInfo.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MacroInfo.cc
+libamdis_la-MacroInfo.lo: $(SOURCE_DIR)/io/MacroInfo.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MacroInfo.lo -MD -MP -MF $(DEPDIR)/libamdis_la-MacroInfo.Tpo -c -o libamdis_la-MacroInfo.lo `test -f '$(SOURCE_DIR)/io/MacroInfo.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/MacroInfo.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-MacroInfo.Tpo $(DEPDIR)/libamdis_la-MacroInfo.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MacroInfo.cc' object='libamdis_la-MacroInfo.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/MacroInfo.cc' object='libamdis_la-MacroInfo.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MacroInfo.lo `test -f '$(SOURCE_DIR)/MacroInfo.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MacroInfo.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MacroInfo.lo `test -f '$(SOURCE_DIR)/io/MacroInfo.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/MacroInfo.cc
-libamdis_la-MacroReader.lo: $(SOURCE_DIR)/MacroReader.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MacroReader.lo -MD -MP -MF $(DEPDIR)/libamdis_la-MacroReader.Tpo -c -o libamdis_la-MacroReader.lo `test -f '$(SOURCE_DIR)/MacroReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MacroReader.cc
+libamdis_la-MacroReader.lo: $(SOURCE_DIR)/io/MacroReader.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MacroReader.lo -MD -MP -MF $(DEPDIR)/libamdis_la-MacroReader.Tpo -c -o libamdis_la-MacroReader.lo `test -f '$(SOURCE_DIR)/io/MacroReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/MacroReader.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-MacroReader.Tpo $(DEPDIR)/libamdis_la-MacroReader.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MacroReader.cc' object='libamdis_la-MacroReader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/MacroReader.cc' object='libamdis_la-MacroReader.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MacroReader.lo `test -f '$(SOURCE_DIR)/MacroReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MacroReader.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MacroReader.lo `test -f '$(SOURCE_DIR)/io/MacroReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/MacroReader.cc
-libamdis_la-ValueReader.lo: $(SOURCE_DIR)/ValueReader.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ValueReader.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ValueReader.Tpo -c -o libamdis_la-ValueReader.lo `test -f '$(SOURCE_DIR)/ValueReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ValueReader.cc
+libamdis_la-ValueReader.lo: $(SOURCE_DIR)/io/ValueReader.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ValueReader.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ValueReader.Tpo -c -o libamdis_la-ValueReader.lo `test -f '$(SOURCE_DIR)/io/ValueReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ValueReader.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-ValueReader.Tpo $(DEPDIR)/libamdis_la-ValueReader.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/ValueReader.cc' object='libamdis_la-ValueReader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/ValueReader.cc' object='libamdis_la-ValueReader.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ValueReader.lo `test -f '$(SOURCE_DIR)/ValueReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ValueReader.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ValueReader.lo `test -f '$(SOURCE_DIR)/io/ValueReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ValueReader.cc
libamdis_la-Projection.lo: $(SOURCE_DIR)/Projection.cc
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-Projection.lo -MD -MP -MF $(DEPDIR)/libamdis_la-Projection.Tpo -c -o libamdis_la-Projection.lo `test -f '$(SOURCE_DIR)/Projection.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/Projection.cc
@@ -1211,19 +1208,19 @@ libamdis_la-RobinBC.lo: $(SOURCE_DIR)/RobinBC.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-RobinBC.lo `test -f '$(SOURCE_DIR)/RobinBC.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/RobinBC.cc
-libamdis_la-FileWriter.lo: $(SOURCE_DIR)/FileWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-FileWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-FileWriter.Tpo -c -o libamdis_la-FileWriter.lo `test -f '$(SOURCE_DIR)/FileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/FileWriter.cc
+libamdis_la-FileWriter.lo: $(SOURCE_DIR)/io/FileWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-FileWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-FileWriter.Tpo -c -o libamdis_la-FileWriter.lo `test -f '$(SOURCE_DIR)/io/FileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/FileWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-FileWriter.Tpo $(DEPDIR)/libamdis_la-FileWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/FileWriter.cc' object='libamdis_la-FileWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/FileWriter.cc' object='libamdis_la-FileWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-FileWriter.lo `test -f '$(SOURCE_DIR)/FileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/FileWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-FileWriter.lo `test -f '$(SOURCE_DIR)/io/FileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/FileWriter.cc
-libamdis_la-ElementFileWriter.lo: $(SOURCE_DIR)/ElementFileWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ElementFileWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ElementFileWriter.Tpo -c -o libamdis_la-ElementFileWriter.lo `test -f '$(SOURCE_DIR)/ElementFileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ElementFileWriter.cc
+libamdis_la-ElementFileWriter.lo: $(SOURCE_DIR)/io/ElementFileWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ElementFileWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ElementFileWriter.Tpo -c -o libamdis_la-ElementFileWriter.lo `test -f '$(SOURCE_DIR)/io/ElementFileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ElementFileWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-ElementFileWriter.Tpo $(DEPDIR)/libamdis_la-ElementFileWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/ElementFileWriter.cc' object='libamdis_la-ElementFileWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/ElementFileWriter.cc' object='libamdis_la-ElementFileWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ElementFileWriter.lo `test -f '$(SOURCE_DIR)/ElementFileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ElementFileWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ElementFileWriter.lo `test -f '$(SOURCE_DIR)/io/ElementFileWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ElementFileWriter.cc
libamdis_la-ElInfo.lo: $(SOURCE_DIR)/ElInfo.cc
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ElInfo.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ElInfo.Tpo -c -o libamdis_la-ElInfo.lo `test -f '$(SOURCE_DIR)/ElInfo.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ElInfo.cc
@@ -1470,12 +1467,12 @@ libamdis_la-MacroElement.lo: $(SOURCE_DIR)/MacroElement.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MacroElement.lo `test -f '$(SOURCE_DIR)/MacroElement.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MacroElement.cc
-libamdis_la-MacroWriter.lo: $(SOURCE_DIR)/MacroWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MacroWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-MacroWriter.Tpo -c -o libamdis_la-MacroWriter.lo `test -f '$(SOURCE_DIR)/MacroWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MacroWriter.cc
+libamdis_la-MacroWriter.lo: $(SOURCE_DIR)/io/MacroWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MacroWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-MacroWriter.Tpo -c -o libamdis_la-MacroWriter.lo `test -f '$(SOURCE_DIR)/io/MacroWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/MacroWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-MacroWriter.Tpo $(DEPDIR)/libamdis_la-MacroWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MacroWriter.cc' object='libamdis_la-MacroWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/MacroWriter.cc' object='libamdis_la-MacroWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MacroWriter.lo `test -f '$(SOURCE_DIR)/MacroWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MacroWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MacroWriter.lo `test -f '$(SOURCE_DIR)/io/MacroWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/MacroWriter.cc
libamdis_la-Parameters.lo: $(SOURCE_DIR)/Parameters.cc
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-Parameters.lo -MD -MP -MF $(DEPDIR)/libamdis_la-Parameters.Tpo -c -o libamdis_la-Parameters.lo `test -f '$(SOURCE_DIR)/Parameters.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/Parameters.cc
@@ -1561,47 +1558,40 @@ libamdis_la-Triangle.lo: $(SOURCE_DIR)/Triangle.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-Triangle.lo `test -f '$(SOURCE_DIR)/Triangle.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/Triangle.cc
-libamdis_la-TecPlotWriter.lo: $(SOURCE_DIR)/TecPlotWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-TecPlotWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-TecPlotWriter.Tpo -c -o libamdis_la-TecPlotWriter.lo `test -f '$(SOURCE_DIR)/TecPlotWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/TecPlotWriter.cc
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-TecPlotWriter.Tpo $(DEPDIR)/libamdis_la-TecPlotWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/TecPlotWriter.cc' object='libamdis_la-TecPlotWriter.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-TecPlotWriter.lo `test -f '$(SOURCE_DIR)/TecPlotWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/TecPlotWriter.cc
-
-libamdis_la-ValueWriter.lo: $(SOURCE_DIR)/ValueWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ValueWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ValueWriter.Tpo -c -o libamdis_la-ValueWriter.lo `test -f '$(SOURCE_DIR)/ValueWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ValueWriter.cc
+libamdis_la-ValueWriter.lo: $(SOURCE_DIR)/io/ValueWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ValueWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ValueWriter.Tpo -c -o libamdis_la-ValueWriter.lo `test -f '$(SOURCE_DIR)/io/ValueWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ValueWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-ValueWriter.Tpo $(DEPDIR)/libamdis_la-ValueWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/ValueWriter.cc' object='libamdis_la-ValueWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/ValueWriter.cc' object='libamdis_la-ValueWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ValueWriter.lo `test -f '$(SOURCE_DIR)/ValueWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ValueWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ValueWriter.lo `test -f '$(SOURCE_DIR)/io/ValueWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ValueWriter.cc
-libamdis_la-VtkWriter.lo: $(SOURCE_DIR)/VtkWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-VtkWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-VtkWriter.Tpo -c -o libamdis_la-VtkWriter.lo `test -f '$(SOURCE_DIR)/VtkWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/VtkWriter.cc
+libamdis_la-VtkWriter.lo: $(SOURCE_DIR)/io/VtkWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-VtkWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-VtkWriter.Tpo -c -o libamdis_la-VtkWriter.lo `test -f '$(SOURCE_DIR)/io/VtkWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/VtkWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-VtkWriter.Tpo $(DEPDIR)/libamdis_la-VtkWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/VtkWriter.cc' object='libamdis_la-VtkWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/VtkWriter.cc' object='libamdis_la-VtkWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-VtkWriter.lo `test -f '$(SOURCE_DIR)/VtkWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/VtkWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-VtkWriter.lo `test -f '$(SOURCE_DIR)/io/VtkWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/VtkWriter.cc
-libamdis_la-PngWriter.lo: $(SOURCE_DIR)/PngWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-PngWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-PngWriter.Tpo -c -o libamdis_la-PngWriter.lo `test -f '$(SOURCE_DIR)/PngWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/PngWriter.cc
+libamdis_la-PngWriter.lo: $(SOURCE_DIR)/io/PngWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-PngWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-PngWriter.Tpo -c -o libamdis_la-PngWriter.lo `test -f '$(SOURCE_DIR)/io/PngWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/PngWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-PngWriter.Tpo $(DEPDIR)/libamdis_la-PngWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/PngWriter.cc' object='libamdis_la-PngWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/PngWriter.cc' object='libamdis_la-PngWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-PngWriter.lo `test -f '$(SOURCE_DIR)/PngWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/PngWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-PngWriter.lo `test -f '$(SOURCE_DIR)/io/PngWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/PngWriter.cc
-libamdis_la-PovrayWriter.lo: $(SOURCE_DIR)/PovrayWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-PovrayWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-PovrayWriter.Tpo -c -o libamdis_la-PovrayWriter.lo `test -f '$(SOURCE_DIR)/PovrayWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/PovrayWriter.cc
+libamdis_la-PovrayWriter.lo: $(SOURCE_DIR)/io/PovrayWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-PovrayWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-PovrayWriter.Tpo -c -o libamdis_la-PovrayWriter.lo `test -f '$(SOURCE_DIR)/io/PovrayWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/PovrayWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-PovrayWriter.Tpo $(DEPDIR)/libamdis_la-PovrayWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/PovrayWriter.cc' object='libamdis_la-PovrayWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/PovrayWriter.cc' object='libamdis_la-PovrayWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-PovrayWriter.lo `test -f '$(SOURCE_DIR)/PovrayWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/PovrayWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-PovrayWriter.lo `test -f '$(SOURCE_DIR)/io/PovrayWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/PovrayWriter.cc
-libamdis_la-DataCollector.lo: $(SOURCE_DIR)/DataCollector.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-DataCollector.lo -MD -MP -MF $(DEPDIR)/libamdis_la-DataCollector.Tpo -c -o libamdis_la-DataCollector.lo `test -f '$(SOURCE_DIR)/DataCollector.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/DataCollector.cc
+libamdis_la-DataCollector.lo: $(SOURCE_DIR)/io/DataCollector.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-DataCollector.lo -MD -MP -MF $(DEPDIR)/libamdis_la-DataCollector.Tpo -c -o libamdis_la-DataCollector.lo `test -f '$(SOURCE_DIR)/io/DataCollector.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/DataCollector.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-DataCollector.Tpo $(DEPDIR)/libamdis_la-DataCollector.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/DataCollector.cc' object='libamdis_la-DataCollector.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/DataCollector.cc' object='libamdis_la-DataCollector.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-DataCollector.lo `test -f '$(SOURCE_DIR)/DataCollector.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/DataCollector.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-DataCollector.lo `test -f '$(SOURCE_DIR)/io/DataCollector.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/DataCollector.cc
libamdis_la-ScalableQuadrature.lo: $(SOURCE_DIR)/ScalableQuadrature.cc
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ScalableQuadrature.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ScalableQuadrature.Tpo -c -o libamdis_la-ScalableQuadrature.lo `test -f '$(SOURCE_DIR)/ScalableQuadrature.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ScalableQuadrature.cc
@@ -1638,19 +1628,19 @@ libamdis_la-Debug.lo: $(SOURCE_DIR)/Debug.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-Debug.lo `test -f '$(SOURCE_DIR)/Debug.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/Debug.cc
-libamdis_la-ArhReader.lo: $(SOURCE_DIR)/ArhReader.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ArhReader.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ArhReader.Tpo -c -o libamdis_la-ArhReader.lo `test -f '$(SOURCE_DIR)/ArhReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ArhReader.cc
+libamdis_la-ArhReader.lo: $(SOURCE_DIR)/io/ArhReader.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ArhReader.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ArhReader.Tpo -c -o libamdis_la-ArhReader.lo `test -f '$(SOURCE_DIR)/io/ArhReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ArhReader.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-ArhReader.Tpo $(DEPDIR)/libamdis_la-ArhReader.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/ArhReader.cc' object='libamdis_la-ArhReader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/ArhReader.cc' object='libamdis_la-ArhReader.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ArhReader.lo `test -f '$(SOURCE_DIR)/ArhReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ArhReader.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ArhReader.lo `test -f '$(SOURCE_DIR)/io/ArhReader.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ArhReader.cc
-libamdis_la-ArhWriter.lo: $(SOURCE_DIR)/ArhWriter.cc
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ArhWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ArhWriter.Tpo -c -o libamdis_la-ArhWriter.lo `test -f '$(SOURCE_DIR)/ArhWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ArhWriter.cc
+libamdis_la-ArhWriter.lo: $(SOURCE_DIR)/io/ArhWriter.cc
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-ArhWriter.lo -MD -MP -MF $(DEPDIR)/libamdis_la-ArhWriter.Tpo -c -o libamdis_la-ArhWriter.lo `test -f '$(SOURCE_DIR)/io/ArhWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ArhWriter.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libamdis_la-ArhWriter.Tpo $(DEPDIR)/libamdis_la-ArhWriter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/ArhWriter.cc' object='libamdis_la-ArhWriter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/io/ArhWriter.cc' object='libamdis_la-ArhWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ArhWriter.lo `test -f '$(SOURCE_DIR)/ArhWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ArhWriter.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ArhWriter.lo `test -f '$(SOURCE_DIR)/io/ArhWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/io/ArhWriter.cc
libamdis_la-RosenbrockAdaptInstationary.lo: $(SOURCE_DIR)/time/RosenbrockAdaptInstationary.cc
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-RosenbrockAdaptInstationary.lo -MD -MP -MF $(DEPDIR)/libamdis_la-RosenbrockAdaptInstationary.Tpo -c -o libamdis_la-RosenbrockAdaptInstationary.lo `test -f '$(SOURCE_DIR)/time/RosenbrockAdaptInstationary.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/time/RosenbrockAdaptInstationary.cc
diff --git a/AMDiS/src/AMDiS.h b/AMDiS/src/AMDiS.h
index 293fb5b65cbf6e7c0214e753f8e58ef2a24a63e7..31531d625ce836794d885d1e795353f4b293d699 100644
--- a/AMDiS/src/AMDiS.h
+++ b/AMDiS/src/AMDiS.h
@@ -89,6 +89,7 @@
#include "TimedObject.h"
#include "Traverse.h"
#include "Triangle.h"
+#include "VertexVector.h"
#include "ZeroOrderTerm.h"
#include "io/ArhReader.h"
@@ -100,7 +101,6 @@
#include "io/PngWriter.h"
#include "io/PovrayWriter.h"
#include "io/ValueWriter.h"
-#include "io/VertexVector.h"
#include "io/VtkWriter.h"
#include "time/RosenbrockAdaptInstationary.h"
diff --git a/AMDiS/src/AdaptInstationary.cc b/AMDiS/src/AdaptInstationary.cc
index 6aa2d4b5469e46ae30b550567aa611704ef7272a..b7ab98c1d6969bacfe967b9104e5b55aec00d402 100644
--- a/AMDiS/src/AdaptInstationary.cc
+++ b/AMDiS/src/AdaptInstationary.cc
@@ -1,7 +1,6 @@
#include "AdaptInstationary.h"
#include "Parameters.h"
#include "Estimator.h"
-#include "TecPlotWriter.h"
#include "ProblemIterationInterface.h"
#include "ProblemTimeInterface.h"
#include "Serializer.h"
diff --git a/AMDiS/src/AdaptStationary.cc b/AMDiS/src/AdaptStationary.cc
index 1071a5e288741e310d4e37e340d226ceda214079..52352e41f4d9fe28d95ae2e8b3468f4ebd2aa472 100644
--- a/AMDiS/src/AdaptStationary.cc
+++ b/AMDiS/src/AdaptStationary.cc
@@ -1,7 +1,6 @@
#include "AdaptStationary.h"
#include "Parameters.h"
#include "Estimator.h"
-#include "TecPlotWriter.h"
#include "ProblemIterationInterface.h"
#include <math.h>
diff --git a/AMDiS/src/ProblemImplicit.h b/AMDiS/src/ProblemImplicit.h
index 49d1181b37c9f3ca02b5213b884b2c7d03b319f0..ba4648fb887f2ecbe13a657b65831d727dc08aae 100644
--- a/AMDiS/src/ProblemImplicit.h
+++ b/AMDiS/src/ProblemImplicit.h
@@ -22,7 +22,6 @@
#ifndef AMDIS_PROBLEMIMPLICIT_H
#define AMDIS_PROBLEMIMPLICIT_H
-#include "AMDiS.h"
#include "ProblemScal.h"
#include "ProblemVec.h"
diff --git a/AMDiS/src/RobinBC.h b/AMDiS/src/RobinBC.h
index cc4ec1e16ce02bdb58976dee54e5dbf88285356c..1014313d5f74218f99857ca299a4847f52459c36 100644
--- a/AMDiS/src/RobinBC.h
+++ b/AMDiS/src/RobinBC.h
@@ -25,7 +25,6 @@
#include "BoundaryCondition.h"
#include "AbstractFunction.h"
#include "DOFMatrix.h"
-#include "AMDiS.h"
namespace AMDiS {
diff --git a/AMDiS/src/io/FileWriter.cc b/AMDiS/src/io/FileWriter.cc
index 13f5425461e27e423f4a785cccbe960895797a1f..7bd5d001e74fd7231ea651401596c1908f5489e6 100644
--- a/AMDiS/src/io/FileWriter.cc
+++ b/AMDiS/src/io/FileWriter.cc
@@ -2,7 +2,6 @@
#include "FileWriter.h"
#include "SystemVector.h"
#include "Parameters.h"
-#include "TecPlotWriter.h"
#include "ValueWriter.h"
#include "MacroWriter.h"
#include "VtkWriter.h"
@@ -97,13 +96,11 @@ namespace AMDiS {
void FileWriter::initialize()
{
- tecplotExt = ".tec";
amdisMeshExt = ".mesh";
amdisDataExt = ".dat";
paraviewFileExt = ".vtu";
paraviewParallelFileExt = ".pvtu";
periodicFileExt = ".per";
- writeTecPlotFormat = 0;
writeAMDiSFormat = 0;
writeParaViewFormat = 0;
writeParaViewAnimation = 0;
@@ -127,8 +124,6 @@ namespace AMDiS {
FUNCNAME("FileWriter::readParamters()");
GET_PARAMETER(0, name + "->filename", &filename);
- GET_PARAMETER(0, name + "->TecPlot format", "%d", &writeTecPlotFormat);
- GET_PARAMETER(0, name + "->TecPlot ext", &tecplotExt);
GET_PARAMETER(0, name + "->AMDiS format", "%d", &writeAMDiSFormat);
GET_PARAMETER(0, name + "->AMDiS mesh ext", &amdisMeshExt);
GET_PARAMETER(0, name + "->AMDiS data ext", &amdisDataExt);
@@ -211,13 +206,6 @@ namespace AMDiS {
#endif
}
- if (writeTecPlotFormat) {
- TecPlotWriter<DOFVector<double> >::writeValues(solutionVecs[0],
- const_cast<char*>((fn + tecplotExt).c_str()),
- solutionVecs[0]->getName().c_str());
- MSG("TecPlot file written to %s\n", (fn + tecplotExt).c_str());
- }
-
if (writeAMDiSFormat) {
MacroWriter::writeMacro(dataCollectors[0],
const_cast<char*>((fn + amdisMeshExt).c_str()),
diff --git a/AMDiS/src/io/FileWriter.h b/AMDiS/src/io/FileWriter.h
index 4369ed57e0736d6042bc596fe52cbdc877fdcc56..099bdab65550308b0b4543d021d987ed5e6a4b43 100644
--- a/AMDiS/src/io/FileWriter.h
+++ b/AMDiS/src/io/FileWriter.h
@@ -138,9 +138,6 @@ namespace AMDiS {
/// Name of the writer.
std::string name;
- /// TecPlot file extension.
- std::string tecplotExt;
-
/// AMDiS mesh-file extension.
std::string amdisMeshExt;
@@ -156,9 +153,6 @@ namespace AMDiS {
/// Periodic file extension.
std::string periodicFileExt;
- /// 0: Don't write TecPlot files; 1: Write TecPlot files.
- int writeTecPlotFormat;
-
/// 0: Don't write AMDiS files; 1: Write AMDiS files.
int writeAMDiSFormat;