Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
amdis
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Aland, Sebastian
amdis
Commits
9c44b131
Commit
9c44b131
authored
Aug 06, 2014
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge of branches/expr to trunk
parent
a091668f
Changes
326
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
326 changed files
with
14559 additions
and
6818 deletions
+14559
-6818
AMDiS/AMDISConfig.cmake.in
AMDiS/AMDISConfig.cmake.in
+3
-3
AMDiS/CMakeLists.txt
AMDiS/CMakeLists.txt
+25
-8
AMDiS/HYPREConfig.cmake
AMDiS/HYPREConfig.cmake
+0
-0
AMDiS/src/AMDiS.h
AMDiS/src/AMDiS.h
+5
-3
AMDiS/src/AMDiS_fwd.h
AMDiS/src/AMDiS_fwd.h
+1
-1
AMDiS/src/AdaptInfo.h
AMDiS/src/AdaptInfo.h
+30
-0
AMDiS/src/AdaptInstationary.cc
AMDiS/src/AdaptInstationary.cc
+18
-16
AMDiS/src/AdaptStationary.cc
AMDiS/src/AdaptStationary.cc
+1
-1
AMDiS/src/BasisFunction.cc
AMDiS/src/BasisFunction.cc
+1
-0
AMDiS/src/BasisFunction.h
AMDiS/src/BasisFunction.h
+27
-0
AMDiS/src/Bubble.cc
AMDiS/src/Bubble.cc
+980
-0
AMDiS/src/Bubble.h
AMDiS/src/Bubble.h
+427
-0
AMDiS/src/Cholesky.cc
AMDiS/src/Cholesky.cc
+7
-0
AMDiS/src/Cholesky.h
AMDiS/src/Cholesky.h
+4
-0
AMDiS/src/ComponentTraverseInfo.cc
AMDiS/src/ComponentTraverseInfo.cc
+2
-2
AMDiS/src/CreatorMap.cc
AMDiS/src/CreatorMap.cc
+22
-0
AMDiS/src/DOFAdmin.h
AMDiS/src/DOFAdmin.h
+5
-0
AMDiS/src/DOFIndexed.h
AMDiS/src/DOFIndexed.h
+38
-0
AMDiS/src/DOFIterator.h
AMDiS/src/DOFIterator.h
+14
-6
AMDiS/src/DOFMatrix.cc
AMDiS/src/DOFMatrix.cc
+17
-14
AMDiS/src/DOFMatrix.h
AMDiS/src/DOFMatrix.h
+13
-12
AMDiS/src/DOFVector.cc
AMDiS/src/DOFVector.cc
+104
-10
AMDiS/src/DOFVector.h
AMDiS/src/DOFVector.h
+49
-20
AMDiS/src/DOFVector.hh
AMDiS/src/DOFVector.hh
+30
-23
AMDiS/src/ElementFunction.h
AMDiS/src/ElementFunction.h
+50
-0
AMDiS/src/FirstOrderTerm.h
AMDiS/src/FirstOrderTerm.h
+12
-9
AMDiS/src/FixVec.h
AMDiS/src/FixVec.h
+60
-51
AMDiS/src/FixVec.hh
AMDiS/src/FixVec.hh
+3
-3
AMDiS/src/Functors.h
AMDiS/src/Functors.h
+22
-10
AMDiS/src/GenericOperatorTerm.h
AMDiS/src/GenericOperatorTerm.h
+96
-21
AMDiS/src/GenericOperatorTerm.hh
AMDiS/src/GenericOperatorTerm.hh
+104
-38
AMDiS/src/Global.h
AMDiS/src/Global.h
+3
-0
AMDiS/src/Initfile.h
AMDiS/src/Initfile.h
+14
-7
AMDiS/src/Lagrange.cc
AMDiS/src/Lagrange.cc
+129
-8
AMDiS/src/Lagrange.h
AMDiS/src/Lagrange.h
+24
-0
AMDiS/src/Mesh.cc
AMDiS/src/Mesh.cc
+39
-18
AMDiS/src/Mesh.h
AMDiS/src/Mesh.h
+1
-1
AMDiS/src/MeshStructure.cc
AMDiS/src/MeshStructure.cc
+21
-9
AMDiS/src/OperatorTerm.hh
AMDiS/src/OperatorTerm.hh
+1
-1
AMDiS/src/ProblemInstat.h
AMDiS/src/ProblemInstat.h
+5
-3
AMDiS/src/ProblemStat.cc
AMDiS/src/ProblemStat.cc
+37
-15
AMDiS/src/Recovery.cc
AMDiS/src/Recovery.cc
+4
-0
AMDiS/src/Serializer.h
AMDiS/src/Serializer.h
+1
-1
AMDiS/src/Traits.h
AMDiS/src/Traits.h
+225
-0
AMDiS/src/compositeFEM/CompositeFEMMethods.cc
AMDiS/src/compositeFEM/CompositeFEMMethods.cc
+6
-0
AMDiS/src/compositeFEM/CompositeFEMMethods.h
AMDiS/src/compositeFEM/CompositeFEMMethods.h
+6
-0
AMDiS/src/compositeFEM/CompositeFEMOperator.cc
AMDiS/src/compositeFEM/CompositeFEMOperator.cc
+7
-0
AMDiS/src/compositeFEM/CompositeFEMOperator.h
AMDiS/src/compositeFEM/CompositeFEMOperator.h
+6
-0
AMDiS/src/compositeFEM/ElementLevelSet.cc
AMDiS/src/compositeFEM/ElementLevelSet.cc
+6
-0
AMDiS/src/compositeFEM/ElementLevelSet.h
AMDiS/src/compositeFEM/ElementLevelSet.h
+7
-2
AMDiS/src/compositeFEM/LevelSetAdaptMesh.cc
AMDiS/src/compositeFEM/LevelSetAdaptMesh.cc
+6
-0
AMDiS/src/compositeFEM/LevelSetAdaptMesh.h
AMDiS/src/compositeFEM/LevelSetAdaptMesh.h
+6
-0
AMDiS/src/compositeFEM/PenaltyOperator.cc
AMDiS/src/compositeFEM/PenaltyOperator.cc
+7
-0
AMDiS/src/compositeFEM/PenaltyOperator.h
AMDiS/src/compositeFEM/PenaltyOperator.h
+6
-0
AMDiS/src/compositeFEM/TranslateLsFct.h
AMDiS/src/compositeFEM/TranslateLsFct.h
+6
-0
AMDiS/src/deprecated/MathFunctions.h
AMDiS/src/deprecated/MathFunctions.h
+0
-0
AMDiS/src/deprecated/ProblemImplicit.cc
AMDiS/src/deprecated/ProblemImplicit.cc
+0
-0
AMDiS/src/deprecated/ProblemImplicit.h
AMDiS/src/deprecated/ProblemImplicit.h
+0
-0
AMDiS/src/est/Estimator.cc
AMDiS/src/est/Estimator.cc
+3
-2
AMDiS/src/est/ResidualEstimator.cc
AMDiS/src/est/ResidualEstimator.cc
+1
-1
AMDiS/src/expressions/AtomicExpression.h
AMDiS/src/expressions/AtomicExpression.h
+0
-491
AMDiS/src/expressions/GradientOf.h
AMDiS/src/expressions/GradientOf.h
+0
-250
AMDiS/src/expressions/LazyExpression.h
AMDiS/src/expressions/LazyExpression.h
+0
-547
AMDiS/src/expressions/LazyOperatorTerm.h
AMDiS/src/expressions/LazyOperatorTerm.h
+128
-135
AMDiS/src/expressions/ValueOf.h
AMDiS/src/expressions/ValueOf.h
+0
-367
AMDiS/src/expressions/add_expr.hpp
AMDiS/src/expressions/add_expr.hpp
+167
-0
AMDiS/src/expressions/cmath_expr.h
AMDiS/src/expressions/cmath_expr.h
+0
-1185
AMDiS/src/expressions/cmath_expr.hpp
AMDiS/src/expressions/cmath_expr.hpp
+740
-0
AMDiS/src/expressions/coords_expr.hpp
AMDiS/src/expressions/coords_expr.hpp
+359
-0
AMDiS/src/expressions/diff_expr.hpp
AMDiS/src/expressions/diff_expr.hpp
+684
-0
AMDiS/src/expressions/expr_traits.hpp
AMDiS/src/expressions/expr_traits.hpp
+142
-0
AMDiS/src/expressions/expressions.h
AMDiS/src/expressions/expressions.h
+44
-0
AMDiS/src/expressions/functorN_expr.hpp
AMDiS/src/expressions/functorN_expr.hpp
+259
-0
AMDiS/src/expressions/functor_expr.hpp
AMDiS/src/expressions/functor_expr.hpp
+279
-0
AMDiS/src/expressions/gradientOf.hpp
AMDiS/src/expressions/gradientOf.hpp
+383
-0
AMDiS/src/expressions/mult_expr.hpp
AMDiS/src/expressions/mult_expr.hpp
+141
-0
AMDiS/src/expressions/simplify_expr.hpp
AMDiS/src/expressions/simplify_expr.hpp
+448
-0
AMDiS/src/expressions/valueOf.hpp
AMDiS/src/expressions/valueOf.hpp
+437
-0
AMDiS/src/expressions/value_expr.hpp
AMDiS/src/expressions/value_expr.hpp
+217
-0
AMDiS/src/expressions/vec_functors.hpp
AMDiS/src/expressions/vec_functors.hpp
+427
-0
AMDiS/src/io/Arh2Reader.h
AMDiS/src/io/Arh2Reader.h
+4
-8
AMDiS/src/io/FileWriter.cc
AMDiS/src/io/FileWriter.cc
+2
-1
AMDiS/src/io/FileWriter.h
AMDiS/src/io/FileWriter.h
+1
-52
AMDiS/src/io/FileWriterInterface.h
AMDiS/src/io/FileWriterInterface.h
+93
-0
AMDiS/src/io/MacroInfo.cc
AMDiS/src/io/MacroInfo.cc
+16
-3
AMDiS/src/io/MacroInfo.h
AMDiS/src/io/MacroInfo.h
+12
-0
AMDiS/src/io/MacroReader.cc
AMDiS/src/io/MacroReader.cc
+51
-3
AMDiS/src/io/MacroReader.h
AMDiS/src/io/MacroReader.h
+8
-1
AMDiS/src/io/PngReader.h
AMDiS/src/io/PngReader.h
+1
-1
AMDiS/src/io/VtkReader.hh
AMDiS/src/io/VtkReader.hh
+7
-5
AMDiS/src/io/XYZReader.cc
AMDiS/src/io/XYZReader.cc
+6
-1
AMDiS/src/io/XYZReader.h
AMDiS/src/io/XYZReader.h
+5
-0
AMDiS/src/io/detail/Arh2Reader.h
AMDiS/src/io/detail/Arh2Reader.h
+1
-1
AMDiS/src/io/detail/Arh2Writer.cc
AMDiS/src/io/detail/Arh2Writer.cc
+2
-1
AMDiS/src/io/detail/Arh2Writer.h
AMDiS/src/io/detail/Arh2Writer.h
+1
-1
AMDiS/src/io/detail/ArhReader.cc
AMDiS/src/io/detail/ArhReader.cc
+1
-1
AMDiS/src/io/detail/ArhReader.h
AMDiS/src/io/detail/ArhReader.h
+1
-3
AMDiS/src/io/detail/ArhWriter.cc
AMDiS/src/io/detail/ArhWriter.cc
+2
-1
AMDiS/src/io/detail/ArhWriter.h
AMDiS/src/io/detail/ArhWriter.h
+2
-3
AMDiS/src/io/detail/VtkReader.h
AMDiS/src/io/detail/VtkReader.h
+3
-1
AMDiS/src/io/detail/VtkWriter.cc
AMDiS/src/io/detail/VtkWriter.cc
+1
-1
AMDiS/src/operations/functors.hpp
AMDiS/src/operations/functors.hpp
+268
-0
AMDiS/src/operations/meta.hpp
AMDiS/src/operations/meta.hpp
+151
-0
AMDiS/src/operations/norm.hpp
AMDiS/src/operations/norm.hpp
+215
-0
AMDiS/src/operations/product.hpp
AMDiS/src/operations/product.hpp
+277
-0
AMDiS/src/parallel/BddcMlSolver.cc
AMDiS/src/parallel/BddcMlSolver.cc
+6
-2
AMDiS/src/parallel/BddcMlSolver.h
AMDiS/src/parallel/BddcMlSolver.h
+1
-1
AMDiS/src/parallel/ElementObjectDatabase.cc
AMDiS/src/parallel/ElementObjectDatabase.cc
+16
-0
AMDiS/src/parallel/ElementObjectDatabase.h
AMDiS/src/parallel/ElementObjectDatabase.h
+5
-12
AMDiS/src/parallel/MeshDistributor.cc
AMDiS/src/parallel/MeshDistributor.cc
+382
-52
AMDiS/src/parallel/MeshDistributor.h
AMDiS/src/parallel/MeshDistributor.h
+47
-58
AMDiS/src/parallel/MeshManipulation.cc
AMDiS/src/parallel/MeshManipulation.cc
+8
-4
AMDiS/src/parallel/MeshPartitioner.cc
AMDiS/src/parallel/MeshPartitioner.cc
+0
-3
AMDiS/src/parallel/MpiHelper.h
AMDiS/src/parallel/MpiHelper.h
+20
-9
AMDiS/src/parallel/PITL_Solver.h
AMDiS/src/parallel/PITL_Solver.h
+3
-3
AMDiS/src/parallel/ParallelMapper.h
AMDiS/src/parallel/ParallelMapper.h
+4
-2
AMDiS/src/parallel/PetscSolver.cc
AMDiS/src/parallel/PetscSolver.cc
+2
-7
AMDiS/src/parallel/PetscSolverFetiDebug.cc
AMDiS/src/parallel/PetscSolverFetiDebug.cc
+1
-0
AMDiS/src/parallel/PetscSolverNavierStokes.cc
AMDiS/src/parallel/PetscSolverNavierStokes.cc
+22
-22
AMDiS/src/parallel/StdMpi.cc
AMDiS/src/parallel/StdMpi.cc
+33
-0
AMDiS/src/parallel/StdMpi.h
AMDiS/src/parallel/StdMpi.h
+13
-0
AMDiS/src/parallel/ZoltanPartitioner.h
AMDiS/src/parallel/ZoltanPartitioner.h
+3
-4
AMDiS/src/reinit/BoundaryElementDist.cc
AMDiS/src/reinit/BoundaryElementDist.cc
+6
-0
AMDiS/src/reinit/BoundaryElementDist.h
AMDiS/src/reinit/BoundaryElementDist.h
+7
-1
AMDiS/src/reinit/BoundaryElementEdgeDist.cc
AMDiS/src/reinit/BoundaryElementEdgeDist.cc
+5
-0
AMDiS/src/reinit/BoundaryElementEdgeDist.h
AMDiS/src/reinit/BoundaryElementEdgeDist.h
+7
-1
AMDiS/src/reinit/BoundaryElementLevelSetDist.cc
AMDiS/src/reinit/BoundaryElementLevelSetDist.cc
+5
-0
AMDiS/src/reinit/BoundaryElementLevelSetDist.h
AMDiS/src/reinit/BoundaryElementLevelSetDist.h
+6
-0
AMDiS/src/reinit/BoundaryElementNormalDist.cc
AMDiS/src/reinit/BoundaryElementNormalDist.cc
+5
-0
AMDiS/src/reinit/BoundaryElementNormalDist.h
AMDiS/src/reinit/BoundaryElementNormalDist.h
+7
-1
AMDiS/src/reinit/BoundaryElementTopDist.cc
AMDiS/src/reinit/BoundaryElementTopDist.cc
+4
-0
AMDiS/src/reinit/BoundaryElementTopDist.h
AMDiS/src/reinit/BoundaryElementTopDist.h
+6
-0
AMDiS/src/reinit/ElementLevelSet.cc
AMDiS/src/reinit/ElementLevelSet.cc
+4
-0
AMDiS/src/reinit/ElementLevelSet.h
AMDiS/src/reinit/ElementLevelSet.h
+7
-1
AMDiS/src/reinit/ElementUpdate.h
AMDiS/src/reinit/ElementUpdate.h
+6
-0
AMDiS/src/reinit/ElementUpdate_2d.cc
AMDiS/src/reinit/ElementUpdate_2d.cc
+6
-0
AMDiS/src/reinit/ElementUpdate_2d.h
AMDiS/src/reinit/ElementUpdate_2d.h
+6
-0
AMDiS/src/reinit/ElementUpdate_3d.cc
AMDiS/src/reinit/ElementUpdate_3d.cc
+6
-0
AMDiS/src/reinit/ElementUpdate_3d.h
AMDiS/src/reinit/ElementUpdate_3d.h
+6
-0
AMDiS/src/reinit/HL_SignedDist.cc
AMDiS/src/reinit/HL_SignedDist.cc
+6
-0
AMDiS/src/reinit/HL_SignedDist.h
AMDiS/src/reinit/HL_SignedDist.h
+56
-52
AMDiS/src/reinit/HL_SignedDistBornemann.h
AMDiS/src/reinit/HL_SignedDistBornemann.h
+6
-0
AMDiS/src/reinit/HL_SignedDistTraverse.cc
AMDiS/src/reinit/HL_SignedDistTraverse.cc
+4
-0
AMDiS/src/reinit/HL_SignedDistTraverse.h
AMDiS/src/reinit/HL_SignedDistTraverse.h
+6
-0
AMDiS/src/reinit/NormEps.cc
AMDiS/src/reinit/NormEps.cc
+4
-0
AMDiS/src/reinit/NormEps.h
AMDiS/src/reinit/NormEps.h
+6
-0
AMDiS/src/reinit/VelocityExt.cc
AMDiS/src/reinit/VelocityExt.cc
+4
-0
AMDiS/src/reinit/VelocityExt.h
AMDiS/src/reinit/VelocityExt.h
+6
-0
AMDiS/src/reinit/VelocityExtFromVelocityField.cc
AMDiS/src/reinit/VelocityExtFromVelocityField.cc
+4
-0
AMDiS/src/reinit/VelocityExtFromVelocityField.h
AMDiS/src/reinit/VelocityExtFromVelocityField.h
+6
-0
AMDiS/src/solver/ITL_Runner.h
AMDiS/src/solver/ITL_Runner.h
+39
-26
AMDiS/src/solver/ITL_Solver.h
AMDiS/src/solver/ITL_Solver.h
+4
-0
AMDiS/src/solver/KrylovPreconditioner.h
AMDiS/src/solver/KrylovPreconditioner.h
+6
-7
AMDiS/src/solver/LinearSolver.h
AMDiS/src/solver/LinearSolver.h
+17
-17
AMDiS/src/solver/MTL4Solver.h
AMDiS/src/solver/MTL4Solver.h
+127
-24
AMDiS/src/solver/MTL4SolverBase.h
AMDiS/src/solver/MTL4SolverBase.h
+26
-91
AMDiS/src/solver/Mapper.h
AMDiS/src/solver/Mapper.h
+27
-20
AMDiS/src/solver/MatrixStreams.h
AMDiS/src/solver/MatrixStreams.h
+86
-77
AMDiS/src/solver/PetscSolver.cc
AMDiS/src/solver/PetscSolver.cc
+16
-2
AMDiS/src/solver/PetscSolver.h
AMDiS/src/solver/PetscSolver.h
+3
-1
AMDiS/src/solver/PetscTypes.cc
AMDiS/src/solver/PetscTypes.cc
+17
-11
AMDiS/src/solver/PetscTypes.h
AMDiS/src/solver/PetscTypes.h
+10
-5
AMDiS/src/solver/SolverMatrix.cc
AMDiS/src/solver/SolverMatrix.cc
+2
-2
AMDiS/src/solver/UmfPackSolver.h
AMDiS/src/solver/UmfPackSolver.h
+12
-2
AMDiS/src/time/RosenbrockAdaptInstationary.cc
AMDiS/src/time/RosenbrockAdaptInstationary.cc
+54
-11
AMDiS/src/time/RosenbrockAdaptInstationary.h
AMDiS/src/time/RosenbrockAdaptInstationary.h
+5
-0
AMDiS/src/time/RosenbrockStationary.cc
AMDiS/src/time/RosenbrockStationary.cc
+81
-22
AMDiS/src/time/RosenbrockStationary.h
AMDiS/src/time/RosenbrockStationary.h
+113
-79
AMDiS/src/traits/at.hpp
AMDiS/src/traits/at.hpp
+172
-0
AMDiS/src/traits/category.hpp
AMDiS/src/traits/category.hpp
+239
-0
AMDiS/src/traits/inserter.h
AMDiS/src/traits/inserter.h
+50
-0
AMDiS/src/traits/num_cols.hpp
AMDiS/src/traits/num_cols.hpp
+174
-0
AMDiS/src/traits/num_rows.hpp
AMDiS/src/traits/num_rows.hpp
+173
-0
AMDiS/src/traits/resize.hpp
AMDiS/src/traits/resize.hpp
+123
-0
AMDiS/src/traits/size.hpp
AMDiS/src/traits/size.hpp
+176
-0
AMDiS/src/traits/tag.hpp
AMDiS/src/traits/tag.hpp
+42
-0
AMDiS/src/traits/types.hpp
AMDiS/src/traits/types.hpp
+141
-0
extensions/BackgroundMesh.cc
extensions/BackgroundMesh.cc
+2
-2
extensions/BackgroundMesh.h
extensions/BackgroundMesh.h
+3
-5
extensions/BackgroundMesh.hh
extensions/BackgroundMesh.hh
+2
-2
extensions/BackgroundMesh2.h
extensions/BackgroundMesh2.h
+2
-2
extensions/BackgroundMesh2.hh
extensions/BackgroundMesh2.hh
+3
-3
extensions/BoundaryFunctions.h
extensions/BoundaryFunctions.h
+5
-1
extensions/ExtendedProblemStat.h
extensions/ExtendedProblemStat.h
+18
-13
extensions/GenericLoops.h
extensions/GenericLoops.h
+3
-0
extensions/GenericLoops_cxx11.h
extensions/GenericLoops_cxx11.h
+4
-0
extensions/GeometryTools.cc
extensions/GeometryTools.cc
+4
-0
extensions/GeometryTools.h
extensions/GeometryTools.h
+4
-1
extensions/GeometryTools.hh
extensions/GeometryTools.hh
+9
-6
extensions/GradientCalculations.h
extensions/GradientCalculations.h
+2
-4
extensions/Helpers.cc
extensions/Helpers.cc
+3
-1
extensions/Helpers.h
extensions/Helpers.h
+16
-6
extensions/MeshFunction_Level.h
extensions/MeshFunction_Level.h
+11
-9
extensions/MeshIndicator.h
extensions/MeshIndicator.h
+10
-9
extensions/MetaTools.h
extensions/MetaTools.h
+6
-2
extensions/NewtonCotesQuad.h
extensions/NewtonCotesQuad.h
+24
-20
extensions/POperators.cc
extensions/POperators.cc
+4
-1
extensions/POperators_FOT.h
extensions/POperators_FOT.h
+3
-1
extensions/POperators_SOT.h
extensions/POperators_SOT.h
+3
-1
extensions/POperators_ZOT.h
extensions/POperators_ZOT.h
+4
-1
extensions/PhaseFieldConvert.h
extensions/PhaseFieldConvert.h
+19
-15
extensions/ProblemStatMassConserve.h
extensions/ProblemStatMassConserve.h
+9
-2
extensions/ProblemStatMassConserve2.h
extensions/ProblemStatMassConserve2.h
+4
-0
extensions/Refinement.h
extensions/Refinement.h
+12
-8
extensions/Refinement_DOFView.h
extensions/Refinement_DOFView.h
+3
-1
extensions/Refinement_Level.h
extensions/Refinement_Level.h
+4
-1
extensions/Refinement_MeshSize.h
extensions/Refinement_MeshSize.h
+3
-1
extensions/SignedDistFunctors.h
extensions/SignedDistFunctors.h
+32
-26
extensions/SingularDirichletBC.h
extensions/SingularDirichletBC.h
+0
-556
extensions/SingularDirichletBC2.cc
extensions/SingularDirichletBC2.cc
+5
-1
extensions/SingularDirichletBC2.h
extensions/SingularDirichletBC2.h
+4
-5
extensions/Tools.h
extensions/Tools.h
+4
-20
extensions/ValueTypes.h
extensions/ValueTypes.h
+2
-2
extensions/VectorOperations.h
extensions/VectorOperations.h
+20
-263
extensions/Views.h
extensions/Views.h
+9
-10
extensions/VtuReader.h
extensions/VtuReader.h
+0
-244
extensions/VtuReader.hh
extensions/VtuReader.hh
+0
-129
extensions/base_problems/BaseProblem.h
extensions/base_problems/BaseProblem.h
+11
-10
extensions/base_problems/BaseProblem.hh
extensions/base_problems/BaseProblem.hh
+26
-26
extensions/base_problems/BaseProblem_RB.h
extensions/base_problems/BaseProblem_RB.h
+6
-6
extensions/base_problems/BaseProblem_RB0.h
extensions/base_problems/BaseProblem_RB0.h
+4
-4
extensions/base_problems/CahnHilliard.cc
extensions/base_problems/CahnHilliard.cc
+7
-244
extensions/base_problems/CahnHilliard.h
extensions/base_problems/CahnHilliard.h
+10
-5
extensions/base_problems/CahnHilliard.hh
extensions/base_problems/CahnHilliard.hh
+41
-40
extensions/base_problems/CahnHilliardNavierStokes.cc
extensions/base_problems/CahnHilliardNavierStokes.cc
+7
-1
extensions/base_problems/CahnHilliardNavierStokes.h
extensions/base_problems/CahnHilliardNavierStokes.h
+5
-3
extensions/base_problems/CahnHilliardNavierStokes_RB.cc
extensions/base_problems/CahnHilliardNavierStokes_RB.cc
+3
-1
extensions/base_problems/CahnHilliardNavierStokes_RB.h
extensions/base_problems/CahnHilliardNavierStokes_RB.h
+3
-1
extensions/base_problems/CahnHilliardNavierStokes_TwoPhase.cc
...nsions/base_problems/CahnHilliardNavierStokes_TwoPhase.cc
+3
-1
extensions/base_problems/CahnHilliardNavierStokes_TwoPhase.h
extensions/base_problems/CahnHilliardNavierStokes_TwoPhase.h
+5
-3
extensions/base_problems/CahnHilliardNavierStokes_TwoPhase_RB.cc
...ons/base_problems/CahnHilliardNavierStokes_TwoPhase_RB.cc
+3
-1
extensions/base_problems/CahnHilliardNavierStokes_TwoPhase_RB.h
...ions/base_problems/CahnHilliardNavierStokes_TwoPhase_RB.h
+2
-1
extensions/base_problems/CahnHilliard_RB.cc
extensions/base_problems/CahnHilliard_RB.cc
+6
-2
extensions/base_problems/CahnHilliard_RB.h
extensions/base_problems/CahnHilliard_RB.h
+3
-1
extensions/base_problems/CouplingBaseProblem.h
extensions/base_problems/CouplingBaseProblem.h
+4
-4
extensions/base_problems/CouplingBaseProblem2.h
extensions/base_problems/CouplingBaseProblem2.h
+9
-4
extensions/base_problems/CouplingBaseProblem_RB.h
extensions/base_problems/CouplingBaseProblem_RB.h
+2
-2
extensions/base_problems/DiffuseDomainFsi.cc
extensions/base_problems/DiffuseDomainFsi.cc
+5
-1
extensions/base_problems/DiffuseDomainFsi.h
extensions/base_problems/DiffuseDomainFsi.h
+5
-3
extensions/base_problems/LinearElasticity.cc
extensions/base_problems/LinearElasticity.cc
+6
-1
extensions/base_problems/LinearElasticity.h
extensions/base_problems/LinearElasticity.h
+6
-3
extensions/base_problems/LinearElasticityPhase.cc
extensions/base_problems/LinearElasticityPhase.cc
+6
-1
extensions/base_problems/LinearElasticityPhase.h
extensions/base_problems/LinearElasticityPhase.h
+5
-3
extensions/base_problems/NavierStokesCahnHilliard.cc
extensions/base_problems/NavierStokesCahnHilliard.cc
+7
-3
extensions/base_problems/NavierStokesCahnHilliard.h
extensions/base_problems/NavierStokesCahnHilliard.h
+4
-5
extensions/base_problems/NavierStokesPhase_Chorin.cc
extensions/base_problems/NavierStokesPhase_Chorin.cc
+3
-1
extensions/base_problems/NavierStokesPhase_Chorin.h
extensions/base_problems/NavierStokesPhase_Chorin.h
+4
-1
extensions/base_problems/NavierStokesPhase_TaylorHood.cc
extensions/base_problems/NavierStokesPhase_TaylorHood.cc
+11
-3
extensions/base_problems/NavierStokesPhase_TaylorHood.h
extensions/base_problems/NavierStokesPhase_TaylorHood.h
+5
-3
extensions/base_problems/NavierStokes_Chorin.cc
extensions/base_problems/NavierStokes_Chorin.cc
+4
-1
extensions/base_problems/NavierStokes_Chorin.h
extensions/base_problems/NavierStokes_Chorin.h
+4
-1
extensions/base_problems/NavierStokes_TH_MultiPhase.cc
extensions/base_problems/NavierStokes_TH_MultiPhase.cc
+11
-0
extensions/base_problems/NavierStokes_TH_MultiPhase.h
extensions/base_problems/NavierStokes_TH_MultiPhase.h
+5
-4
extensions/base_problems/NavierStokes_TH_MultiPhase.hh
extensions/base_problems/NavierStokes_TH_MultiPhase.hh
+5
-2
extensions/base_problems/NavierStokes_TH_MultiPhase_RB.cc
extensions/base_problems/NavierStokes_TH_MultiPhase_RB.cc
+5
-1
extensions/base_problems/NavierStokes_TH_MultiPhase_RB.h
extensions/base_problems/NavierStokes_TH_MultiPhase_RB.h
+3
-1
extensions/base_problems/NavierStokes_TaylorHood.cc
extensions/base_problems/NavierStokes_TaylorHood.cc
+7
-234
extensions/base_problems/NavierStokes_TaylorHood.h
extensions/base_problems/NavierStokes_TaylorHood.h
+10
-17
extensions/base_problems/NavierStokes_TaylorHood.hh
extensions/base_problems/NavierStokes_TaylorHood.hh
+26
-31
extensions/base_problems/NavierStokes_TaylorHood_RB.cc
extensions/base_problems/NavierStokes_TaylorHood_RB.cc
+6
-1
extensions/base_problems/NavierStokes_TaylorHood_RB.h
extensions/base_problems/NavierStokes_TaylorHood_RB.h
+4
-1
extensions/base_problems/PhaseFieldCrystal.cc
extensions/base_problems/PhaseFieldCrystal.cc
+7
-138
extensions/base_problems/PhaseFieldCrystal.h
extensions/base_problems/PhaseFieldCrystal.h
+38
-83
extensions/base_problems/PhaseFieldCrystal.hh
extensions/base_problems/PhaseFieldCrystal.hh
+95
-0
extensions/base_problems/PhaseFieldCrystal_Phase.cc
extensions/base_problems/PhaseFieldCrystal_Phase.cc
+7
-94
extensions/base_problems/PhaseFieldCrystal_Phase.h
extensions/base_problems/PhaseFieldCrystal_Phase.h
+41
-61
extensions/base_problems/PhaseFieldCrystal_Phase.hh
extensions/base_problems/PhaseFieldCrystal_Phase.hh
+92
-0
extensions/base_problems/PhaseFieldCrystal_RB.cc
extensions/base_problems/PhaseFieldCrystal_RB.cc
+4
-1
extensions/base_problems/PhaseFieldCrystal_RB.h
extensions/base_problems/PhaseFieldCrystal_RB.h
+4
-1
extensions/base_problems/PolarizationField.cc
extensions/base_problems/PolarizationField.cc
+11
-0
extensions/base_problems/PolarizationField.h
extensions/base_problems/PolarizationField.h
+10
-18
extensions/base_problems/PolarizationField.hh
extensions/base_problems/PolarizationField.hh
+18
-11
extensions/base_problems/PolarizationField_RB.h
extensions/base_problems/PolarizationField_RB.h
+5
-3
extensions/base_problems/PolarizationField_RB.hh
extensions/base_problems/PolarizationField_RB.hh
+5
-3
extensions/base_problems/QuasiCrystal.cc
extensions/base_problems/QuasiCrystal.cc
+7
-112
extensions/base_problems/QuasiCrystal.h
extensions/base_problems/QuasiCrystal.h
+34
-65
extensions/base_problems/QuasiCrystal.hh
extensions/base_problems/QuasiCrystal.hh
+120
-0
extensions/base_problems/QuasiCrystal_RB.cc
extensions/base_problems/QuasiCrystal_RB.cc
+4
-1
extensions/base_problems/QuasiCrystal_RB.h
extensions/base_problems/QuasiCrystal_RB.h
+3
-1
extensions/base_problems/VacancyPhaseFieldCrystal.cc
extensions/base_problems/VacancyPhaseFieldCrystal.cc
+4
-1
extensions/base_problems/VacancyPhaseFieldCrystal.h
extensions/base_problems/VacancyPhaseFieldCrystal.h
+3
-1
extensions/base_problems/chns.h
extensions/base_problems/chns.h
+3
-1
extensions/demo/other/CMakeLists.txt
extensions/demo/other/CMakeLists.txt
+4
-3
extensions/demo/other/init/cahnHilliard.dat.2d
extensions/demo/other/init/cahnHilliard.dat.2d
+5
-5
extensions/demo/other/src/cahnHilliard_navierStokes.cc
extensions/demo/other/src/cahnHilliard_navierStokes.cc
+10
-11
extensions/demo/other/src/fsi_explicit/navierStokes.h
extensions/demo/other/src/fsi_explicit/navierStokes.h
+2
-0
extensions/demo/other/src/movingMesh.cc
extensions/demo/other/src/movingMesh.cc
+2
-2
extensions/demo/other/src/movingMesh.h
extensions/demo/other/src/movingMesh.h
+1
-1
extensions/demo/other/src/navierStokes.h
extensions/demo/other/src/navierStokes.h
+2
-0
extensions/demo/other/src/polarizationField_navierStokes.cc
extensions/demo/other/src/polarizationField_navierStokes.cc
+2
-2
extensions/demo/pfc/CMakeLists.txt
extensions/demo/pfc/CMakeLists.txt
+18
-0
extensions/demo/pfc/init/pfc.dat.2d
extensions/demo/pfc/init/pfc.dat.2d
+52
-0
extensions/demo/pfc/init/pfc_rb.dat.2d
extensions/demo/pfc/init/pfc_rb.dat.2d
+62
-0
extensions/demo/pfc/init/pfc_rb.mtl.dat.2d
extensions/demo/pfc/init/pfc_rb.mtl.dat.2d
+62
-0
extensions/demo/pfc/init/pfc_solver.inc
extensions/demo/pfc/init/pfc_solver.inc
+29
-0
extensions/demo/pfc/init/pfc_solver.mtl.inc
extensions/demo/pfc/init/pfc_solver.mtl.inc
+25
-0
extensions/demo/pfc/macro/macro.square.2d
extensions/demo/pfc/macro/macro.square.2d
+47
-0
extensions/demo/pfc/macro/pfc_mesh.111.2d
extensions/demo/pfc/macro/pfc_mesh.111.2d
+47
-0
extensions/demo/pfc/macro/pfc_mesh.111.3d
extensions/demo/pfc/macro/pfc_mesh.111.3d
+185
-0
extensions/demo/pfc/src/pfc.cc
extensions/demo/pfc/src/pfc.cc
+117
-0
extensions/demo/pfc/src/pfc_rb.cc
extensions/demo/pfc/src/pfc_rb.cc
+236
-0
extensions/kdtree_nanoflann.h
extensions/kdtree_nanoflann.h
+2
-3
extensions/kdtree_nanoflann_dof.h
extensions/kdtree_nanoflann_dof.h
+3
-4
extensions/kdtree_nanoflann_double.h
extensions/kdtree_nanoflann_double.h
+3
-4
extensions/kdtree_nanoflann_mesh.h
extensions/kdtree_nanoflann_mesh.h
+5
-4
extensions/preconditioner/BlockPreconditioner.h
extensions/preconditioner/BlockPreconditioner.h
+1
-1
extensions/preconditioner/CahnHilliard_.cc
extensions/preconditioner/CahnHilliard_.cc
+4
-2
extensions/preconditioner/CahnHilliard_.h
extensions/preconditioner/CahnHilliard_.h
+2
-2
extensions/preconditioner/MTLPreconCahnHilliard.h
extensions/preconditioner/MTLPreconCahnHilliard.h
+4
-1
extensions/preconditioner/MTLPreconCahnHilliard.hh
extensions/preconditioner/MTLPreconCahnHilliard.hh
+4
-0
extensions/preconditioner/MTLPreconPfc.h
extensions/preconditioner/MTLPreconPfc.h
+60
-22
extensions/preconditioner/MTLPreconPfc.hh
extensions/preconditioner/MTLPreconPfc.hh
+28
-22
extensions/preconditioner/MTLPreconPfc_diag.h
extensions/preconditioner/MTLPreconPfc_diag.h
+177
-0
extensions/preconditioner/MTLPreconPfc_diag.hh
extensions/preconditioner/MTLPreconPfc_diag.hh
+117
-0
extensions/preconditioner/PetscPreconPfc.cc
extensions/preconditioner/PetscPreconPfc.cc
+25
-5
extensions/preconditioner/PetscPreconPfcDiag.cc
extensions/preconditioner/PetscPreconPfcDiag.cc
+158
-0
extensions/preconditioner/PetscPreconPfcDiag.h
extensions/preconditioner/PetscPreconPfcDiag.h
+59
-0
extensions/preconditioner/PetscSolverPfc.cc
extensions/preconditioner/PetscSolverPfc.cc
+24
-5
extensions/preconditioner/PetscSolverPfc_diag.cc
extensions/preconditioner/PetscSolverPfc_diag.cc
+233
-0
extensions/preconditioner/PetscSolverPfc_diag.h
extensions/preconditioner/PetscSolverPfc_diag.h
+87
-0
extensions/preconditioner/PhaseFieldCrystal_.cc
extensions/preconditioner/PhaseFieldCrystal_.cc
+4
-1
extensions/preconditioner/PhaseFieldCrystal_.h
extensions/preconditioner/PhaseFieldCrystal_.h
+5
-3
extensions/time/ExtendedRosenbrockAdaptInstationary.h
extensions/time/ExtendedRosenbrockAdaptInstationary.h
+11
-3
extensions/time/ExtendedRosenbrockAdaptInstationary.hh
extensions/time/ExtendedRosenbrockAdaptInstationary.hh
+28
-4
extensions/time/ExtendedRosenbrockStationary.cc
extensions/time/ExtendedRosenbrockStationary.cc
+29
-21
extensions/time/ExtendedRosenbrockStationary.h
extensions/time/ExtendedRosenbrockStationary.h
+30
-22
No files found.
AMDiS/AMDISConfig.cmake.in
View file @
9c44b131
...
...
@@ -59,12 +59,12 @@ unset(_AMDIS_LIB CACHE)
# Boost libraries
# ---------------
set(AMDIS_HAS_PARALLEL_DOMAIN @ENABLE_PARALLEL_DOMAIN@)
set(AMDIS_NEED_COMPRESSION @ENABLE_COMPRESSIN@)
set(AMDIS_NEED_COMPRESSION @ENABLE_COMPRESSI
O
N@)
set(BOOST_LIBS_REQUIRED system iostreams filesystem program_options date_time)
if(AMDIS_NEED_COMPRESSION)
if(
WIN32 AND
AMDIS_NEED_COMPRESSION)
list(APPEND BOOST_LIBS_REQUIRED zlib bzip2)
endif(AMDIS_NEED_COMPRESSION)
endif(
WIN32 AND
AMDIS_NEED_COMPRESSION)
set(BOOST_VERSION "1.42")
if(AMDIS_HAS_PARALLEL_DOMAIN)
...
...
AMDiS/CMakeLists.txt
View file @
9c44b131
...
...
@@ -56,6 +56,8 @@ option(ENABLE_OUTPUT "AMDiS output printing, disable only for debugging!" true)
mark_as_advanced
(
ENABLE_OUTPUT
)
mark_as_advanced
(
ENABLE_BDDCML
)
mark_as_advanced
(
USE_PETSC_DEV
)
find_package
(
Boost 1.44 REQUIRED
)
...
...
@@ -81,6 +83,7 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc
${
SOURCE_DIR
}
/Boundary.cc
${
SOURCE_DIR
}
/BoundaryManager.cc
${
SOURCE_DIR
}
/BoundaryObject.cc
${
SOURCE_DIR
}
/Bubble.cc
${
SOURCE_DIR
}
/Cholesky.cc
${
SOURCE_DIR
}
/CoarseningManager.cc
${
SOURCE_DIR
}
/CoarseningManager1d.cc
...
...
@@ -125,7 +128,7 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc
${
SOURCE_DIR
}
/OperatorTerm.cc
${
SOURCE_DIR
}
/Parametric.cc
${
SOURCE_DIR
}
/PeriodicBC.cc
${
SOURCE_DIR
}
/ProblemImplicit.cc
#
${SOURCE_DIR}/ProblemImplicit.cc
${
SOURCE_DIR
}
/ProblemInstat.cc
${
SOURCE_DIR
}
/ProblemInterpol.cc
${
SOURCE_DIR
}
/ProblemStat.cc
...
...
@@ -342,7 +345,7 @@ endif(ENABLE_UMFPACK)
if
(
ENABLE_HYPRE
)
include
(
FindHYPRE
.cmake
)
include
(
HYPREConfig
.cmake
)
message
(
"have hypre:
${
HAVE_HYPRE
}
"
)
if
(
HAVE_HYPRE
)
if
(
NOT MPI_FOUND
)
...
...
@@ -437,13 +440,15 @@ if(ENABLE_EXTENSIONS)
if
(
ENABLE_SEQ_PETSC
)
list
(
APPEND EXTENSIONS_SRC
${
EXTENSIONS_DIR
}
/preconditioner/PetscPreconPfc.cc
${
EXTENSIONS_DIR
}
/preconditioner/PetscPreconPfcDiag.cc
${
EXTENSIONS_DIR
}
/preconditioner/PetscPreconCahnHilliard.cc
)
endif
(
ENABLE_SEQ_PETSC
)
if
(
ENABLE_PARALLEL_DOMAIN
)
list
(
APPEND EXTENSIONS_SRC
# ${EXTENSIONS_DIR}/preconditioner/PetscSolverNavierStokes2.cc
${
EXTENSIONS_DIR
}
/preconditioner/PetscSolverPfc.cc
)
${
EXTENSIONS_DIR
}
/preconditioner/PetscSolverPfc.cc
${
EXTENSIONS_DIR
}
/preconditioner/PetscSolverPfc_diag.cc
)
endif
(
ENABLE_PARALLEL_DOMAIN
)
list
(
APPEND COMPILEFLAGS
"-DHAVE_EXTENSIONS=1"
)
...
...
@@ -502,7 +507,7 @@ if(ENABLE_EXTENSIONS)
if
(
ENABLE_BASE_PROBLEMS
)
SET
(
BASE_PROBLEMS_SRC
#
${EXTENSIONS_DIR}/base_problems/CahnHilliard.cc
${
EXTENSIONS_DIR
}
/base_problems/CahnHilliard.cc
${
EXTENSIONS_DIR
}
/base_problems/CahnHilliard_RB.cc
${
EXTENSIONS_DIR
}
/base_problems/CahnHilliardNavierStokes.cc
# ${EXTENSIONS_DIR}/base_problems/DiffuseDomainFsi.cc
...
...
@@ -511,13 +516,15 @@ if(ENABLE_EXTENSIONS)
# ${EXTENSIONS_DIR}/base_problems/NavierStokes_Chorin.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokesCahnHilliard.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokesPhase_TaylorHood.cc
#
${EXTENSIONS_DIR}/base_problems/NavierStokes_TaylorHood.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes_TaylorHood.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes_TaylorHood_RB.cc
#
${EXTENSIONS_DIR}/base_problems/NavierStokes_TH_MultiPhase.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes_TH_MultiPhase.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes_TH_MultiPhase_RB.cc
${
EXTENSIONS_DIR
}
/base_problems/PhaseFieldCrystal.cc
${
EXTENSIONS_DIR
}
/base_problems/PhaseFieldCrystal_Phase.cc
${
EXTENSIONS_DIR
}
/base_problems/PhaseFieldCrystal_RB.cc
)
${
EXTENSIONS_DIR
}
/base_problems/PhaseFieldCrystal_RB.cc
${
EXTENSIONS_DIR
}
/base_problems/PolarizationField.cc
${
EXTENSIONS_DIR
}
/base_problems/QuasiCrystal.cc
)
list
(
APPEND COMPILEFLAGS
"-DHAVE_BASE_PROBLEMS=1"
)
list
(
APPEND AMDIS_INCLUDE_DIRS
${
EXTENSIONS_DIR
}
/base_problems
)
if
(
WIN32
)
...
...
@@ -647,11 +654,21 @@ INSTALL(FILES ${HEADERS}
DESTINATION include/amdis/est/
)
list
(
APPEND deb_add_dirs
"include/amdis/est"
)
FILE
(
GLOB HEADERS
"
${
SOURCE_DIR
}
/expressions/*.h"
)
FILE
(
GLOB HEADERS
"
${
SOURCE_DIR
}
/expressions/*.h
*
"
)
INSTALL
(
FILES
${
HEADERS
}
DESTINATION include/amdis/expressions/
)
list
(
APPEND deb_add_dirs
"include/amdis/expressions"
)
FILE
(
GLOB HEADERS
"
${
SOURCE_DIR
}
/operations/*.h*"
)
INSTALL
(
FILES
${
HEADERS
}
DESTINATION include/amdis/operations/
)
list
(
APPEND deb_add_dirs
"include/amdis/operations"
)
FILE
(
GLOB HEADERS
"
${
SOURCE_DIR
}
/traits/*.h*"
)
INSTALL
(
FILES
${
HEADERS
}
DESTINATION include/amdis/traits/
)
list
(
APPEND deb_add_dirs
"include/amdis/traits"
)
FILE
(
GLOB HEADERS
"
${
SOURCE_DIR
}
/time/*.h"
)
INSTALL
(
FILES
${
HEADERS
}
DESTINATION include/amdis/time/
)
...
...
AMDiS/
FindHYPRE
.cmake
→
AMDiS/
HYPREConfig
.cmake
View file @
9c44b131
File moved
AMDiS/src/AMDiS.h
View file @
9c44b131
...
...
@@ -37,6 +37,7 @@
#include "Boundary.h"
#include "BoundaryCondition.h"
#include "BoundaryManager.h"
#include "Bubble.h"
#include "CoarseningManager.h"
#include "CoarseningManager1d.h"
#include "CoarseningManager2d.h"
...
...
@@ -73,7 +74,7 @@
#include "Line.h"
#include "MacroElement.h"
#include "Marker.h"
#include "MathFunctions.h"
//
#include "MathFunctions.h"
#include "MatrixVector.h"
#include "Mesh.h"
#include "MeshStructure.h"
...
...
@@ -85,7 +86,7 @@
#include "ProblemStat.h"
#include "ProblemInstat.h"
#include "ProblemTimeInterface.h"
#include "ProblemImplicit.h"
//
#include "ProblemImplicit.h"
#include "ProblemInterpol.h"
#include "ProblemStatBase.h"
#include "SecondOrderTerm.h"
...
...
@@ -106,6 +107,7 @@
#include "TimedObject.h"
#include "TransformDOF.h"
#include "Traverse.h"
#include "Traits.h"
#include "Triangle.h"
#include "VertexVector.h"
#include "ZeroOrderTerm.h"
...
...
@@ -153,7 +155,7 @@
#include "parallel/ParallelProblemStat.h"
#if HAVE_PARALLEL_MTL4
#include "parallel/PMTL4Solver.h"
//
#include "parallel/PMTL4Solver.h"
#else
#include "parallel/PetscSolver.h"
#include "parallel/PetscSolverNavierStokes.h"
...
...
AMDiS/src/AMDiS_fwd.h
View file @
9c44b131
...
...
@@ -104,7 +104,7 @@ namespace AMDiS {
class
ElementFileWriter
;
class
GNUPlotWriter
;
class
MacroReader
;
class
MacroWriter
;
struct
MacroWriter
;
class
PngWriter
;
class
PovrayWriter
;
class
Spreadsheet
;
...
...
AMDiS/src/AdaptInfo.h
View file @
9c44b131
...
...
@@ -57,6 +57,7 @@ namespace AMDiS {
fac_sum
(
1.0
),
spaceTolerance
(
0.0
),
timeTolerance
(
0.0
),
timeRelativeTolerance
(
0.0
),
timeErrLow
(
0.0
),
coarsenAllowed
(
0
),
refinementAllowed
(
1
),
...
...
@@ -65,6 +66,7 @@ namespace AMDiS {
{
Parameters
::
get
(
prefix
+
"->tolerance"
,
spaceTolerance
);
Parameters
::
get
(
prefix
+
"->time tolerance"
,
timeTolerance
);
Parameters
::
get
(
prefix
+
"->time relative tolerance"
,
timeRelativeTolerance
);
Parameters
::
get
(
prefix
+
"->coarsen allowed"
,
coarsenAllowed
);
Parameters
::
get
(
prefix
+
"->refinement allowed"
,
refinementAllowed
);
Parameters
::
get
(
prefix
+
"->refine bisections"
,
refineBisections
);
...
...
@@ -72,6 +74,8 @@ namespace AMDiS {
Parameters
::
get
(
prefix
+
"->sum factor"
,
fac_sum
);
Parameters
::
get
(
prefix
+
"->max factor"
,
fac_max
);
if
(
timeTolerance
==
0.0
&&
timeRelativeTolerance
==
0.0
)
timeTolerance
=
1.0
;
timeErrLow
=
timeTolerance
*
0.3
;
}
...
...
@@ -95,6 +99,9 @@ namespace AMDiS {
/// Time tolerance.
double
timeTolerance
;
/// Relative time tolerance
double
timeRelativeTolerance
;
/// Lower bound for the time error.
double
timeErrLow
;
...
...
@@ -143,6 +150,7 @@ namespace AMDiS {
maxSolverIterations
(
0
),
solverTolerance
(
1e-8
),
solverResidual
(
0.0
),
globalTimeTolerance
(
1.0
),
scalContents
(
size
),
deserialized
(
false
),
rosenbrockMode
(
false
)
...
...
@@ -175,6 +183,7 @@ namespace AMDiS {
Parameters
::
get
(
name
+
"->min timestep"
,
minTimestep
);
Parameters
::
get
(
name
+
"->max timestep"
,
maxTimestep
);
Parameters
::
get
(
name
+
"->number of timesteps"
,
nTimesteps
);
Parameters
::
get
(
name
+
"->time tolerance"
,
globalTimeTolerance
);
}
/// Resets all variables to zero (or something equivalent)
...
...
@@ -481,6 +490,12 @@ namespace AMDiS {
return
scalContents
[
index
]
->
timeTolerance
;
}
/// Returns \ref timeRelativeTolerance.
inline
double
getTimeRelativeTolerance
(
int
index
)
{
return
scalContents
[
index
]
->
timeRelativeTolerance
;
}
/// Sets \ref time
inline
double
setTime
(
double
t
)
{
...
...
@@ -690,6 +705,18 @@ namespace AMDiS {
{
return
solverResidual
;
}
inline
void
setGlobalTimeTolerance
(
double
tol
)
{
globalTimeTolerance
=
tol
;
}
inline
double
getGlobalTimeTolerance
()
{
return
globalTimeTolerance
;
}
/// Returns true, if the adaptive procedure was deserialized from a file.
bool
isDeserialized
()
const
...
...
@@ -796,6 +823,9 @@ namespace AMDiS {
///
double
solverResidual
;
/// tolerance for the overall time error
double
globalTimeTolerance
;
/// Scalar adapt infos.
std
::
vector
<
ScalContent
*>
scalContents
;
...
...
AMDiS/src/AdaptInstationary.cc
View file @
9c44b131
...
...
@@ -162,12 +162,6 @@ namespace AMDiS {
problemIteration
->
oneIteration
(
adaptInfo
,
FULL_ITERATION
);
problemIteration
->
endIteration
(
adaptInfo
);
adaptInfo
->
setLastProcessedTimestep
(
adaptInfo
->
getTimestep
());
if
(
dbgMode
)
{
std
::
cout
<<
"=== ADAPT INFO DEBUG MODE ===
\n
"
;
std
::
cout
<<
"=== explicitTimeStrategy() ===
\n
"
;
adaptInfo
->
printTimeErrorLowInfo
();
}
}
...
...
@@ -207,15 +201,24 @@ namespace AMDiS {
// === Space iterations. ===
do
{
problemIteration
->
beginIteration
(
adaptInfo
);
if
(
dbgMode
)
{
std
::
cout
<<
"=== ADAPT INFO DEBUG MODE ===
\n
"
;
std
::
cout
<<
"=== in implicitTimeStrategy() ===
\n
"
;
std
::
cout
<<
"=== space/time iteration "
<<
adaptInfo
->
getSpaceIteration
()
<<
" : "
<<
adaptInfo
->
getTimestepIteration
()
<<
" ===
\n
"
;
adaptInfo
->
printTimeErrorLowInfo
();
}
if
(
problemIteration
->
oneIteration
(
adaptInfo
,
FULL_ITERATION
))
{
if
(
dbgMode
)
{
std
::
cout
<<
"=== ADAPT INFO DEBUG MODE ===
\n
"
;
std
::
cout
<<
"=== in implicitTimeStrategy() ===
\n
"
;
std
::
cout
<<
"=== space/time iteration "
<<
adaptInfo
->
getSpaceIteration
()
<<
" : "
<<
adaptInfo
->
getTimestepIteration
()
<<
" ===
\n
"
;
adaptInfo
->
printTimeErrorLowInfo
();
}
Flag
adapted
=
problemIteration
->
oneIteration
(
adaptInfo
,
FULL_ITERATION
);
#if HAVE_PARALLEL_DOMAIN_AMDIS
int
recvAllValues
=
0
;
int
isAdapted
=
static_cast
<
bool
>
(
adapted
);
MPI
::
COMM_WORLD
.
Allreduce
(
&
isAdapted
,
&
recvAllValues
,
1
,
MPI_INT
,
MPI_SUM
);
if
(
recvAllValues
)
{
#else
if
(
adapted
)
{
#endif
if
(
!
fixedTimestep
&&
!
adaptInfo
->
timeToleranceReached
()
&&
!
(
adaptInfo
->
getTimestep
()
<=
adaptInfo
->
getMinTimestep
()))
{
...
...
@@ -244,7 +247,6 @@ namespace AMDiS {
adaptInfo
->
setLastProcessedTimestep
(
adaptInfo
->
getTimestep
());
// After successful iteration/timestep the timestep will be changed according
// adaption rules for next timestep.
// First, check for increase of timestep
...
...
AMDiS/src/AdaptStationary.cc
View file @
9c44b131
...
...
@@ -99,7 +99,7 @@ namespace AMDiS {
void
AdaptStationary
::
initialize
()
{
{
Parameters
::
get
(
name
+
"->info"
,
info
);
}
...
...
AMDiS/src/BasisFunction.cc
View file @
9c44b131
...
...
@@ -25,6 +25,7 @@
#include "DOFVector.h"
#include "BasisFunction.h"
#include "Lagrange.h"
#include "Bubble.h"
namespace
AMDiS
{
...
...
AMDiS/src/BasisFunction.h
View file @
9c44b131
...
...
@@ -27,6 +27,7 @@
#include <string>
#include "AMDiS_fwd.h"
#include "CreatorInterface.h"
#include "Global.h"
#include "Boundary.h"
#include "MatrixVector.h"
...
...
@@ -311,6 +312,12 @@ namespace AMDiS {
const
ElementVector
&
uh
,
WorldMatrix
<
double
>*
val
)
const
;
/**
* override this method, if the base of your finite element space is not
* nodal
*/
virtual
bool
isNodal
()
const
=
0
;
protected:
/// Textual description
std
::
string
name
;
...
...
@@ -339,6 +346,26 @@ namespace AMDiS {
/// Vector of second derivatives
std
::
vector
<
D2BasFctType
*>
*
d2Phi
;
};
/**
* \brief
* Interface for creators of concrete BasisFunctions.
*/
class
BasisFunctionCreator
:
public
CreatorInterface
<
BasisFunction
>
{
public:
virtual
~
BasisFunctionCreator
()
{}
/// Sets \ref problem
void
setDim
(
int
dim_
)
{
dim
=
dim_
;
}
protected:
/// dimension of the mesh
int
dim
;
};
}
#include "BasisFunction.hh"
...
...
AMDiS/src/Bubble.cc
0 → 100644
View file @
9c44b131
This diff is collapsed.
Click to expand it.
AMDiS/src/Bubble.h
0 → 100644
View file @
9c44b131
/******************************************************************************
*
* AMDiS - Adaptive multidimensional simulations
*
* Copyright (C) 2013 Dresden University of Technology. All Rights Reserved.
* Web: https://fusionforge.zih.tu-dresden.de/projects/amdis
*
* Authors:
* Simon Vey, Thomas Witkowski, Andreas Naumann, Simon Praetorius, et al.
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*
* This file is part of AMDiS
*
* See also license.opensource.txt in the distribution.
*
******************************************************************************/
// Created by Roman Weissflog & Philipp Schulz
/** \file Bubble.h */
#ifndef AMDIS_BUBBLE_H
#define AMDIS_BUBBLE_H
#include <list>
#include <boost/numeric/mtl/mtl.hpp>
#include "AbstractFunction.h"
#include "BasisFunction.h"
#include "FixVec.h"
namespace
AMDiS
{
/** \ingroup FEMSpace
* \brief
* Lagrange basis functions plus Bubble function. Sub class of BasisFunction
*/
class
Bubble
:
public
BasisFunction
{
public:
/// Creator class used in the BasisFunctionCreatorMap.
class
Creator
:
public
BasisFunctionCreator
{
public:
virtual
~
Creator
()
{}
/// Returns a new Lagrange object.
BasisFunction
*
create
()
{
return
getBubble
(
this
->
dim
,
this
->
dim
+
1
);
// has to be generalized in later versions of bubble functions
}
};
protected:
/// Constructs lagrange/bubble basis functions with the given dim and degree.
/// Constructor is protected to avoid multiple instantiation of identical
/// basis functions. Use \ref getBubble instead.
Bubble
(
int
dim_
,
int
degree_
);
/** \brief
* destructor
*/
virtual
~
Bubble
();
public:
/// Returns a pointer to lagrange and bubble basis functions with the given dim and
/// degree. Multiple instantiation of identical basis functions is avoided
/// by rembering once created basis functions in \ref allBasFcts.
static
Bubble
*
getBubble
(
int
dim
,
int
degree
);
/// Implements BasisFunction::interpol
void
interpol
(
const
ElInfo
*
,
int
,
const
int
*
,
AbstractFunction
<
double
,
WorldVector
<
double
>
>*
,
mtl
::
dense_vector
<
double
>&
)
const
override
;
/// Implements BasisFunction::interpol
void
interpol
(
const
ElInfo
*
,
int
,
const
int
*
b_no
,
AbstractFunction
<
WorldVector
<
double
>
,
WorldVector
<
double
>
>*
,
mtl
::
dense_vector
<
WorldVector
<
double
>
>&
)
const
override
;
/// Returns the barycentric coordinates of the i-th basis function.
DimVec
<
double
>
*
getCoords
(
int
i
)
const
override
;
/// Implements BasisFunction::getBound
void
getBound
(
const
ElInfo
*
,
BoundaryType
*
)
const
override
;
/** \brief
* Calculates the local vertex indices which are involved in evaluating
* the nodeIndex-th DOF at the positionIndex-th part of type position
* (VERTEX/EDGE/FACE/CENTER). nodeIndex determines the permutation
* of the involved vertices. So in 1d for lagrange4 there are two DOFs at
* the CENTER (which is an edge in this case). Then vertices[0] = {0, 1} and
* vertices[1] = {1, 0}. This allows to use the same local basis function
* for all DOFs at the same position.
*/
static
void
setVertices
(
int
dim
,
int
degree
,
GeoIndex
position
,
int
positionIndex
,
int
nodeIndex
,
int
**
vertices
);
/// Implements BasisFunction::refineInter
inline
void
refineInter
(
DOFIndexed
<
double
>
*
drv
,
RCNeighbourList
*
list
,
int
n
)
override
{
if
(
refineInter_fct
)
(
*
refineInter_fct
)(
drv
,
list
,
n
,
this
);
}
/// Implements BasisFunction::coarseRestrict
inline
void
coarseRestr
(
DOFIndexed
<
double
>
*
drv
,
RCNeighbourList
*
list
,
int
n
)
override
{
if
(
coarseRestr_fct
)
(
*
coarseRestr_fct
)(
drv
,
list
,
n
,
this
);
}
/// Implements BasisFunction::coarseInter
inline
void
coarseInter
(
DOFIndexed
<
double
>
*
drv
,
RCNeighbourList
*
list
,
int
n
)
override
{
if
(
coarseInter_fct
)
(
*
coarseInter_fct
)(
drv
,
list
,
n
,
this
);
}
/// Implements BasisFunction::getLocalIndices().
void
getLocalIndices
(
const
Element
*
el
,
const
DOFAdmin
*
admin
,
std
::
vector
<
DegreeOfFreedom
>
&
dofs
)
const
override
;
/// Implements BasisFunction::getLocalDofPtrVec()
/// Returns an vector filled with all DOFs per position
void
getLocalDofPtrVec
(
const
Element
*
el
,