Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
iwr
amdis
Commits
99303ce3
Commit
99303ce3
authored
Nov 04, 2014
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A lot of changes in the solver interface
parent
fc619e37
Changes
253
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
253 changed files
with
2049 additions
and
2208 deletions
+2049
-2208
AMDiS/src/AMDiS.cc
AMDiS/src/AMDiS.cc
+1
-1
AMDiS/src/AMDiS.h
AMDiS/src/AMDiS.h
+1
-1
AMDiS/src/AMDiS_fwd.h
AMDiS/src/AMDiS_fwd.h
+2
-2
AMDiS/src/AdaptBase.h
AMDiS/src/AdaptBase.h
+2
-2
AMDiS/src/Assembler.cc
AMDiS/src/Assembler.cc
+6
-6
AMDiS/src/Assembler.h
AMDiS/src/Assembler.h
+5
-5
AMDiS/src/BoundaryCondition.h
AMDiS/src/BoundaryCondition.h
+1
-1
AMDiS/src/BoundaryManager.cc
AMDiS/src/BoundaryManager.cc
+1
-1
AMDiS/src/Bubble.cc
AMDiS/src/Bubble.cc
+9
-9
AMDiS/src/Cholesky.cc
AMDiS/src/Cholesky.cc
+3
-3
AMDiS/src/Cholesky.h
AMDiS/src/Cholesky.h
+3
-3
AMDiS/src/CoarseningManager.h
AMDiS/src/CoarseningManager.h
+2
-2
AMDiS/src/CoarseningManager1d.cc
AMDiS/src/CoarseningManager1d.cc
+2
-2
AMDiS/src/CoarseningManager2d.cc
AMDiS/src/CoarseningManager2d.cc
+3
-3
AMDiS/src/CoarseningManager3d.cc
AMDiS/src/CoarseningManager3d.cc
+6
-6
AMDiS/src/ComponentTraverseInfo.cc
AMDiS/src/ComponentTraverseInfo.cc
+5
-5
AMDiS/src/ComponentTraverseInfo.h
AMDiS/src/ComponentTraverseInfo.h
+5
-5
AMDiS/src/CouplingIterationInterface.cc
AMDiS/src/CouplingIterationInterface.cc
+2
-2
AMDiS/src/CouplingProblemStat.h
AMDiS/src/CouplingProblemStat.h
+7
-7
AMDiS/src/CreatorInterface.h
AMDiS/src/CreatorInterface.h
+5
-5
AMDiS/src/CreatorMap.cc
AMDiS/src/CreatorMap.cc
+7
-6
AMDiS/src/CreatorMap.h
AMDiS/src/CreatorMap.h
+1
-1
AMDiS/src/DOFMatrix.cc
AMDiS/src/DOFMatrix.cc
+11
-11
AMDiS/src/DOFMatrix.h
AMDiS/src/DOFMatrix.h
+7
-7
AMDiS/src/DOFVector.cc
AMDiS/src/DOFVector.cc
+13
-13
AMDiS/src/DOFVector.h
AMDiS/src/DOFVector.h
+23
-23
AMDiS/src/DOFVector.hh
AMDiS/src/DOFVector.hh
+30
-30
AMDiS/src/Debug.cc
AMDiS/src/Debug.cc
+6
-6
AMDiS/src/DirichletBC.cc
AMDiS/src/DirichletBC.cc
+2
-2
AMDiS/src/DirichletBC.h
AMDiS/src/DirichletBC.h
+1
-1
AMDiS/src/DualTraverse.cc
AMDiS/src/DualTraverse.cc
+7
-7
AMDiS/src/DualTraverse.h
AMDiS/src/DualTraverse.h
+1
-1
AMDiS/src/ElInfo.cc
AMDiS/src/ElInfo.cc
+4
-4
AMDiS/src/ElInfo.h
AMDiS/src/ElInfo.h
+3
-3
AMDiS/src/ElInfo1d.cc
AMDiS/src/ElInfo1d.cc
+3
-3
AMDiS/src/ElInfo2d.cc
AMDiS/src/ElInfo2d.cc
+5
-5
AMDiS/src/ElInfo3d.cc
AMDiS/src/ElInfo3d.cc
+8
-8
AMDiS/src/Element.cc
AMDiS/src/Element.cc
+37
-37
AMDiS/src/Element.h
AMDiS/src/Element.h
+15
-15
AMDiS/src/ElementData.cc
AMDiS/src/ElementData.cc
+6
-6
AMDiS/src/ElementData.h
AMDiS/src/ElementData.h
+5
-5
AMDiS/src/ElementFunction.h
AMDiS/src/ElementFunction.h
+1
-1
AMDiS/src/ElementRegion_ED.h
AMDiS/src/ElementRegion_ED.h
+1
-1
AMDiS/src/EmptyElementData.h
AMDiS/src/EmptyElementData.h
+1
-1
AMDiS/src/Error.h
AMDiS/src/Error.h
+6
-6
AMDiS/src/Error.hh
AMDiS/src/Error.hh
+9
-9
AMDiS/src/FiniteElemSpace.cc
AMDiS/src/FiniteElemSpace.cc
+5
-5
AMDiS/src/FirstOrderAssembler.cc
AMDiS/src/FirstOrderAssembler.cc
+1
-1
AMDiS/src/FirstOrderTerm.cc
AMDiS/src/FirstOrderTerm.cc
+4
-4
AMDiS/src/FirstOrderTerm.h
AMDiS/src/FirstOrderTerm.h
+16
-16
AMDiS/src/Global.cc
AMDiS/src/Global.cc
+8
-8
AMDiS/src/Global.h
AMDiS/src/Global.h
+0
-3
AMDiS/src/GlobalDOFNumbering.cc
AMDiS/src/GlobalDOFNumbering.cc
+3
-3
AMDiS/src/Initfile.cc
AMDiS/src/Initfile.cc
+1
-1
AMDiS/src/Initfile.h
AMDiS/src/Initfile.h
+5
-5
AMDiS/src/Lagrange.cc
AMDiS/src/Lagrange.cc
+10
-10
AMDiS/src/Lagrange.h
AMDiS/src/Lagrange.h
+1
-1
AMDiS/src/LeafData.cc
AMDiS/src/LeafData.cc
+4
-4
AMDiS/src/LeafData.h
AMDiS/src/LeafData.h
+10
-10
AMDiS/src/MacroElement.cc
AMDiS/src/MacroElement.cc
+9
-9
AMDiS/src/Marker.cc
AMDiS/src/Marker.cc
+3
-3
AMDiS/src/MatrixVector.h
AMDiS/src/MatrixVector.h
+6
-6
AMDiS/src/Mesh.cc
AMDiS/src/Mesh.cc
+27
-27
AMDiS/src/Mesh.h
AMDiS/src/Mesh.h
+6
-6
AMDiS/src/MeshStructure.cc
AMDiS/src/MeshStructure.cc
+2
-2
AMDiS/src/MeshStructure.h
AMDiS/src/MeshStructure.h
+2
-2
AMDiS/src/MeshStructure_ED.h
AMDiS/src/MeshStructure_ED.h
+2
-2
AMDiS/src/Operator.cc
AMDiS/src/Operator.cc
+8
-8
AMDiS/src/Operator.h
AMDiS/src/Operator.h
+1
-1
AMDiS/src/OperatorTerm.h
AMDiS/src/OperatorTerm.h
+2
-2
AMDiS/src/PeriodicBC.cc
AMDiS/src/PeriodicBC.cc
+5
-5
AMDiS/src/PeriodicConnection.h
AMDiS/src/PeriodicConnection.h
+5
-5
AMDiS/src/ProblemInstat.cc
AMDiS/src/ProblemInstat.cc
+3
-3
AMDiS/src/ProblemInstat.h
AMDiS/src/ProblemInstat.h
+3
-3
AMDiS/src/ProblemIterationInterface.h
AMDiS/src/ProblemIterationInterface.h
+1
-1
AMDiS/src/ProblemStat.cc
AMDiS/src/ProblemStat.cc
+38
-38
AMDiS/src/ProblemStat.h
AMDiS/src/ProblemStat.h
+9
-9
AMDiS/src/ProblemStatDbg.h
AMDiS/src/ProblemStatDbg.h
+1
-1
AMDiS/src/Projection.h
AMDiS/src/Projection.h
+2
-2
AMDiS/src/QPInfo.cc
AMDiS/src/QPInfo.cc
+10
-10
AMDiS/src/QPInfo.h
AMDiS/src/QPInfo.h
+3
-3
AMDiS/src/QPsiPhi.cc
AMDiS/src/QPsiPhi.cc
+20
-20
AMDiS/src/QPsiPhi.h
AMDiS/src/QPsiPhi.h
+9
-9
AMDiS/src/Quadrature.cc
AMDiS/src/Quadrature.cc
+7
-7
AMDiS/src/Quadrature.h
AMDiS/src/Quadrature.h
+4
-4
AMDiS/src/Quadrature.hh
AMDiS/src/Quadrature.hh
+3
-3
AMDiS/src/RCNeighbourList.cc
AMDiS/src/RCNeighbourList.cc
+10
-10
AMDiS/src/RCNeighbourList.h
AMDiS/src/RCNeighbourList.h
+6
-6
AMDiS/src/Recovery.cc
AMDiS/src/Recovery.cc
+23
-23
AMDiS/src/Recovery.h
AMDiS/src/Recovery.h
+38
-38
AMDiS/src/RefinementManager.h
AMDiS/src/RefinementManager.h
+3
-3
AMDiS/src/RefinementManager1d.cc
AMDiS/src/RefinementManager1d.cc
+1
-1
AMDiS/src/RefinementManager2d.cc
AMDiS/src/RefinementManager2d.cc
+4
-4
AMDiS/src/RefinementManager3d.cc
AMDiS/src/RefinementManager3d.cc
+5
-5
AMDiS/src/RobinBC.cc
AMDiS/src/RobinBC.cc
+9
-9
AMDiS/src/RobinBC.h
AMDiS/src/RobinBC.h
+7
-7
AMDiS/src/ScalableQuadrature.h
AMDiS/src/ScalableQuadrature.h
+1
-1
AMDiS/src/SecondOrderAssembler.cc
AMDiS/src/SecondOrderAssembler.cc
+1
-1
AMDiS/src/SecondOrderTerm.cc
AMDiS/src/SecondOrderTerm.cc
+4
-4
AMDiS/src/SecondOrderTerm.h
AMDiS/src/SecondOrderTerm.h
+22
-22
AMDiS/src/Serializer.h
AMDiS/src/Serializer.h
+1
-1
AMDiS/src/SubAssembler.cc
AMDiS/src/SubAssembler.cc
+3
-3
AMDiS/src/SubAssembler.h
AMDiS/src/SubAssembler.h
+4
-4
AMDiS/src/SubAssembler.hh
AMDiS/src/SubAssembler.hh
+15
-15
AMDiS/src/SubQuadrature.h
AMDiS/src/SubQuadrature.h
+1
-1
AMDiS/src/SurfaceAssembler.h
AMDiS/src/SurfaceAssembler.h
+4
-4
AMDiS/src/SurfaceOperator.h
AMDiS/src/SurfaceOperator.h
+5
-5
AMDiS/src/SurfaceQuadrature.cc
AMDiS/src/SurfaceQuadrature.cc
+1
-1
AMDiS/src/SurfaceRegion_ED.h
AMDiS/src/SurfaceRegion_ED.h
+1
-1
AMDiS/src/Tetrahedron.cc
AMDiS/src/Tetrahedron.cc
+5
-5
AMDiS/src/Tetrahedron.h
AMDiS/src/Tetrahedron.h
+1
-1
AMDiS/src/TimedObject.h
AMDiS/src/TimedObject.h
+1
-1
AMDiS/src/TransformDOF.h
AMDiS/src/TransformDOF.h
+8
-8
AMDiS/src/Traverse.cc
AMDiS/src/Traverse.cc
+40
-40
AMDiS/src/Traverse.h
AMDiS/src/Traverse.h
+3
-3
AMDiS/src/Triangle.cc
AMDiS/src/Triangle.cc
+4
-4
AMDiS/src/Triangle.h
AMDiS/src/Triangle.h
+1
-1
AMDiS/src/VertexVector.cc
AMDiS/src/VertexVector.cc
+1
-1
AMDiS/src/ZeroOrderAssembler.cc
AMDiS/src/ZeroOrderAssembler.cc
+1
-1
AMDiS/src/ZeroOrderTerm.cc
AMDiS/src/ZeroOrderTerm.cc
+7
-7
AMDiS/src/compositeFEM/CFE_Integration.h
AMDiS/src/compositeFEM/CFE_Integration.h
+2
-2
AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.cc
AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.cc
+5
-5
AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.h
AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.h
+12
-12
AMDiS/src/compositeFEM/CompositeFEMOperator.cc
AMDiS/src/compositeFEM/CompositeFEMOperator.cc
+6
-6
AMDiS/src/compositeFEM/CompositeFEMOperator.h
AMDiS/src/compositeFEM/CompositeFEMOperator.h
+2
-2
AMDiS/src/compositeFEM/ElementLevelSet.cc
AMDiS/src/compositeFEM/ElementLevelSet.cc
+1
-1
AMDiS/src/compositeFEM/ElementLevelSet.h
AMDiS/src/compositeFEM/ElementLevelSet.h
+2
-2
AMDiS/src/compositeFEM/PenaltyOperator.cc
AMDiS/src/compositeFEM/PenaltyOperator.cc
+2
-2
AMDiS/src/compositeFEM/PenaltyOperator.h
AMDiS/src/compositeFEM/PenaltyOperator.h
+2
-2
AMDiS/src/compositeFEM/SubElementAssembler.cc
AMDiS/src/compositeFEM/SubElementAssembler.cc
+5
-5
AMDiS/src/compositeFEM/SubElementAssembler.h
AMDiS/src/compositeFEM/SubElementAssembler.h
+1
-1
AMDiS/src/deprecated/ProblemImplicit.cc
AMDiS/src/deprecated/ProblemImplicit.cc
+25
-25
AMDiS/src/deprecated/ProblemImplicit.h
AMDiS/src/deprecated/ProblemImplicit.h
+2
-2
AMDiS/src/est/Estimator.cc
AMDiS/src/est/Estimator.cc
+4
-4
AMDiS/src/est/Estimator.h
AMDiS/src/est/Estimator.h
+4
-4
AMDiS/src/est/RecoveryEstimator.cc
AMDiS/src/est/RecoveryEstimator.cc
+12
-12
AMDiS/src/est/RecoveryEstimator.h
AMDiS/src/est/RecoveryEstimator.h
+1
-1
AMDiS/src/est/ResidualEstimator.cc
AMDiS/src/est/ResidualEstimator.cc
+16
-16
AMDiS/src/est/ResidualEstimator.h
AMDiS/src/est/ResidualEstimator.h
+1
-1
AMDiS/src/est/SimpleResidualEstimator.cc
AMDiS/src/est/SimpleResidualEstimator.cc
+7
-7
AMDiS/src/est/SimpleResidualEstimator.h
AMDiS/src/est/SimpleResidualEstimator.h
+1
-1
AMDiS/src/io/Arh2Reader.cc
AMDiS/src/io/Arh2Reader.cc
+7
-7
AMDiS/src/io/Arh2Reader.h
AMDiS/src/io/Arh2Reader.h
+8
-8
AMDiS/src/io/Arh2Writer.h
AMDiS/src/io/Arh2Writer.h
+3
-3
AMDiS/src/io/ArhReader.cc
AMDiS/src/io/ArhReader.cc
+4
-4
AMDiS/src/io/ArhReader.h
AMDiS/src/io/ArhReader.h
+16
-16
AMDiS/src/io/ArhWriter.h
AMDiS/src/io/ArhWriter.h
+3
-3
AMDiS/src/io/DataCollector.h
AMDiS/src/io/DataCollector.h
+2
-2
AMDiS/src/io/ElementFileWriter.cc
AMDiS/src/io/ElementFileWriter.cc
+8
-8
AMDiS/src/io/MacroInfo.cc
AMDiS/src/io/MacroInfo.cc
+4
-4
AMDiS/src/io/MacroWriter.h
AMDiS/src/io/MacroWriter.h
+1
-1
AMDiS/src/io/PngReader.cc
AMDiS/src/io/PngReader.cc
+6
-6
AMDiS/src/io/PngWriter.cc
AMDiS/src/io/PngWriter.cc
+2
-2
AMDiS/src/io/PovrayWriter.cc
AMDiS/src/io/PovrayWriter.cc
+2
-2
AMDiS/src/io/PovrayWriter.h
AMDiS/src/io/PovrayWriter.h
+1
-1
AMDiS/src/io/ValueWriter.h
AMDiS/src/io/ValueWriter.h
+1
-1
AMDiS/src/io/detail/Arh2Reader.cc
AMDiS/src/io/detail/Arh2Reader.cc
+3
-3
AMDiS/src/io/detail/Arh2Writer.cc
AMDiS/src/io/detail/Arh2Writer.cc
+5
-5
AMDiS/src/io/detail/Arh2Writer.h
AMDiS/src/io/detail/Arh2Writer.h
+3
-3
AMDiS/src/io/detail/ArhReader.cc
AMDiS/src/io/detail/ArhReader.cc
+4
-4
AMDiS/src/io/detail/ArhWriter.cc
AMDiS/src/io/detail/ArhWriter.cc
+3
-3
AMDiS/src/io/detail/ArhWriter.h
AMDiS/src/io/detail/ArhWriter.h
+3
-3
AMDiS/src/io/detail/VtkReader.h
AMDiS/src/io/detail/VtkReader.h
+2
-2
AMDiS/src/nonlin/Newton.h
AMDiS/src/nonlin/Newton.h
+6
-6
AMDiS/src/nonlin/NewtonArmijo.h
AMDiS/src/nonlin/NewtonArmijo.h
+6
-6
AMDiS/src/nonlin/NonLinSolver.h
AMDiS/src/nonlin/NonLinSolver.h
+6
-6
AMDiS/src/nonlin/ProblemNonLin.cc
AMDiS/src/nonlin/ProblemNonLin.cc
+4
-4
AMDiS/src/nonlin/ProblemNonLin.h
AMDiS/src/nonlin/ProblemNonLin.h
+3
-3
AMDiS/src/parallel/BddcMlSolver.h
AMDiS/src/parallel/BddcMlSolver.h
+2
-2
AMDiS/src/parallel/CheckerPartitioner.cc
AMDiS/src/parallel/CheckerPartitioner.cc
+1
-1
AMDiS/src/parallel/DofComm.cc
AMDiS/src/parallel/DofComm.cc
+1
-1
AMDiS/src/parallel/DofComm.h
AMDiS/src/parallel/DofComm.h
+3
-3
AMDiS/src/parallel/ElementObjectDatabase.cc
AMDiS/src/parallel/ElementObjectDatabase.cc
+1
-1
AMDiS/src/parallel/ElementObjectDatabase.h
AMDiS/src/parallel/ElementObjectDatabase.h
+4
-4
AMDiS/src/parallel/InteriorBoundary.cc
AMDiS/src/parallel/InteriorBoundary.cc
+1
-1
AMDiS/src/parallel/MatrixNnzStructure.cc
AMDiS/src/parallel/MatrixNnzStructure.cc
+4
-4
AMDiS/src/parallel/MatrixNnzStructure.h
AMDiS/src/parallel/MatrixNnzStructure.h
+2
-2
AMDiS/src/parallel/MeshDistributor.cc
AMDiS/src/parallel/MeshDistributor.cc
+17
-17
AMDiS/src/parallel/MeshManipulation.cc
AMDiS/src/parallel/MeshManipulation.cc
+1
-1
AMDiS/src/parallel/MeshPartitioner.h
AMDiS/src/parallel/MeshPartitioner.h
+2
-2
AMDiS/src/parallel/MtlFetiPrimalSolver.h
AMDiS/src/parallel/MtlFetiPrimalSolver.h
+3
-3
AMDiS/src/parallel/PITL_Solver.h
AMDiS/src/parallel/PITL_Solver.h
+4
-4
AMDiS/src/parallel/ParMetisPartitioner.cc
AMDiS/src/parallel/ParMetisPartitioner.cc
+5
-5
AMDiS/src/parallel/ParMetisPartitioner.h
AMDiS/src/parallel/ParMetisPartitioner.h
+1
-1
AMDiS/src/parallel/ParallelCoarseSpaceSolver.h
AMDiS/src/parallel/ParallelCoarseSpaceSolver.h
+1
-1
AMDiS/src/parallel/ParallelDofMapping.cc
AMDiS/src/parallel/ParallelDofMapping.cc
+4
-4
AMDiS/src/parallel/ParallelProblemStat.cc
AMDiS/src/parallel/ParallelProblemStat.cc
+26
-26
AMDiS/src/parallel/ParallelProblemStat.h
AMDiS/src/parallel/ParallelProblemStat.h
+2
-2
AMDiS/src/parallel/ParallelSolver.cc
AMDiS/src/parallel/ParallelSolver.cc
+3
-3
AMDiS/src/parallel/ParallelSolver.h
AMDiS/src/parallel/ParallelSolver.h
+2
-2
AMDiS/src/parallel/PetscSolver.cc
AMDiS/src/parallel/PetscSolver.cc
+2
-2
AMDiS/src/parallel/PetscSolver.h
AMDiS/src/parallel/PetscSolver.h
+1
-1
AMDiS/src/parallel/PetscSolverCahnHilliard.cc
AMDiS/src/parallel/PetscSolverCahnHilliard.cc
+11
-11
AMDiS/src/parallel/PetscSolverCahnHilliard.h
AMDiS/src/parallel/PetscSolverCahnHilliard.h
+4
-4
AMDiS/src/parallel/PetscSolverCahnHilliard2.cc
AMDiS/src/parallel/PetscSolverCahnHilliard2.cc
+11
-11
AMDiS/src/parallel/PetscSolverCahnHilliard2.h
AMDiS/src/parallel/PetscSolverCahnHilliard2.h
+2
-2
AMDiS/src/parallel/PetscSolverFeti.cc
AMDiS/src/parallel/PetscSolverFeti.cc
+22
-22
AMDiS/src/parallel/PetscSolverFeti.h
AMDiS/src/parallel/PetscSolverFeti.h
+1
-1
AMDiS/src/parallel/PetscSolverGlobalBlockMatrix.h
AMDiS/src/parallel/PetscSolverGlobalBlockMatrix.h
+1
-1
AMDiS/src/parallel/PetscSolverGlobalMatrix.cc
AMDiS/src/parallel/PetscSolverGlobalMatrix.cc
+1
-1
AMDiS/src/parallel/PetscSolverGlobalMatrix.h
AMDiS/src/parallel/PetscSolverGlobalMatrix.h
+1
-1
AMDiS/src/parallel/PetscSolverNSCH.cc
AMDiS/src/parallel/PetscSolverNSCH.cc
+19
-19
AMDiS/src/parallel/PetscSolverNSCH.h
AMDiS/src/parallel/PetscSolverNSCH.h
+2
-2
AMDiS/src/parallel/PetscSolverNavierStokes.h
AMDiS/src/parallel/PetscSolverNavierStokes.h
+2
-2
AMDiS/src/parallel/PetscSolverSchur.h
AMDiS/src/parallel/PetscSolverSchur.h
+1
-1
AMDiS/src/parallel/ZoltanPartitioner.cc
AMDiS/src/parallel/ZoltanPartitioner.cc
+2
-2
AMDiS/src/reinit/BoundaryElementTopDist.cc
AMDiS/src/reinit/BoundaryElementTopDist.cc
+13
-13
AMDiS/src/reinit/BoundaryElementTopDist.h
AMDiS/src/reinit/BoundaryElementTopDist.h
+1
-1
AMDiS/src/reinit/ElementLevelSet.cc
AMDiS/src/reinit/ElementLevelSet.cc
+1
-1
AMDiS/src/reinit/ElementLevelSet.h
AMDiS/src/reinit/ElementLevelSet.h
+2
-2
AMDiS/src/reinit/ElementUpdate_2d.cc
AMDiS/src/reinit/ElementUpdate_2d.cc
+3
-3
AMDiS/src/reinit/ElementUpdate_2d.h
AMDiS/src/reinit/ElementUpdate_2d.h
+1
-1
AMDiS/src/reinit/ElementUpdate_3d.cc
AMDiS/src/reinit/ElementUpdate_3d.cc
+17
-17
AMDiS/src/reinit/ElementUpdate_3d.h
AMDiS/src/reinit/ElementUpdate_3d.h
+1
-1
AMDiS/src/reinit/HL_SignedDist.cc
AMDiS/src/reinit/HL_SignedDist.cc
+12
-12
AMDiS/src/reinit/HL_SignedDist.h
AMDiS/src/reinit/HL_SignedDist.h
+25
-25
AMDiS/src/reinit/HL_SignedDistBornemann.h
AMDiS/src/reinit/HL_SignedDistBornemann.h
+9
-9
AMDiS/src/reinit/HL_SignedDistTraverse.cc
AMDiS/src/reinit/HL_SignedDistTraverse.cc
+3
-3
AMDiS/src/reinit/HL_SignedDistTraverse.h
AMDiS/src/reinit/HL_SignedDistTraverse.h
+2
-2
AMDiS/src/reinit/VelocityExtFromVelocityField.h
AMDiS/src/reinit/VelocityExtFromVelocityField.h
+2
-2
AMDiS/src/solver/BITL_Solver.h
AMDiS/src/solver/BITL_Solver.h
+39
-29
AMDiS/src/solver/BlockMTLMatrix.h
AMDiS/src/solver/BlockMTLMatrix.h
+1
-2
AMDiS/src/solver/BlockPreconditioner.h
AMDiS/src/solver/BlockPreconditioner.h
+7
-6
AMDiS/src/solver/CombinedPreconditioner.h
AMDiS/src/solver/CombinedPreconditioner.h
+1
-1
AMDiS/src/solver/HypreSolver.h
AMDiS/src/solver/HypreSolver.h
+15
-15
AMDiS/src/solver/ITL_Preconditioner.h
AMDiS/src/solver/ITL_Preconditioner.h
+32
-40
AMDiS/src/solver/ITL_Runner.h
AMDiS/src/solver/ITL_Runner.h
+36
-35
AMDiS/src/solver/ITL_Solver.h
AMDiS/src/solver/ITL_Solver.h
+5
-4
AMDiS/src/solver/KrylovPreconditioner.h
AMDiS/src/solver/KrylovPreconditioner.h
+18
-15
AMDiS/src/solver/LinearSolver.h
AMDiS/src/solver/LinearSolver.h
+160
-253
AMDiS/src/solver/LinearSolverInterface.h
AMDiS/src/solver/LinearSolverInterface.h
+323
-0
AMDiS/src/solver/MTL4Solver.h
AMDiS/src/solver/MTL4Solver.h
+0
-237
AMDiS/src/solver/PetscSolver.h
AMDiS/src/solver/PetscSolver.h
+21
-15
AMDiS/src/solver/PetscSolver.hh
AMDiS/src/solver/PetscSolver.hh
+6
-6
AMDiS/src/solver/SolverMatrix.h
AMDiS/src/solver/SolverMatrix.h
+16
-19
AMDiS/src/solver/TriangularPreconditioner.h
AMDiS/src/solver/TriangularPreconditioner.h
+1
-1
AMDiS/src/solver/UmfPackSolver.h
AMDiS/src/solver/UmfPackSolver.h
+21
-21
AMDiS/src/solver/details/LinearSolver.h
AMDiS/src/solver/details/LinearSolver.h
+5
-5
AMDiS/src/solver/details/MTL4Solver.h
AMDiS/src/solver/details/MTL4Solver.h
+0
-168
AMDiS/src/time/RosenbrockStationary.cc
AMDiS/src/time/RosenbrockStationary.cc
+3
-3
AMDiS/src/time/RosenbrockStationary.h
AMDiS/src/time/RosenbrockStationary.h
+7
-7
extensions/ProblemStatMassConserve.h
extensions/ProblemStatMassConserve.h
+4
-4
extensions/ProblemStatMassConserve2.h
extensions/ProblemStatMassConserve2.h
+3
-3
extensions/Refinement.h
extensions/Refinement.h
+2
-2
extensions/preconditioner/PetscPreconCahnHilliard.cc
extensions/preconditioner/PetscPreconCahnHilliard.cc
+5
-6
extensions/preconditioner/PetscPreconCahnHilliard.h
extensions/preconditioner/PetscPreconCahnHilliard.h
+10
-8
extensions/preconditioner/PetscPreconPfc.cc
extensions/preconditioner/PetscPreconPfc.cc
+5
-5
extensions/preconditioner/PetscPreconPfc.h
extensions/preconditioner/PetscPreconPfc.h
+9
-5
extensions/preconditioner/PetscPreconPfcDiag.cc
extensions/preconditioner/PetscPreconPfcDiag.cc
+5
-5
extensions/preconditioner/PetscPreconPfcDiag.h
extensions/preconditioner/PetscPreconPfcDiag.h
+8
-5
extensions/preconditioner/PetscSolverNavierStokes2.h
extensions/preconditioner/PetscSolverNavierStokes2.h
+1
-1
extensions/preconditioner/PetscSolverPfc.h
extensions/preconditioner/PetscSolverPfc.h
+1
-1
extensions/preconditioner/PetscSolverPfc_diag.h
extensions/preconditioner/PetscSolverPfc_diag.h
+1
-1
No files found.
AMDiS/src/AMDiS.cc
View file @
99303ce3
...
...
@@ -38,7 +38,7 @@ namespace AMDiS {
using
namespace
std
;
#if defined(HAVE_PARALLEL_MTL4)
mtl
::
par
::
environment
*
mtl_environment
=
nullptr
;
mtl
::
par
::
environment
*
mtl_environment
=
NULL
;
#endif
void
init
(
int
argc
,
char
**
argv
,
std
::
string
initFileName
)
...
...
AMDiS/src/AMDiS.h
View file @
99303ce3
...
...
@@ -141,7 +141,7 @@
#include "solver/ITL_Preconditioner.h"
#include "solver/ITL_Solver.h"
#include "solver/LinearSolver.h"
#include "solver/LinearSolver
Interface
.h"
#include "time/RosenbrockAdaptInstationary.h"
#include "time/RosenbrockStationary.h"
...
...
AMDiS/src/AMDiS_fwd.h
View file @
99303ce3
...
...
@@ -66,7 +66,7 @@ namespace AMDiS {
class
Marker
;
class
Mesh
;
class
MeshStructure
;
class
LinearSolver
;
class
LinearSolver
Interface
;
class
Operator
;
class
OperatorTerm
;
class
Parametric
;
...
...
@@ -153,7 +153,7 @@ namespace AMDiS {
template
<
typename
T
>
class
DOFVector
;
template
<
typename
T
>
class
DimVec
;
template
<
typename
T
>
class
DimMat
;
// template<typename ITLSolver> class ITL_LinearSolver;
// template<typename ITLSolver> class ITL_LinearSolver
Interface
;
template
<
typename
T
,
typename
MatT
,
typename
VecT
>
class
ITL_Preconditioner
;
template
<
typename
T
>
class
Matrix
;
template
<
typename
T
>
class
MatrixOfFixVecs
;
...
...
AMDiS/src/AdaptBase.h
View file @
99303ce3
...
...
@@ -39,8 +39,8 @@ namespace AMDiS {
AdaptBase
(
std
::
string
sname
,
ProblemIterationInterface
*
problemIteration_
,
AdaptInfo
*
adapt
,
ProblemTimeInterface
*
problemTime_
=
nullptr
,
AdaptInfo
*
initialAdaptInfo_
=
nullptr
)
ProblemTimeInterface
*
problemTime_
=
NULL
,
AdaptInfo
*
initialAdaptInfo_
=
NULL
)
:
name
(
sname
),
problemIteration
(
problemIteration_
),
adaptInfo
(
adapt
),
...
...
AMDiS/src/Assembler.cc
View file @
99303ce3
...
...
@@ -44,8 +44,8 @@ namespace AMDiS {
elementMatrix
(
nRow
,
nCol
),
elementVector
(
nRow
),
tmpMat
(
nRow
,
nCol
),
lastMatEl
(
nullptr
),
lastVecEl
(
nullptr
),
lastMatEl
(
NULL
),
lastVecEl
(
NULL
),
lastTraverseId
(
-
1
)
{}
...
...
@@ -105,7 +105,7 @@ namespace AMDiS {
rememberElMat
=
true
;
Element
*
el
=
smallElInfo
->
getElement
();
lastVecEl
=
lastMatEl
=
nullptr
;
lastVecEl
=
lastMatEl
=
NULL
;
if
((
el
!=
lastMatEl
&&
el
!=
lastVecEl
)
||
!
operat
->
isOptimized
())
initElement
(
smallElInfo
,
largeElInfo
);
...
...
@@ -341,7 +341,7 @@ namespace AMDiS {
TEST_EXIT
(
rowFeSpace
->
getBasisFcts
()
==
colFeSpace
->
getBasisFcts
())
(
"Works only for equal basis functions for different components!
\n
"
);
Element
*
usedEl
=
nullptr
;
Element
*
usedEl
=
NULL
;
if
(
operat
->
uhOld
->
getFeSpace
()
->
getMesh
()
==
auxElInfo
->
getMesh
())
usedEl
=
auxElInfo
->
getElement
();
else
if
(
operat
->
uhOld
->
getFeSpace
()
->
getMesh
()
==
mainElInfo
->
getMesh
())
...
...
@@ -428,8 +428,8 @@ namespace AMDiS {
void
Assembler
::
finishAssembling
()
{
lastVecEl
=
nullptr
;
lastMatEl
=
nullptr
;
lastVecEl
=
NULL
;
lastMatEl
=
NULL
;
}
...
...
AMDiS/src/Assembler.h
View file @
99303ce3
...
...
@@ -57,7 +57,7 @@ namespace AMDiS {
/// Constructor
Assembler
(
Operator
*
op
,
const
FiniteElemSpace
*
rowFeSpace
,
const
FiniteElemSpace
*
colFeSpace
=
nullptr
);
const
FiniteElemSpace
*
colFeSpace
=
NULL
);
/// Destructor
~
Assembler
();
...
...
@@ -155,8 +155,8 @@ namespace AMDiS {
/// Initialisation for the given ElInfo. The call is deligated to the sub assemblers.
void
initElement
(
const
ElInfo
*
smallElInfo
,
const
ElInfo
*
largeElInfo
=
nullptr
,
Quadrature
*
quad
=
nullptr
);
const
ElInfo
*
largeElInfo
=
NULL
,
Quadrature
*
quad
=
NULL
);
/// Sets quadratures of all sub assemblers.
void
setQuadratures
(
Quadrature
*
quad2
,
...
...
@@ -287,7 +287,7 @@ namespace AMDiS {
Quadrature
*
quad1GrdPhi
,
Quadrature
*
quad0
,
const
FiniteElemSpace
*
rowFeSpace
,
const
FiniteElemSpace
*
colFeSpace
=
nullptr
);
const
FiniteElemSpace
*
colFeSpace
=
NULL
);
};
/**
...
...
@@ -306,7 +306,7 @@ namespace AMDiS {
Quadrature
*
quad1GrdPhi
,
Quadrature
*
quad0
,
const
FiniteElemSpace
*
rowFeSpace
,
const
FiniteElemSpace
*
colFeSpace
=
nullptr
);
const
FiniteElemSpace
*
colFeSpace
=
NULL
);
};
}
...
...
AMDiS/src/BoundaryCondition.h
View file @
99303ce3
...
...
@@ -44,7 +44,7 @@ namespace AMDiS {
/// Constructor.
BoundaryCondition
(
BoundaryType
type
,
const
FiniteElemSpace
*
rowFeSpace_
,
const
FiniteElemSpace
*
colFeSpace_
=
nullptr
)
const
FiniteElemSpace
*
colFeSpace_
=
NULL
)
:
boundaryType
(
type
),
rowFeSpace
(
rowFeSpace_
),
colFeSpace
(
colFeSpace_
)
...
...
AMDiS/src/BoundaryManager.cc
View file @
99303ce3
...
...
@@ -59,7 +59,7 @@ namespace AMDiS {
FUNCNAME
(
"BoundaryManager::addBoundaryCondition()"
);
BoundaryType
type
=
localBC
->
getBoundaryType
();
TEST_EXIT
(
localBCs
[
type
]
==
nullptr
)
TEST_EXIT
(
localBCs
[
type
]
==
NULL
)
(
"There is already a condition for this type %d.
\n
"
,
type
);
localBCs
[
type
]
=
localBC
;
...
...
AMDiS/src/Bubble.cc
View file @
99303ce3
...
...
@@ -48,7 +48,7 @@ namespace AMDiS {
std
::
vector
<
GrdBasFctType
*>
Bubble
::
grdPhifunc
;
// first derivatives
std
::
vector
<
D2BasFctType
*>
Bubble
::
D2Phifunc
;
// second derivatives
Bubble
*
Bubble
::
Singleton
=
nullptr
;
Bubble
*
Bubble
::
Singleton
=
NULL
;
Bubble
::
Bubble
(
int
dim
,
int
degree
)
:
BasisFunction
(
std
::
string
(
"Bubble"
),
dim
,
degree
)
...
...
@@ -72,7 +72,7 @@ namespace AMDiS {
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
bary
->
size
());
i
++
)
if
((
*
bary
)[
i
])
{
delete
(
*
bary
)[
i
];
(
*
bary
)[
i
]
=
nullptr
;
(
*
bary
)[
i
]
=
NULL
;
}
}
...
...
@@ -80,7 +80,7 @@ namespace AMDiS {
// creates a new FE-Space of this instance
Bubble
*
Bubble
::
getBubble
(
int
dim
,
int
degree
)
{
if
(
Singleton
==
nullptr
)
//if their is no instance
if
(
Singleton
==
NULL
)
//if their is no instance
{
Singleton
=
new
Bubble
(
dim
,
degree
);
}
...
...
@@ -92,7 +92,7 @@ namespace AMDiS {
{
if
(
Singleton
)
{
delete
(
Singleton
);
Singleton
=
nullptr
;
Singleton
=
NULL
;
}
}
...
...
@@ -163,7 +163,7 @@ namespace AMDiS {
{
FUNCNAME_DBG
(
"Bubble::setVertices()"
);
TEST_EXIT_DBG
(
*
vertices
==
nullptr
)(
"vertices !=
nullptr
\n
"
);
TEST_EXIT_DBG
(
*
vertices
==
NULL
)(
"vertices !=
NULL
\n
"
);
int
dimOfPosition
=
DIM_OF_INDEX
(
position
,
dim
);
...
...
@@ -186,7 +186,7 @@ namespace AMDiS {
GeoIndex
position
,
int
positionIndex
,
int
nodeIndex
)
:
vertices
(
nullptr
)
:
vertices
(
NULL
)
{
FUNCNAME
(
"Bubble::Phi::Phi()"
);
...
...
@@ -235,7 +235,7 @@ namespace AMDiS {
GeoIndex
position
,
int
positionIndex
,
int
nodeIndex
)
:
vertices
(
nullptr
)
:
vertices
(
NULL
)
{
// get relevant vertices
Bubble
::
setVertices
(
owner
->
getDim
(),
...
...
@@ -280,7 +280,7 @@ namespace AMDiS {
GeoIndex
position
,
int
positionIndex
,
int
nodeIndex
)
:
vertices
(
nullptr
)
:
vertices
(
NULL
)
{
// get relevant vertices
Bubble
::
setVertices
(
owner
->
getDim
(),
...
...
@@ -354,7 +354,7 @@ namespace AMDiS {
return
&
sortedCenter
;
ERROR_EXIT
(
"should not be reached
\n
"
);
return
nullptr
;
return
NULL
;
}
...
...
AMDiS/src/Cholesky.cc
View file @
99303ce3
...
...
@@ -33,7 +33,7 @@ bool Cholesky::factorization(Matrix<double> *A, Vector<double> *p)
int
n
=
A
->
getNumRows
();
// Checking memory for vector P of diagonal elements of factorization.
static
Vector
<
double
>
*
pT
=
nullptr
;
static
Vector
<
double
>
*
pT
=
NULL
;
if
(
p
)
{
...
...
@@ -104,7 +104,7 @@ bool Cholesky::solve(Matrix<double> *A, Vector<double> *b, Vector<double> *x,
x
=
new
Vector
<
double
>
(
n
);
// Checking vector P.
static
Vector
<
double
>
*
pT
=
nullptr
;
static
Vector
<
double
>
*
pT
=
NULL
;
if
(
!
p
||
(
p
->
getSize
()
!=
n
))
{
...
...
@@ -158,7 +158,7 @@ bool Cholesky::solve(Matrix<double> *A, Vector<WorldVector<double> > *b,
x
=
new
Vector
<
WorldVector
<
double
>
>
(
n
);
// Checking vector P.
static
Vector
<
double
>
*
pT
=
nullptr
;
static
Vector
<
double
>
*
pT
=
NULL
;
if
(
!
p
||
(
p
->
getSize
()
!=
n
))
{
...
...
AMDiS/src/Cholesky.h
View file @
99303ce3
...
...
@@ -53,16 +53,16 @@ class Cholesky
/** \brief
* Solves system A*X=B, where A is a positive definite matrix.
* If P=
nullptr
; A is assumed to be positive definite, and a Cholesky
* If P=
NULL
; A is assumed to be positive definite, and a Cholesky
* decomposition is computed using the previous routine.
* If P is given, A and P are assumed to be already given as the output of
* the previous routine.
*/
static
bool
solve
(
Matrix
<
double
>
*
A
,
Vector
<
double
>
*
b
,
Vector
<
double
>
*
x
,
Vector
<
double
>
*
p
=
nullptr
);
Vector
<
double
>
*
p
=
NULL
);
static
bool
solve
(
Matrix
<
double
>
*
A
,
Vector
<
WorldVector
<
double
>
>
*
b
,
Vector
<
WorldVector
<
double
>
>
*
x
,
Vector
<
double
>
*
p
=
nullptr
);
Vector
<
double
>
*
p
=
NULL
);
};
}
...
...
AMDiS/src/CoarseningManager.h
View file @
99303ce3
...
...
@@ -43,8 +43,8 @@ namespace AMDiS {
public:
/// Constructs a CoarseningManager which belongs to aMesh
CoarseningManager
()
:
mesh
(
nullptr
),
stack
(
nullptr
),
:
mesh
(
NULL
),
stack
(
NULL
),
doMore
(
0
)
{}
...
...
AMDiS/src/CoarseningManager1d.cc
View file @
99303ce3
...
...
@@ -134,8 +134,8 @@ namespace AMDiS {
parent
->
coarsenElementData
(
child
[
0
],
child
[
1
]);
parent
->
setFirstChild
(
nullptr
);
parent
->
setSecondChild
(
nullptr
);
parent
->
setFirstChild
(
NULL
);
parent
->
setSecondChild
(
NULL
);
mesh
->
freeElement
(
child
[
0
]);
mesh
->
freeElement
(
child
[
1
]);
...
...
AMDiS/src/CoarseningManager2d.cc
View file @
99303ce3
...
...
@@ -64,8 +64,8 @@ namespace AMDiS {
el
->
coarsenElementData
(
child
[
0
],
child
[
1
]);
el
->
setFirstChild
(
nullptr
);
el
->
setSecondChild
(
nullptr
);
el
->
setFirstChild
(
NULL
);
el
->
setSecondChild
(
NULL
);
mesh
->
freeElement
(
child
[
0
]);
mesh
->
freeElement
(
child
[
1
]);
...
...
@@ -197,7 +197,7 @@ namespace AMDiS {
DegreeOfFreedom
*
next_edge
[
2
];
RCNeighbourList
periodicList
;
while
(
edge
[
0
]
!=
nullptr
)
{
while
(
edge
[
0
]
!=
NULL
)
{
coarse_list
.
periodicSplit
(
edge
,
next_edge
,
&
n_neigh
,
&
n_neigh_periodic
,
periodicList
);
...
...
AMDiS/src/CoarseningManager3d.cc
View file @
99303ce3
...
...
@@ -181,7 +181,7 @@ namespace AMDiS {
DegreeOfFreedom
*
next_edge
[
2
];
RCNeighbourList
periodicList
;
while
(
edge
[
0
]
!=
nullptr
)
{
while
(
edge
[
0
]
!=
NULL
)
{
coarsenList
.
periodicSplit
(
edge
,
next_edge
,
&
n_neigh
,
&
n_neigh_periodic
,
periodicList
);
...
...
@@ -262,8 +262,8 @@ namespace AMDiS {
el
->
coarsenElementData
(
child
[
0
],
child
[
1
],
el_type
);
el
->
setFirstChild
(
nullptr
);
el
->
setSecondChild
(
nullptr
);
el
->
setFirstChild
(
NULL
);
el
->
setSecondChild
(
NULL
);
mesh
->
freeElement
(
child
[
0
]);
mesh
->
freeElement
(
child
[
1
]);
...
...
@@ -309,7 +309,7 @@ namespace AMDiS {
dynamic_cast
<
Tetrahedron
*>
(
const_cast
<
Element
*>
(
elInfo
->
getElement
()));
Tetrahedron
*
neigh
=
dynamic_cast
<
Tetrahedron
*>
(
const_cast
<
Element
*>
(
elInfo
->
getNeighbour
(
3
-
dir
)));
if
(
neigh
==
nullptr
)
if
(
neigh
==
NULL
)
return
true
;
int
opp_v
=
elInfo
->
getOppVertex
(
3
-
dir
);
...
...
@@ -445,7 +445,7 @@ namespace AMDiS {
Tetrahedron
*
el
=
dynamic_cast
<
Tetrahedron
*>
(
const_cast
<
Element
*>
(
coarsenList
.
getElement
(
0
)));
DegreeOfFreedom
*
dof
=
nullptr
;
DegreeOfFreedom
*
dof
=
NULL
;
TEST_EXIT_DBG
(
el
)(
"No element!
\n
"
);
TEST_EXIT_DBG
(
el
->
getChild
(
0
))(
"No child in element!
\n
"
);
...
...
@@ -492,7 +492,7 @@ namespace AMDiS {
coarsenList
.
getElement
(
0
)
->
eraseNewCoord
();
for
(
int
i
=
0
;
i
<
n_neigh
;
i
++
)
{
coarsenList
.
getElement
(
i
)
->
setNewCoord
(
nullptr
);
coarsenList
.
getElement
(
i
)
->
setNewCoord
(
NULL
);
coarsenTetrahedron
(
coarsenList
,
i
);
}
...
...
AMDiS/src/ComponentTraverseInfo.cc
View file @
99303ce3
...
...
@@ -32,13 +32,13 @@ namespace AMDiS {
void
SingleComponentInfo
::
updateStatus
()
{
if
(
rowFeSpace
==
nullptr
)
{
if
(
rowFeSpace
==
NULL
)
{
status
=
SingleComponentInfo
::
EMPTY
;
return
;
}
if
(
colFeSpace
==
nullptr
||
(
colFeSpace
!=
nullptr
&&
rowFeSpace
->
getMesh
()
==
colFeSpace
->
getMesh
()))
{
if
(
colFeSpace
==
NULL
||
(
colFeSpace
!=
NULL
&&
rowFeSpace
->
getMesh
()
==
colFeSpace
->
getMesh
()))
{
if
(
auxFeSpaces
.
size
()
==
0
)
{
status
=
SingleComponentInfo
::
EQ_SPACES_NO_AUX
;
}
else
{
...
...
@@ -91,7 +91,7 @@ namespace AMDiS {
const
FiniteElemSpace
*
rowFeSpace
=
getRowFeSpace
(
row
);
TEST_EXIT_DBG
(
rowFeSpace
!=
nullptr
)(
"No row FE space!
\n
"
);
TEST_EXIT_DBG
(
rowFeSpace
!=
NULL
)(
"No row FE space!
\n
"
);
for
(
int
i
=
0
;
i
<
nComponents
;
i
++
)
{
if
(
matrixComponents
[
row
][
i
].
getColFeSpace
()
&&
matrixComponents
[
row
][
i
].
getColFeSpace
()
!=
rowFeSpace
)
...
...
@@ -103,7 +103,7 @@ namespace AMDiS {
if
(
vectorComponents
[
row
].
getAuxFeSpace
()
!=
rowFeSpace
)
return
vectorComponents
[
row
].
getAuxFeSpace
();
return
nullptr
;
return
NULL
;
}
}
AMDiS/src/ComponentTraverseInfo.h
View file @
99303ce3
...
...
@@ -35,12 +35,12 @@ namespace AMDiS {
{
public:
SingleComponentInfo
()
:
rowFeSpace
(
nullptr
),
colFeSpace
(
nullptr
),
:
rowFeSpace
(
NULL
),
colFeSpace
(
NULL
),
status
(
0
)
{}
void
setFeSpace
(
const
FiniteElemSpace
*
row
,
const
FiniteElemSpace
*
col
=
nullptr
)
void
setFeSpace
(
const
FiniteElemSpace
*
row
,
const
FiniteElemSpace
*
col
=
NULL
)
{
rowFeSpace
=
row
;
colFeSpace
=
col
;
...
...
@@ -58,7 +58,7 @@ namespace AMDiS {
bool
hasFeSpace
()
{
return
rowFeSpace
!=
nullptr
;
return
rowFeSpace
!=
NULL
;
}
void
updateStatus
();
...
...
@@ -87,7 +87,7 @@ namespace AMDiS {
if
(
auxFeSpaces
.
size
()
==
1
)
return
(
*
(
auxFeSpaces
.
begin
()));
return
nullptr
;
return
NULL
;
}
inline
int
getStatus
()
const
...
...
AMDiS/src/CouplingIterationInterface.cc
View file @
99303ce3
...
...
@@ -108,14 +108,14 @@ namespace AMDiS {
throw
(
std
::
runtime_error
(
"Problem number out of range."
));
size_t
sum
=
0
;
ProblemStatBase
*
probIter
=
nullptr
;
ProblemStatBase
*
probIter
=
NULL
;
for
(
size_t
i
=
0
;
i
<
problems
.
size
();
++
i
)
{
if
(
sum
+
problems
[
i
]
->
getNumProblems
()
<=
static_cast
<
size_t
>
(
number
))
sum
+=
problems
[
i
]
->
getNumProblems
();
else
probIter
=
problems
[
i
]
->
getProblem
(
number
-
sum
);
}
if
(
probIter
==
nullptr
)
if
(
probIter
==
NULL
)
throw
(
std
::
runtime_error
(
"Problem not found. Should not happen, since number is in range."
));
return
probIter
;
}
...
...
AMDiS/src/CouplingProblemStat.h
View file @
99303ce3
...
...
@@ -51,8 +51,8 @@ namespace AMDiS {
:
name
(
name_
),
nComponents
(
0
),
nMeshes
(
0
),
refinementManager
(
nullptr
),
coarseningManager
(
nullptr
)
refinementManager
(
NULL
),
coarseningManager
(
NULL
)
{}
/// Destructor
...
...
@@ -67,12 +67,12 @@ namespace AMDiS {
/// Initialisation of the problem.
virtual
void
initialize
(
Flag
initFlag
,
ProblemStatSeq
*
adoptProblem
=
nullptr
,
ProblemStatSeq
*
adoptProblem
=
NULL
,
Flag
adoptFlag
=
INIT_NOTHING
)
{
FUNCNAME
(
"CouplingProblemStat::initialize()"
);
// create one refinement-/coarseningmanager for all problems
if
(
refinementManager
!=
nullptr
&&
coarseningManager
!=
nullptr
)
{
if
(
refinementManager
!=
NULL
&&
coarseningManager
!=
NULL
)
{
WARNING
(
"refinement-/coarseningmanager already created
\n
"
);
}
else
{
if
(
!
adoptProblem
)
...
...
@@ -83,7 +83,7 @@ namespace AMDiS {
}
}
if
(
refinementManager
==
nullptr
||
coarseningManager
==
nullptr
)
if
(
refinementManager
==
NULL
||
coarseningManager
==
NULL
)
WARNING
(
"no refinement-/coarseningmanager created
\n
"
);
// create Meshes and FeSpaces
...
...
@@ -124,12 +124,12 @@ namespace AMDiS {
Parameters
::
get
(
problems
[
i
]
->
getName
()
+
"->polynomial degree["
+
boost
::
lexical_cast
<
std
::
string
>
(
j
)
+
"]"
,
degree
);
if
(
feSpaceMap
[
std
::
pair
<
Mesh
*
,
int
>
(
meshByName
[
meshName
],
degree
)]
==
nullptr
)
{
if
(
feSpaceMap
[
std
::
pair
<
Mesh
*
,
int
>
(
meshByName
[
meshName
],
degree
)]
==
NULL
)
{
std
::
stringstream
s
;
s
<<
problems
[
i
]
->
getName
()
<<
"->feSpace["
<<
j
<<
"]"
;
FiniteElemSpace
*
newFeSpace
=
FiniteElemSpace
::
provideFeSpace
(
nullptr
,
Lagrange
::
getLagrange
(
dim
,
degree
),
FiniteElemSpace
::
provideFeSpace
(
NULL
,
Lagrange
::
getLagrange
(
dim
,
degree
),
meshByName
[
meshName
],
s
.
str
());
feSpaceMap
[
std
::
pair
<
Mesh
*
,
int
>
(
meshByName
[
meshName
],
degree
)]
=
newFeSpace
;
feSpaces
.
push_back
(
newFeSpace
);
...
...
AMDiS/src/CreatorInterface.h
View file @
99303ce3
...
...
@@ -35,9 +35,9 @@ namespace AMDiS {
* The creation of an object of a sub class of BaseClass is deligated
* to a corresponding sub class of Creator<BaseClass>. So it is possible to
* manage a CreatorMap, which can be extended at run-time. An example is
* the LinearSolverMap: If you write your own LinearSolver sub class and a
* corresponding Creator<LinearSolver<T> >, you can add the creator together
* with a key string to the LinearSolverMap. Then you can create an LinearSolver
* the LinearSolver
Interface
Map: If you write your own LinearSolver
Interface
sub class and a
* corresponding Creator<LinearSolver
Interface
<T> >, you can add the creator together
* with a key string to the LinearSolver
Interface
Map. Then you can create an LinearSolver
Interface
* depending of a key string read from the init file, which can also be
* your own new solver.
*/
...
...
@@ -69,7 +69,7 @@ namespace AMDiS {
};
/** \brief
* A Creator which creates no object abd returns
nullptr
instead.
* A Creator which creates no object abd returns
NULL
instead.
* Used together with the key word 'no' in CreatorMap.