Commit 24469e7d authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Cleanup of last big merge!

parent 356c16ab
......@@ -65,25 +65,17 @@ endif
libamdis_la_SOURCES = \
$(PARALLEL_AMDIS_SOURCES) \
$(SOURCE_DIR)/MultiGridPreconWrapper.h $(SOURCE_DIR)/MultiGridPreconWrapper.cc \
$(SOURCE_DIR)/LagrangeInterpolRestrict.h \
$(SOURCE_DIR)/InterpolRestrictMatrix.h $(SOURCE_DIR)/InterpolRestrictMatrix.cc \
$(SOURCE_DIR)/DOFIndexed.h $(SOURCE_DIR)/DOFIndexed.cc \
$(SOURCE_DIR)/GNUPlotWriter.h $(SOURCE_DIR)/GNUPlotWriter.cc \
$(SOURCE_DIR)/SmootherBase.h \
$(SOURCE_DIR)/GSSMoother.h $(SOURCE_DIR)/GSSmoother.cc \
$(SOURCE_DIR)/JacobiSMoother.h $(SOURCE_DIR)/JacobiSmoother.cc \
$(SOURCE_DIR)/SparseVector.h $(SOURCE_DIR)/SparseVector.hh $(SOURCE_DIR)/SparseVector.cc \
$(SOURCE_DIR)/VertexVector.h $(SOURCE_DIR)/VertexVector.cc \
$(SOURCE_DIR)/PeriodicBC.h $(SOURCE_DIR)/PeriodicBC.cc \
$(SOURCE_DIR)/MultiGridSolverBase.h $(SOURCE_DIR)/MultiGridSolverBase.hh \
$(SOURCE_DIR)/MultiGridSolver.h $(SOURCE_DIR)/MultiGridSolver.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 $(SOURCE_DIR)/Cholesky.cc \
$(SOURCE_DIR)/AdaptBase.h $(SOURCE_DIR)/AdaptBase.cc \
$(SOURCE_DIR)/ProblemIterationInterface.h $(SOURCE_DIR)/StandardProblemIteration.h $(SOURCE_DIR)/StandardProblemIteration.cc \
$(SOURCE_DIR)/ProblemIterationInterface.h \
$(SOURCE_DIR)/StandardProblemIteration.h $(SOURCE_DIR)/StandardProblemIteration.cc \
$(SOURCE_DIR)/ProblemScal.h $(SOURCE_DIR)/ProblemScal.cc \
$(SOURCE_DIR)/ProblemVec.h $(SOURCE_DIR)/ProblemVec.cc \
$(SOURCE_DIR)/DualTraverse.h $(SOURCE_DIR)/DualTraverse.cc \
......@@ -95,7 +87,9 @@ $(SOURCE_DIR)/CreatorInterface.h \
$(SOURCE_DIR)/ElementFunction.h \
$(SOURCE_DIR)/ProblemInterpolScal.h $(SOURCE_DIR)/ProblemInterpolScal.cc \
$(SOURCE_DIR)/ProblemInterpolVec.h $(SOURCE_DIR)/ProblemInterpolVec.cc \
$(SOURCE_DIR)/Serializable.h $(SOURCE_DIR)/BallProject.h $(SOURCE_DIR)/CylinderProject.h \
$(SOURCE_DIR)/Serializable.h \
$(SOURCE_DIR)/BallProject.h \
$(SOURCE_DIR)/CylinderProject.h \
$(SOURCE_DIR)/MacroReader.h $(SOURCE_DIR)/MacroReader.cc \
$(SOURCE_DIR)/ValueReader.h $(SOURCE_DIR)/ValueReader.cc \
$(SOURCE_DIR)/Projection.h $(SOURCE_DIR)/Projection.cc \
......@@ -110,18 +104,17 @@ $(SOURCE_DIR)/SystemVector.h \
$(SOURCE_DIR)/MatrixVector.h $(SOURCE_DIR)/MatrixVector.cc \
$(SOURCE_DIR)/SurfaceQuadrature.h $(SOURCE_DIR)/SurfaceQuadrature.cc \
$(SOURCE_DIR)/LeafData.h $(SOURCE_DIR)/LeafData.cc \
$(SOURCE_DIR)/BoundaryManager.h $(SOURCE_DIR)/BoundaryManager.cc $(SOURCE_DIR)/BoundaryCondition.h \
$(SOURCE_DIR)/BoundaryManager.h $(SOURCE_DIR)/BoundaryManager.cc \
$(SOURCE_DIR)/BoundaryCondition.h \
$(SOURCE_DIR)/DirichletBC.h $(SOURCE_DIR)/DirichletBC.cc \
$(SOURCE_DIR)/RobinBC.h $(SOURCE_DIR)/RobinBC.cc \
$(SOURCE_DIR)/AbstractFunction.h \
$(SOURCE_DIR)/ProblemStatBase.h \
$(SOURCE_DIR)/MatVecMultiplier.cc \
$(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)/ElInfoStack.h $(SOURCE_DIR)/ElInfoStack.cc \
$(SOURCE_DIR)/MatVecMultiplier.h \
$(SOURCE_DIR)/Operator.h $(SOURCE_DIR)/Operator.cc \
$(SOURCE_DIR)/Mesh.cc \
$(SOURCE_DIR)/AMDiS.h \
......
......@@ -81,24 +81,12 @@ am__libamdis_la_SOURCES_DIST = $(PARALLEL_DIR)/ConditionalEstimator.h \
$(PARALLEL_DIR)/ParMetisPartitioner.h \
$(PARALLEL_DIR)/ParMetisPartitioner.cc \
$(PARALLEL_DIR)/PartitionElementData.h \
$(SOURCE_DIR)/MultiGridPreconWrapper.h \
$(SOURCE_DIR)/MultiGridPreconWrapper.cc \
$(SOURCE_DIR)/LagrangeInterpolRestrict.h \
$(SOURCE_DIR)/InterpolRestrictMatrix.h \
$(SOURCE_DIR)/InterpolRestrictMatrix.cc \
$(SOURCE_DIR)/DOFIndexed.h $(SOURCE_DIR)/DOFIndexed.cc \
$(SOURCE_DIR)/GNUPlotWriter.h $(SOURCE_DIR)/GNUPlotWriter.cc \
$(SOURCE_DIR)/SmootherBase.h $(SOURCE_DIR)/GSSMoother.h \
$(SOURCE_DIR)/GSSmoother.cc $(SOURCE_DIR)/JacobiSMoother.h \
$(SOURCE_DIR)/JacobiSmoother.cc $(SOURCE_DIR)/SparseVector.h \
$(SOURCE_DIR)/SparseVector.hh $(SOURCE_DIR)/SparseVector.cc \
$(SOURCE_DIR)/VertexVector.h $(SOURCE_DIR)/VertexVector.cc \
$(SOURCE_DIR)/PeriodicBC.h $(SOURCE_DIR)/PeriodicBC.cc \
$(SOURCE_DIR)/MultiGridSolverBase.h \
$(SOURCE_DIR)/MultiGridSolverBase.hh \
$(SOURCE_DIR)/MultiGridSolver.h \
$(SOURCE_DIR)/MultiGridSolver.cc $(SOURCE_DIR)/Recovery.h \
$(SOURCE_DIR)/Recovery.cc $(SOURCE_DIR)/RecoveryEstimator.h \
$(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 \
......@@ -146,15 +134,14 @@ am__libamdis_la_SOURCES_DIST = $(PARALLEL_DIR)/ConditionalEstimator.h \
$(SOURCE_DIR)/BoundaryCondition.h $(SOURCE_DIR)/DirichletBC.h \
$(SOURCE_DIR)/DirichletBC.cc $(SOURCE_DIR)/RobinBC.h \
$(SOURCE_DIR)/RobinBC.cc $(SOURCE_DIR)/AbstractFunction.h \
$(SOURCE_DIR)/ProblemStatBase.h \
$(SOURCE_DIR)/MatVecMultiplier.cc $(SOURCE_DIR)/DOFContainer.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)/ElInfoStack.h $(SOURCE_DIR)/ElInfoStack.cc \
$(SOURCE_DIR)/MatVecMultiplier.h $(SOURCE_DIR)/Operator.h \
$(SOURCE_DIR)/Operator.cc $(SOURCE_DIR)/Mesh.cc \
$(SOURCE_DIR)/AMDiS.h $(SOURCE_DIR)/AdaptStationary.h \
$(SOURCE_DIR)/Operator.h $(SOURCE_DIR)/Operator.cc \
$(SOURCE_DIR)/Mesh.cc $(SOURCE_DIR)/AMDiS.h \
$(SOURCE_DIR)/AdaptStationary.h \
$(SOURCE_DIR)/AdaptStationary.cc \
$(SOURCE_DIR)/AdaptInstationary.h \
$(SOURCE_DIR)/AdaptInstationary.cc $(SOURCE_DIR)/QPsiPhi.h \
......@@ -240,14 +227,10 @@ am__libamdis_la_SOURCES_DIST = $(PARALLEL_DIR)/ConditionalEstimator.h \
@USE_PARALLEL_AMDIS_TRUE@ libamdis_la-ParallelProblem.lo \
@USE_PARALLEL_AMDIS_TRUE@ libamdis_la-ParallelDomainProblem.lo \
@USE_PARALLEL_AMDIS_TRUE@ libamdis_la-ParMetisPartitioner.lo
am_libamdis_la_OBJECTS = $(am__objects_1) \
libamdis_la-MultiGridPreconWrapper.lo \
libamdis_la-InterpolRestrictMatrix.lo \
libamdis_la-DOFIndexed.lo libamdis_la-GNUPlotWriter.lo \
libamdis_la-GSSmoother.lo libamdis_la-JacobiSmoother.lo \
libamdis_la-SparseVector.lo libamdis_la-VertexVector.lo \
libamdis_la-PeriodicBC.lo libamdis_la-MultiGridSolver.lo \
libamdis_la-Recovery.lo libamdis_la-RecoveryEstimator.lo \
am_libamdis_la_OBJECTS = $(am__objects_1) libamdis_la-DOFIndexed.lo \
libamdis_la-GNUPlotWriter.lo libamdis_la-VertexVector.lo \
libamdis_la-PeriodicBC.lo libamdis_la-Recovery.lo \
libamdis_la-RecoveryEstimator.lo \
libamdis_la-ResidualEstimator.lo libamdis_la-Cholesky.lo \
libamdis_la-AdaptBase.lo \
libamdis_la-StandardProblemIteration.lo \
......@@ -264,10 +247,10 @@ am_libamdis_la_OBJECTS = $(am__objects_1) \
libamdis_la-MatrixVector.lo libamdis_la-SurfaceQuadrature.lo \
libamdis_la-LeafData.lo libamdis_la-BoundaryManager.lo \
libamdis_la-DirichletBC.lo libamdis_la-RobinBC.lo \
libamdis_la-MatVecMultiplier.lo libamdis_la-FileWriter.lo \
libamdis_la-ElementFileWriter.lo libamdis_la-ElInfo.lo \
libamdis_la-ElInfoStack.lo libamdis_la-Operator.lo \
libamdis_la-Mesh.lo libamdis_la-AdaptStationary.lo \
libamdis_la-FileWriter.lo libamdis_la-ElementFileWriter.lo \
libamdis_la-ElInfo.lo libamdis_la-ElInfoStack.lo \
libamdis_la-Operator.lo libamdis_la-Mesh.lo \
libamdis_la-AdaptStationary.lo \
libamdis_la-AdaptInstationary.lo libamdis_la-DOFVector.lo \
libamdis_la-Estimator.lo libamdis_la-ProblemInstat.lo \
libamdis_la-ProblemNonLin.lo libamdis_la-NonLinUpdater.lo \
......@@ -481,25 +464,17 @@ TEMPLATE_INCLUDES = -I../lib/mtl4 -I../lib/boost_1_34_1
INCLUDES = $(AMDIS_INCLUDES) $(PARALLEL_INCLUDES) $(TEMPLATE_INCLUDES)
libamdis_la_SOURCES = \
$(PARALLEL_AMDIS_SOURCES) \
$(SOURCE_DIR)/MultiGridPreconWrapper.h $(SOURCE_DIR)/MultiGridPreconWrapper.cc \
$(SOURCE_DIR)/LagrangeInterpolRestrict.h \
$(SOURCE_DIR)/InterpolRestrictMatrix.h $(SOURCE_DIR)/InterpolRestrictMatrix.cc \
$(SOURCE_DIR)/DOFIndexed.h $(SOURCE_DIR)/DOFIndexed.cc \
$(SOURCE_DIR)/GNUPlotWriter.h $(SOURCE_DIR)/GNUPlotWriter.cc \
$(SOURCE_DIR)/SmootherBase.h \
$(SOURCE_DIR)/GSSMoother.h $(SOURCE_DIR)/GSSmoother.cc \
$(SOURCE_DIR)/JacobiSMoother.h $(SOURCE_DIR)/JacobiSmoother.cc \
$(SOURCE_DIR)/SparseVector.h $(SOURCE_DIR)/SparseVector.hh $(SOURCE_DIR)/SparseVector.cc \
$(SOURCE_DIR)/VertexVector.h $(SOURCE_DIR)/VertexVector.cc \
$(SOURCE_DIR)/PeriodicBC.h $(SOURCE_DIR)/PeriodicBC.cc \
$(SOURCE_DIR)/MultiGridSolverBase.h $(SOURCE_DIR)/MultiGridSolverBase.hh \
$(SOURCE_DIR)/MultiGridSolver.h $(SOURCE_DIR)/MultiGridSolver.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 $(SOURCE_DIR)/Cholesky.cc \
$(SOURCE_DIR)/AdaptBase.h $(SOURCE_DIR)/AdaptBase.cc \
$(SOURCE_DIR)/ProblemIterationInterface.h $(SOURCE_DIR)/StandardProblemIteration.h $(SOURCE_DIR)/StandardProblemIteration.cc \
$(SOURCE_DIR)/ProblemIterationInterface.h \
$(SOURCE_DIR)/StandardProblemIteration.h $(SOURCE_DIR)/StandardProblemIteration.cc \
$(SOURCE_DIR)/ProblemScal.h $(SOURCE_DIR)/ProblemScal.cc \
$(SOURCE_DIR)/ProblemVec.h $(SOURCE_DIR)/ProblemVec.cc \
$(SOURCE_DIR)/DualTraverse.h $(SOURCE_DIR)/DualTraverse.cc \
......@@ -511,7 +486,9 @@ $(SOURCE_DIR)/CreatorInterface.h \
$(SOURCE_DIR)/ElementFunction.h \
$(SOURCE_DIR)/ProblemInterpolScal.h $(SOURCE_DIR)/ProblemInterpolScal.cc \
$(SOURCE_DIR)/ProblemInterpolVec.h $(SOURCE_DIR)/ProblemInterpolVec.cc \
$(SOURCE_DIR)/Serializable.h $(SOURCE_DIR)/BallProject.h $(SOURCE_DIR)/CylinderProject.h \
$(SOURCE_DIR)/Serializable.h \
$(SOURCE_DIR)/BallProject.h \
$(SOURCE_DIR)/CylinderProject.h \
$(SOURCE_DIR)/MacroReader.h $(SOURCE_DIR)/MacroReader.cc \
$(SOURCE_DIR)/ValueReader.h $(SOURCE_DIR)/ValueReader.cc \
$(SOURCE_DIR)/Projection.h $(SOURCE_DIR)/Projection.cc \
......@@ -526,18 +503,17 @@ $(SOURCE_DIR)/SystemVector.h \
$(SOURCE_DIR)/MatrixVector.h $(SOURCE_DIR)/MatrixVector.cc \
$(SOURCE_DIR)/SurfaceQuadrature.h $(SOURCE_DIR)/SurfaceQuadrature.cc \
$(SOURCE_DIR)/LeafData.h $(SOURCE_DIR)/LeafData.cc \
$(SOURCE_DIR)/BoundaryManager.h $(SOURCE_DIR)/BoundaryManager.cc $(SOURCE_DIR)/BoundaryCondition.h \
$(SOURCE_DIR)/BoundaryManager.h $(SOURCE_DIR)/BoundaryManager.cc \
$(SOURCE_DIR)/BoundaryCondition.h \
$(SOURCE_DIR)/DirichletBC.h $(SOURCE_DIR)/DirichletBC.cc \
$(SOURCE_DIR)/RobinBC.h $(SOURCE_DIR)/RobinBC.cc \
$(SOURCE_DIR)/AbstractFunction.h \
$(SOURCE_DIR)/ProblemStatBase.h \
$(SOURCE_DIR)/MatVecMultiplier.cc \
$(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)/ElInfoStack.h $(SOURCE_DIR)/ElInfoStack.cc \
$(SOURCE_DIR)/MatVecMultiplier.h \
$(SOURCE_DIR)/Operator.h $(SOURCE_DIR)/Operator.cc \
$(SOURCE_DIR)/Mesh.cc \
$(SOURCE_DIR)/AMDiS.h \
......@@ -761,11 +737,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-FirstOrderAssembler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-FixVec.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-GNUPlotWriter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-GSSmoother.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Global.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-InteriorBoundary.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-InterpolRestrictMatrix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-JacobiSmoother.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Lagrange.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-LeafData.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Line.Plo@am__quote@
......@@ -773,14 +746,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MacroReader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MacroWriter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Marker.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MatVecMultiplier.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MatrixVector.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MemoryManager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MemoryPool.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Mesh.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MeshStructure.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MultiGridPreconWrapper.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MultiGridSolver.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-NonLinUpdater.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Operator.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-ParMetisPartitioner.Plo@am__quote@
......@@ -810,7 +780,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-RobinBC.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-ScalableQuadrature.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-SecondOrderAssembler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-SparseVector.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-StandardProblemIteration.Plo@am__quote@
@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@
......@@ -892,20 +861,6 @@ libamdis_la-ParMetisPartitioner.lo: $(PARALLEL_DIR)/ParMetisPartitioner.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ParMetisPartitioner.lo `test -f '$(PARALLEL_DIR)/ParMetisPartitioner.cc' || echo '$(srcdir)/'`$(PARALLEL_DIR)/ParMetisPartitioner.cc
libamdis_la-MultiGridPreconWrapper.lo: $(SOURCE_DIR)/MultiGridPreconWrapper.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MultiGridPreconWrapper.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-MultiGridPreconWrapper.Tpo" -c -o libamdis_la-MultiGridPreconWrapper.lo `test -f '$(SOURCE_DIR)/MultiGridPreconWrapper.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MultiGridPreconWrapper.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-MultiGridPreconWrapper.Tpo" "$(DEPDIR)/libamdis_la-MultiGridPreconWrapper.Plo"; else rm -f "$(DEPDIR)/libamdis_la-MultiGridPreconWrapper.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MultiGridPreconWrapper.cc' object='libamdis_la-MultiGridPreconWrapper.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MultiGridPreconWrapper.lo `test -f '$(SOURCE_DIR)/MultiGridPreconWrapper.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MultiGridPreconWrapper.cc
libamdis_la-InterpolRestrictMatrix.lo: $(SOURCE_DIR)/InterpolRestrictMatrix.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-InterpolRestrictMatrix.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-InterpolRestrictMatrix.Tpo" -c -o libamdis_la-InterpolRestrictMatrix.lo `test -f '$(SOURCE_DIR)/InterpolRestrictMatrix.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/InterpolRestrictMatrix.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-InterpolRestrictMatrix.Tpo" "$(DEPDIR)/libamdis_la-InterpolRestrictMatrix.Plo"; else rm -f "$(DEPDIR)/libamdis_la-InterpolRestrictMatrix.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/InterpolRestrictMatrix.cc' object='libamdis_la-InterpolRestrictMatrix.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-InterpolRestrictMatrix.lo `test -f '$(SOURCE_DIR)/InterpolRestrictMatrix.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/InterpolRestrictMatrix.cc
libamdis_la-DOFIndexed.lo: $(SOURCE_DIR)/DOFIndexed.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-DOFIndexed.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-DOFIndexed.Tpo" -c -o libamdis_la-DOFIndexed.lo `test -f '$(SOURCE_DIR)/DOFIndexed.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/DOFIndexed.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-DOFIndexed.Tpo" "$(DEPDIR)/libamdis_la-DOFIndexed.Plo"; else rm -f "$(DEPDIR)/libamdis_la-DOFIndexed.Tpo"; exit 1; fi
......@@ -920,27 +875,6 @@ libamdis_la-GNUPlotWriter.lo: $(SOURCE_DIR)/GNUPlotWriter.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --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
libamdis_la-GSSmoother.lo: $(SOURCE_DIR)/GSSmoother.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-GSSmoother.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-GSSmoother.Tpo" -c -o libamdis_la-GSSmoother.lo `test -f '$(SOURCE_DIR)/GSSmoother.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/GSSmoother.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-GSSmoother.Tpo" "$(DEPDIR)/libamdis_la-GSSmoother.Plo"; else rm -f "$(DEPDIR)/libamdis_la-GSSmoother.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/GSSmoother.cc' object='libamdis_la-GSSmoother.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-GSSmoother.lo `test -f '$(SOURCE_DIR)/GSSmoother.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/GSSmoother.cc
libamdis_la-JacobiSmoother.lo: $(SOURCE_DIR)/JacobiSmoother.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-JacobiSmoother.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-JacobiSmoother.Tpo" -c -o libamdis_la-JacobiSmoother.lo `test -f '$(SOURCE_DIR)/JacobiSmoother.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/JacobiSmoother.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-JacobiSmoother.Tpo" "$(DEPDIR)/libamdis_la-JacobiSmoother.Plo"; else rm -f "$(DEPDIR)/libamdis_la-JacobiSmoother.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/JacobiSmoother.cc' object='libamdis_la-JacobiSmoother.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-JacobiSmoother.lo `test -f '$(SOURCE_DIR)/JacobiSmoother.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/JacobiSmoother.cc
libamdis_la-SparseVector.lo: $(SOURCE_DIR)/SparseVector.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-SparseVector.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-SparseVector.Tpo" -c -o libamdis_la-SparseVector.lo `test -f '$(SOURCE_DIR)/SparseVector.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/SparseVector.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-SparseVector.Tpo" "$(DEPDIR)/libamdis_la-SparseVector.Plo"; else rm -f "$(DEPDIR)/libamdis_la-SparseVector.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/SparseVector.cc' object='libamdis_la-SparseVector.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-SparseVector.lo `test -f '$(SOURCE_DIR)/SparseVector.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/SparseVector.cc
libamdis_la-VertexVector.lo: $(SOURCE_DIR)/VertexVector.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --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; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-VertexVector.Tpo" "$(DEPDIR)/libamdis_la-VertexVector.Plo"; else rm -f "$(DEPDIR)/libamdis_la-VertexVector.Tpo"; exit 1; fi
......@@ -955,13 +889,6 @@ libamdis_la-PeriodicBC.lo: $(SOURCE_DIR)/PeriodicBC.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-PeriodicBC.lo `test -f '$(SOURCE_DIR)/PeriodicBC.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/PeriodicBC.cc
libamdis_la-MultiGridSolver.lo: $(SOURCE_DIR)/MultiGridSolver.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MultiGridSolver.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-MultiGridSolver.Tpo" -c -o libamdis_la-MultiGridSolver.lo `test -f '$(SOURCE_DIR)/MultiGridSolver.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MultiGridSolver.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-MultiGridSolver.Tpo" "$(DEPDIR)/libamdis_la-MultiGridSolver.Plo"; else rm -f "$(DEPDIR)/libamdis_la-MultiGridSolver.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MultiGridSolver.cc' object='libamdis_la-MultiGridSolver.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MultiGridSolver.lo `test -f '$(SOURCE_DIR)/MultiGridSolver.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MultiGridSolver.cc
libamdis_la-Recovery.lo: $(SOURCE_DIR)/Recovery.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-Recovery.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-Recovery.Tpo" -c -o libamdis_la-Recovery.lo `test -f '$(SOURCE_DIR)/Recovery.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/Recovery.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-Recovery.Tpo" "$(DEPDIR)/libamdis_la-Recovery.Plo"; else rm -f "$(DEPDIR)/libamdis_la-Recovery.Tpo"; exit 1; fi
......@@ -1172,13 +1099,6 @@ libamdis_la-RobinBC.lo: $(SOURCE_DIR)/RobinBC.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --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-MatVecMultiplier.lo: $(SOURCE_DIR)/MatVecMultiplier.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MatVecMultiplier.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-MatVecMultiplier.Tpo" -c -o libamdis_la-MatVecMultiplier.lo `test -f '$(SOURCE_DIR)/MatVecMultiplier.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MatVecMultiplier.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-MatVecMultiplier.Tpo" "$(DEPDIR)/libamdis_la-MatVecMultiplier.Plo"; else rm -f "$(DEPDIR)/libamdis_la-MatVecMultiplier.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MatVecMultiplier.cc' object='libamdis_la-MatVecMultiplier.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MatVecMultiplier.lo `test -f '$(SOURCE_DIR)/MatVecMultiplier.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MatVecMultiplier.cc
libamdis_la-FileWriter.lo: $(SOURCE_DIR)/FileWriter.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --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; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-FileWriter.Tpo" "$(DEPDIR)/libamdis_la-FileWriter.Plo"; else rm -f "$(DEPDIR)/libamdis_la-FileWriter.Tpo"; exit 1; fi
......
......@@ -48,7 +48,6 @@
#include "MacroElement.h"
#include "MacroWriter.h"
#include "Marker.h"
#include "MatVecMultiplier.h"
#include "MatrixVector.h"
#include "MemoryManager.h"
#include "MemoryPool.h"
......@@ -83,9 +82,7 @@
#include "RefinementManager2d.h"
#include "RefinementManager3d.h"
#include "RobinBC.h"
#include "SmootherBase.h"
#include "SolutionDataStorage.h"
#include "SparseVector.h"
#include "SurfaceOperator.h"
#include "SurfaceQuadrature.h"
#include "SystemVector.h"
......
......@@ -44,13 +44,11 @@ namespace AMDiS {
class FileWriterInterface;
class FiniteElemSpace;
class IdentityPreconditioner;
class InterpolRestrictMatrix;
class ITL_BasePreconditioner;
class LeafDataPeriodic;
class LevelAdmin;
class Marker;
class Mesh;
class MultiGridSortSolver;
class OEMSolver;
class Operator;
class ProblemInstat;
......@@ -65,14 +63,12 @@ namespace AMDiS {
class VertexVector;
template<typename ReturnType, typename ArgumentType> class AbstractFunction;
template<typename VectorType> class MatVecMultiplier;
template<typename T> class DOFVectorBase;
template<typename T> class DOFVector;
template<typename T> class ITL_Preconditioner;
template<typename T> class Matrix;
template<typename T> class MatVecMultiplier;
template<typename T> class SolverMatrix;
template<typename T> class SparseVector;
template<typename T> class Vector;
template <typename ITLSolver> class ITL_OEMSolver;
......
#ifndef AMDIS_BOXSMOOTHER_H
#define AMDIS_BOXSMOOTHER_H
#include "SmootherBase.h"
#include "MemoryManager.h"
#include "DOFMatrix.h"
#include "SparseVector.h"
#include "MatrixVector.h"
#include "Global.h"
#include "GaussElimination.h"
#include "FiniteElemSpace.h"
#include "GaussElimination.h"
#include <set>
namespace AMDiS {
class BoxSmoother
: public SmootherBase<Matrix<DOFMatrix*>,
Vector<SparseVector<double>*>,
Vector< std::set<DegreeOfFreedom>*> >
{
public:
MEMORY_MANAGED(BoxSmoother);
class Creator
: public SmootherCreator<Matrix<DOFMatrix*>,
Vector<SparseVector<double>*>,
Vector< std::set<DegreeOfFreedom>*> >
{
public:
MEMORY_MANAGED(Creator);
SmootherBase<Matrix<DOFMatrix*>,
Vector<SparseVector<double>*>,
Vector< std::set<DegreeOfFreedom>*> >*
create() {
return NEW BoxSmoother(this->name);
};
};
BoxSmoother(std::string name)
: SmootherBase<Matrix<DOFMatrix*>,
Vector<SparseVector<double>*>,
Vector< std::set<DegreeOfFreedom>*> >(name),
boxMatrix_(NULL),
boxSolution_(NULL),
boxRHS_(NULL),
numComponents_(0),
sumDOFs_(0)
{
directSolver_ =
NEW GaussElimination<Matrix<double>, Vector<double> >();
};
virtual ~BoxSmoother()
{
if(boxMatrix_) DELETE boxMatrix_;
if(boxSolution_) DELETE boxSolution_;
if(boxRHS_) DELETE boxRHS_;
DELETE directSolver_;
};
void smooth(Matrix<DOFMatrix*> *matrix,
Vector<SparseVector<double>*> *solution,
Vector<SparseVector<double>*> *rhs,
int iterations,
const Vector< std::set<DegreeOfFreedom>*> &dofSet)
{
FUNCNAME("BoxSmoother::smooth()");
ERROR_EXIT("Will be rewritten - Peter\n");
#if 0
int i, j, k;
// allocate memory
if(!boxMatrix_) {
numComponents_ = solution->getSize();
numDOFs_.resize(numComponents_);
sumDOFs_ = 0;
for(i = 0; i < numComponents_; i++) {
numDOFs_[i] = (*solution)[i]->getFESpace()->getBasisFcts()->getNumber();
sumDOFs_ += numDOFs_[i];
}
boxMatrix_ = NEW Matrix<double>(sumDOFs_, sumDOFs_);
boxSolution_ = NEW Vector<double>(sumDOFs_);
boxRHS_ = NEW Vector<double>(sumDOFs_);
}
// create local equation system
int boxSize = 0;
std::vector<int> offset(numComponents_, 0);
std::vector< std::map<DegreeOfFreedom, int> > indexOfDOF(numComponents_);
std::set<DegreeOfFreedom>::const_iterator dofIt, dofBegin, dofEnd;
std::vector<MatEntry>::iterator rowIt, rowBegin, rowEnd;
int pos;
for(i = 0; i < numComponents_; i++) {
if(dofSet[i]) {
offset[i] = boxSize;
boxSize += numDOFs_[i];
dofBegin = dofSet[i]->begin();
dofEnd = dofSet[i]->end();
pos = 0;
for(dofIt = dofBegin; dofIt != dofEnd; ++dofIt) {
indexOfDOF[i][*dofIt] = pos + 1;
// MSG("%d : %d, %d \n", *dofIt, i, pos);
++pos;
}
}
}
for(i = 0; i < boxSize; i++) {
for(j = 0; j < boxSize; j++) {
(*boxMatrix_)[i][j] = 0.0;
}
(*boxRHS_)[i] = 0.0;
}
pos = 0;
for(i = 0; i < numComponents_; i++) {
if(dofSet[i]) {
dofBegin = dofSet[i]->begin();
dofEnd = dofSet[i]->end();
for(dofIt = dofBegin; dofIt != dofEnd; ++dofIt) {
// fill box rhs
(*boxRHS_)[pos] = (*((*rhs)[i]))[*dofIt];
// fill box matrix
for(j = 0; j < numComponents_; j++) {
if((*matrix)[i][j] != NULL) {
rowBegin = (*((*matrix)[i][j]))[*dofIt].begin();
rowEnd = (*((*matrix)[i][j]))[*dofIt].end();
for(rowIt = rowBegin; rowIt != rowEnd; ++rowIt) {
if(rowIt->col == DOFMatrix::UNUSED_ENTRY) continue;
if(rowIt->col == DOFMatrix::NO_MORE_ENTRIES) break;
int ind = indexOfDOF[j][rowIt->col] - 1;
if(ind != -1) {
(*boxMatrix_)[pos][offset[j] + ind] = rowIt->entry;
} else {
(*boxRHS_)[pos] -=
rowIt->entry * (*((*solution)[j]))[rowIt->col];
}
}
} else {
for(k = 0; k < numDOFs_[j]; k++) {
(*boxMatrix_)[pos][offset[j] + k] = 0.0;
}
}
}
++pos;
}
}
}
// int a,b;
// for(i = 0; i < numComponents_; i++) {
// MSG("DOFs %d: ", i);
// dofBegin = dofSet[i]->begin();
// dofEnd = dofSet[i]->end();
// for(dofIt = dofBegin; dofIt != dofEnd; ++dofIt) {
// MSG("%d ", *dofIt);
// }
// MSG("\n");
// }
// for(a = 0; a < numComponents_; a++) {
// for(b = 0; b < numComponents_; b++) {
// MSG("matrix[%d][%d]:\n", a, b);
// if((*matrix)[a][b]) {
// (*matrix)[a][b]->print();
// MSG("solution[%d]\n", b);
// (*solution)[b]->print();
// MSG("rhs[%d]\n", a);
// (*rhs)[a]->print();
// }
// }
// }
// MSG("matrix:\n");
// for(a = 0; a < boxSize; a++) {
// for(b = 0; b < boxSize; b++) {
// MSG("%e ", (*boxMatrix_)[a][b]);
// }
// MSG("\n");
// }
// MSG("rhs:\n");
// for(a = 0; a < boxSize; a++) {
// MSG("%e\n", (*boxRHS_)[a]);
// }
// apply direct solver
directSolver_->solve(*boxMatrix_, *boxRHS_, *boxSolution_, boxSize);
// MSG("solution:\n");
// for(a = 0; a < boxSize; a++) {
// MSG("%e\n", (*boxSolution_)[a]);
// }
// WAIT_REALLY;
// copy solution
pos = 0;
for(i = 0; i < numComponents_; i++) {
dofBegin = dofSet[i]->begin();
dofEnd = dofSet[i]->end();
for(dofIt = dofBegin; dofIt != dofEnd; ++dofIt) {
(*((*solution)[i]))[*dofIt] = (*boxSolution_)[pos];
++pos;
}
}
#endif
};
protected:
Matrix<double> *boxMatrix_;
Vector<double> *boxSolution_;
Vector<double> *boxRHS_;
int numComponents_;
std::vector<int> numDOFs_;
int sumDOFs_;
DirectSolverInterface<Matrix<double>, Vector<double> > *directSolver_;
};
}
#endif
......@@ -10,14 +10,8 @@
#include "ResidualEstimator.h"
#include "LeafData.h"
#include "SurfaceRegion_ED.h"
#include "MultiGridWrapper.h"
#include "DOFMatrix.h"
#include "SparseVector.h"
#include "GSSmoother.h"
#include "JacobiSmoother.h"
#include "ElementRegion_ED.h"
#include "BoxSmoother.h"
#include "MultiGridPreconWrapper.h"
#include "UmfPackSolver.h"
namespace AMDiS {
......@@ -64,12 +58,6 @@ namespace AMDiS {
creator = NEW ICPreconditioner::Creator;
addCreator("ic", creator);
#if 0
creator = NEW MGPreconWrapperScal::Creator;
addCreator("mg", creator);