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
Aland, Sebastian
amdis
Commits
745701c4
Commit
745701c4
authored
Aug 29, 2008
by
Thomas Witkowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Exact error computation added
* ::std:: -> std::
parent
4a775f34
Changes
193
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
193 changed files
with
1442 additions
and
1410 deletions
+1442
-1410
AMDiS/src/AdaptBase.h
AMDiS/src/AdaptBase.h
+3
-3
AMDiS/src/AdaptInstationary.h
AMDiS/src/AdaptInstationary.h
+5
-5
AMDiS/src/Assembler.cc
AMDiS/src/Assembler.cc
+25
-25
AMDiS/src/BFGS_Precond.cc
AMDiS/src/BFGS_Precond.cc
+1
-1
AMDiS/src/BasisFunction.cc
AMDiS/src/BasisFunction.cc
+1
-1
AMDiS/src/BasisFunction.h
AMDiS/src/BasisFunction.h
+8
-8
AMDiS/src/BiCGSolver.h
AMDiS/src/BiCGSolver.h
+1
-1
AMDiS/src/BiCGSolver.hh
AMDiS/src/BiCGSolver.hh
+1
-1
AMDiS/src/BiCGStab.h
AMDiS/src/BiCGStab.h
+1
-1
AMDiS/src/BiCGStab.hh
AMDiS/src/BiCGStab.hh
+1
-1
AMDiS/src/BiCGStab2.h
AMDiS/src/BiCGStab2.h
+1
-1
AMDiS/src/BiCGStab2.hh
AMDiS/src/BiCGStab2.hh
+1
-1
AMDiS/src/BiCGStab_M.h
AMDiS/src/BiCGStab_M.h
+1
-1
AMDiS/src/BiCGStab_M.hh
AMDiS/src/BiCGStab_M.hh
+1
-1
AMDiS/src/BoundaryManager.cc
AMDiS/src/BoundaryManager.cc
+7
-7
AMDiS/src/BoundaryManager.h
AMDiS/src/BoundaryManager.h
+3
-3
AMDiS/src/BoundaryManager.hh
AMDiS/src/BoundaryManager.hh
+3
-3
AMDiS/src/BoxSmoother.h
AMDiS/src/BoxSmoother.h
+11
-11
AMDiS/src/CGSolver.h
AMDiS/src/CGSolver.h
+1
-1
AMDiS/src/CGSolver.hh
AMDiS/src/CGSolver.hh
+12
-12
AMDiS/src/CoarseningManager.cc
AMDiS/src/CoarseningManager.cc
+1
-1
AMDiS/src/CoarseningManager1d.cc
AMDiS/src/CoarseningManager1d.cc
+4
-4
AMDiS/src/CoarseningManager2d.cc
AMDiS/src/CoarseningManager2d.cc
+2
-2
AMDiS/src/CoarseningManager3d.cc
AMDiS/src/CoarseningManager3d.cc
+2
-2
AMDiS/src/CouplingTimeInterface.h
AMDiS/src/CouplingTimeInterface.h
+1
-1
AMDiS/src/CreatorMap.cc
AMDiS/src/CreatorMap.cc
+8
-8
AMDiS/src/CreatorMap.h
AMDiS/src/CreatorMap.h
+4
-4
AMDiS/src/DOFAdmin.h
AMDiS/src/DOFAdmin.h
+13
-13
AMDiS/src/DOFContainer.h
AMDiS/src/DOFContainer.h
+1
-1
AMDiS/src/DOFIndexed.cc
AMDiS/src/DOFIndexed.cc
+1
-1
AMDiS/src/DOFIndexed.h
AMDiS/src/DOFIndexed.h
+3
-3
AMDiS/src/DOFIterator.h
AMDiS/src/DOFIterator.h
+3
-3
AMDiS/src/DiagonalPreconditioner.cc
AMDiS/src/DiagonalPreconditioner.cc
+3
-3
AMDiS/src/DiagonalPreconditioner.h
AMDiS/src/DiagonalPreconditioner.h
+1
-1
AMDiS/src/DuneSolver.h
AMDiS/src/DuneSolver.h
+3
-3
AMDiS/src/DuneSolver.hh
AMDiS/src/DuneSolver.hh
+1
-1
AMDiS/src/ElInfo3d.h
AMDiS/src/ElInfo3d.h
+1
-1
AMDiS/src/ElInfoStack.h
AMDiS/src/ElInfoStack.h
+1
-1
AMDiS/src/Element.h
AMDiS/src/Element.h
+2
-2
AMDiS/src/ElementFileWriter.cc
AMDiS/src/ElementFileWriter.cc
+31
-31
AMDiS/src/ElementInfo.h
AMDiS/src/ElementInfo.h
+1
-1
AMDiS/src/ElementRegion_ED.h
AMDiS/src/ElementRegion_ED.h
+3
-3
AMDiS/src/EmptyElementData.h
AMDiS/src/EmptyElementData.h
+3
-3
AMDiS/src/Estimator.cc
AMDiS/src/Estimator.cc
+2
-1
AMDiS/src/Estimator.h
AMDiS/src/Estimator.h
+9
-9
AMDiS/src/FileWriter.cc
AMDiS/src/FileWriter.cc
+5
-5
AMDiS/src/FileWriter.h
AMDiS/src/FileWriter.h
+17
-17
AMDiS/src/FiniteElemSpace.cc
AMDiS/src/FiniteElemSpace.cc
+3
-3
AMDiS/src/FiniteElemSpace.h
AMDiS/src/FiniteElemSpace.h
+5
-5
AMDiS/src/FixVec.h
AMDiS/src/FixVec.h
+1
-1
AMDiS/src/GMResSolver.h
AMDiS/src/GMResSolver.h
+6
-6
AMDiS/src/GMResSolver.hh
AMDiS/src/GMResSolver.hh
+1
-1
AMDiS/src/GMResSolver2.h
AMDiS/src/GMResSolver2.h
+1
-1
AMDiS/src/GMResSolver2.hh
AMDiS/src/GMResSolver2.hh
+1
-1
AMDiS/src/GNUPlotWriter.cc
AMDiS/src/GNUPlotWriter.cc
+2
-2
AMDiS/src/GNUPlotWriter.h
AMDiS/src/GNUPlotWriter.h
+4
-4
AMDiS/src/GSSmoother.cc
AMDiS/src/GSSmoother.cc
+13
-13
AMDiS/src/GSSmoother.h
AMDiS/src/GSSmoother.h
+1
-1
AMDiS/src/Global.cc
AMDiS/src/Global.cc
+28
-28
AMDiS/src/Global.h
AMDiS/src/Global.h
+15
-15
AMDiS/src/GlobalDOFNumbering.cc
AMDiS/src/GlobalDOFNumbering.cc
+6
-6
AMDiS/src/GlobalDOFNumbering.h
AMDiS/src/GlobalDOFNumbering.h
+6
-6
AMDiS/src/GlobalElementNumbering.h
AMDiS/src/GlobalElementNumbering.h
+2
-2
AMDiS/src/GridWriter.hh
AMDiS/src/GridWriter.hh
+5
-5
AMDiS/src/ILUPreconditioner.cc
AMDiS/src/ILUPreconditioner.cc
+8
-8
AMDiS/src/ILUPreconditioner.h
AMDiS/src/ILUPreconditioner.h
+4
-4
AMDiS/src/ILUTPreconditioner.cc
AMDiS/src/ILUTPreconditioner.cc
+2
-2
AMDiS/src/ILUTPreconditioner.h
AMDiS/src/ILUTPreconditioner.h
+3
-3
AMDiS/src/InterpolRestrictMatrix.cc
AMDiS/src/InterpolRestrictMatrix.cc
+44
-44
AMDiS/src/InterpolRestrictMatrix.h
AMDiS/src/InterpolRestrictMatrix.h
+4
-4
AMDiS/src/JacobiSmoother.cc
AMDiS/src/JacobiSmoother.cc
+10
-10
AMDiS/src/JacobiSmoother.h
AMDiS/src/JacobiSmoother.h
+1
-1
AMDiS/src/Lagrange.cc
AMDiS/src/Lagrange.cc
+7
-7
AMDiS/src/Lagrange.h
AMDiS/src/Lagrange.h
+6
-6
AMDiS/src/LeafData.cc
AMDiS/src/LeafData.cc
+1
-1
AMDiS/src/LeafData.h
AMDiS/src/LeafData.h
+25
-25
AMDiS/src/Line.h
AMDiS/src/Line.h
+1
-1
AMDiS/src/MacroElement.cc
AMDiS/src/MacroElement.cc
+1
-1
AMDiS/src/MacroElement.h
AMDiS/src/MacroElement.h
+4
-4
AMDiS/src/MacroReader.cc
AMDiS/src/MacroReader.cc
+22
-22
AMDiS/src/MacroReader.h
AMDiS/src/MacroReader.h
+2
-2
AMDiS/src/MacroWriter.cc
AMDiS/src/MacroWriter.cc
+39
-39
AMDiS/src/MacroWriter.h
AMDiS/src/MacroWriter.h
+5
-5
AMDiS/src/MatVecMultiplier.cc
AMDiS/src/MatVecMultiplier.cc
+4
-4
AMDiS/src/MemoryManager.cc
AMDiS/src/MemoryManager.cc
+4
-4
AMDiS/src/MemoryManager.h
AMDiS/src/MemoryManager.h
+16
-16
AMDiS/src/MemoryPool.cc
AMDiS/src/MemoryPool.cc
+1
-1
AMDiS/src/MemoryPool.h
AMDiS/src/MemoryPool.h
+1
-1
AMDiS/src/Mesh.h
AMDiS/src/Mesh.h
+16
-16
AMDiS/src/MpCCIAdapter.cc
AMDiS/src/MpCCIAdapter.cc
+4
-4
AMDiS/src/MpCCIAdapter.h
AMDiS/src/MpCCIAdapter.h
+4
-4
AMDiS/src/MultiGridPreconWrapper.cc
AMDiS/src/MultiGridPreconWrapper.cc
+1
-1
AMDiS/src/MultiGridPreconWrapper.h
AMDiS/src/MultiGridPreconWrapper.h
+1
-1
AMDiS/src/MultiGridSolver.cc
AMDiS/src/MultiGridSolver.cc
+56
-56
AMDiS/src/MultiGridSolver.h
AMDiS/src/MultiGridSolver.h
+25
-25
AMDiS/src/MultiGridSolverBase.h
AMDiS/src/MultiGridSolverBase.h
+2
-2
AMDiS/src/MultiGridSolverBase.hh
AMDiS/src/MultiGridSolverBase.hh
+1
-1
AMDiS/src/MultiGridWrapper.h
AMDiS/src/MultiGridWrapper.h
+2
-2
AMDiS/src/Newton.h
AMDiS/src/Newton.h
+1
-1
AMDiS/src/Newton.hh
AMDiS/src/Newton.hh
+2
-2
AMDiS/src/NewtonS.h
AMDiS/src/NewtonS.h
+1
-1
AMDiS/src/NewtonS.hh
AMDiS/src/NewtonS.hh
+4
-4
AMDiS/src/NonLinSolver.h
AMDiS/src/NonLinSolver.h
+4
-4
AMDiS/src/NonLinSolver.hh
AMDiS/src/NonLinSolver.hh
+1
-1
AMDiS/src/ODirSolver.h
AMDiS/src/ODirSolver.h
+1
-1
AMDiS/src/ODirSolver.hh
AMDiS/src/ODirSolver.hh
+1
-1
AMDiS/src/OEMSolver.h
AMDiS/src/OEMSolver.h
+5
-5
AMDiS/src/OEMSolver.hh
AMDiS/src/OEMSolver.hh
+1
-1
AMDiS/src/OResSolver.h
AMDiS/src/OResSolver.h
+1
-1
AMDiS/src/OResSolver.hh
AMDiS/src/OResSolver.hh
+1
-1
AMDiS/src/Operator.cc
AMDiS/src/Operator.cc
+33
-33
AMDiS/src/Operator.h
AMDiS/src/Operator.h
+86
-86
AMDiS/src/ParallelProblem.cc
AMDiS/src/ParallelProblem.cc
+6
-6
AMDiS/src/ParallelProblem.h
AMDiS/src/ParallelProblem.h
+2
-2
AMDiS/src/Parameters.cc
AMDiS/src/Parameters.cc
+58
-58
AMDiS/src/Parameters.h
AMDiS/src/Parameters.h
+43
-43
AMDiS/src/PardisoSolver.cc
AMDiS/src/PardisoSolver.cc
+3
-3
AMDiS/src/PardisoSolver.h
AMDiS/src/PardisoSolver.h
+1
-1
AMDiS/src/PardisoSolver.hh
AMDiS/src/PardisoSolver.hh
+1
-1
AMDiS/src/PeriodicBC.cc
AMDiS/src/PeriodicBC.cc
+6
-6
AMDiS/src/PeriodicBC.h
AMDiS/src/PeriodicBC.h
+3
-3
AMDiS/src/PeriodicInfo.h
AMDiS/src/PeriodicInfo.h
+1
-1
AMDiS/src/PeriodicMap.h
AMDiS/src/PeriodicMap.h
+3
-3
AMDiS/src/Preconditioner.h
AMDiS/src/Preconditioner.h
+5
-5
AMDiS/src/ProblemInstat.h
AMDiS/src/ProblemInstat.h
+7
-7
AMDiS/src/ProblemInterpolVec.cc
AMDiS/src/ProblemInterpolVec.cc
+2
-2
AMDiS/src/ProblemInterpolVec.h
AMDiS/src/ProblemInterpolVec.h
+4
-4
AMDiS/src/ProblemIterationInterface.h
AMDiS/src/ProblemIterationInterface.h
+4
-4
AMDiS/src/ProblemNonLin.cc
AMDiS/src/ProblemNonLin.cc
+5
-5
AMDiS/src/ProblemNonLin.h
AMDiS/src/ProblemNonLin.h
+2
-2
AMDiS/src/ProblemScal.cc
AMDiS/src/ProblemScal.cc
+2
-3
AMDiS/src/ProblemStatBase.h
AMDiS/src/ProblemStatBase.h
+3
-3
AMDiS/src/ProblemTimeInterface.h
AMDiS/src/ProblemTimeInterface.h
+2
-2
AMDiS/src/ProblemVec.cc
AMDiS/src/ProblemVec.cc
+51
-40
AMDiS/src/ProblemVec.h
AMDiS/src/ProblemVec.h
+39
-10
AMDiS/src/Projection.cc
AMDiS/src/Projection.cc
+1
-1
AMDiS/src/Projection.h
AMDiS/src/Projection.h
+1
-1
AMDiS/src/QPInfo.cc
AMDiS/src/QPInfo.cc
+4
-4
AMDiS/src/QPInfo.h
AMDiS/src/QPInfo.h
+2
-2
AMDiS/src/QPsiPhi.cc
AMDiS/src/QPsiPhi.cc
+12
-12
AMDiS/src/QPsiPhi.h
AMDiS/src/QPsiPhi.h
+8
-8
AMDiS/src/Quadrature.hh
AMDiS/src/Quadrature.hh
+3
-3
AMDiS/src/RCNeighbourList.cc
AMDiS/src/RCNeighbourList.cc
+3
-3
AMDiS/src/RCNeighbourList.h
AMDiS/src/RCNeighbourList.h
+1
-1
AMDiS/src/Recovery.cc
AMDiS/src/Recovery.cc
+26
-26
AMDiS/src/Recovery.h
AMDiS/src/Recovery.h
+1
-1
AMDiS/src/RecoveryEstimator.cc
AMDiS/src/RecoveryEstimator.cc
+3
-3
AMDiS/src/RecoveryEstimator.h
AMDiS/src/RecoveryEstimator.h
+1
-1
AMDiS/src/RefinementManager1d.cc
AMDiS/src/RefinementManager1d.cc
+2
-2
AMDiS/src/RefinementManager2d.cc
AMDiS/src/RefinementManager2d.cc
+4
-4
AMDiS/src/RefinementManager3d.cc
AMDiS/src/RefinementManager3d.cc
+6
-6
AMDiS/src/ResidualEstimator.cc
AMDiS/src/ResidualEstimator.cc
+35
-35
AMDiS/src/ResidualEstimator.h
AMDiS/src/ResidualEstimator.h
+1
-1
AMDiS/src/ResidualParallelEstimator.cc
AMDiS/src/ResidualParallelEstimator.cc
+1
-1
AMDiS/src/ResidualParallelEstimator.h
AMDiS/src/ResidualParallelEstimator.h
+2
-2
AMDiS/src/RobinBC.cc
AMDiS/src/RobinBC.cc
+1
-1
AMDiS/src/SMIAdapter.cc
AMDiS/src/SMIAdapter.cc
+4
-4
AMDiS/src/SMIAdapter.h
AMDiS/src/SMIAdapter.h
+9
-9
AMDiS/src/Serializable.h
AMDiS/src/Serializable.h
+3
-3
AMDiS/src/Serializer.h
AMDiS/src/Serializer.h
+8
-8
AMDiS/src/SmootherBase.h
AMDiS/src/SmootherBase.h
+4
-4
AMDiS/src/SparseVector.cc
AMDiS/src/SparseVector.cc
+6
-6
AMDiS/src/SparseVector.h
AMDiS/src/SparseVector.h
+21
-29
AMDiS/src/SparseVector.hh
AMDiS/src/SparseVector.hh
+14
-14
AMDiS/src/StandardProblemIteration.cc
AMDiS/src/StandardProblemIteration.cc
+3
-3
AMDiS/src/StandardProblemIteration.h
AMDiS/src/StandardProblemIteration.h
+3
-3
AMDiS/src/StlVector.cc
AMDiS/src/StlVector.cc
+13
-13
AMDiS/src/StlVector.h
AMDiS/src/StlVector.h
+15
-15
AMDiS/src/SurfaceQuadrature.cc
AMDiS/src/SurfaceQuadrature.cc
+1
-1
AMDiS/src/SurfaceQuadrature.h
AMDiS/src/SurfaceQuadrature.h
+1
-1
AMDiS/src/SurfaceRegion_ED.h
AMDiS/src/SurfaceRegion_ED.h
+3
-3
AMDiS/src/SystemVector.h
AMDiS/src/SystemVector.h
+13
-13
AMDiS/src/TFQMR.h
AMDiS/src/TFQMR.h
+1
-1
AMDiS/src/TFQMR.hh
AMDiS/src/TFQMR.hh
+3
-3
AMDiS/src/TecPlotWriter.cc
AMDiS/src/TecPlotWriter.cc
+4
-4
AMDiS/src/TecPlotWriter.h
AMDiS/src/TecPlotWriter.h
+3
-3
AMDiS/src/TecPlotWriter.hh
AMDiS/src/TecPlotWriter.hh
+12
-12
AMDiS/src/Tetrahedron.h
AMDiS/src/Tetrahedron.h
+1
-1
AMDiS/src/Traverse.h
AMDiS/src/Traverse.h
+5
-5
AMDiS/src/TraverseParallel.cc
AMDiS/src/TraverseParallel.cc
+2
-2
AMDiS/src/TraverseParallel.h
AMDiS/src/TraverseParallel.h
+1
-1
AMDiS/src/Triangle.h
AMDiS/src/Triangle.h
+1
-1
AMDiS/src/UmfPackSolver.h
AMDiS/src/UmfPackSolver.h
+1
-1
AMDiS/src/UmfPackSolver.hh
AMDiS/src/UmfPackSolver.hh
+2
-2
AMDiS/src/V3Vector.cc
AMDiS/src/V3Vector.cc
+30
-30
AMDiS/src/V3Vector.h
AMDiS/src/V3Vector.h
+16
-16
AMDiS/src/ValueReader.cc
AMDiS/src/ValueReader.cc
+4
-4
AMDiS/src/ValueWriter.cc
AMDiS/src/ValueWriter.cc
+25
-25
AMDiS/src/ValueWriter.h
AMDiS/src/ValueWriter.h
+2
-2
AMDiS/src/VecSymSolver.h
AMDiS/src/VecSymSolver.h
+1
-1
AMDiS/src/VecSymSolver.hh
AMDiS/src/VecSymSolver.hh
+50
-50
AMDiS/src/VertexVector.cc
AMDiS/src/VertexVector.cc
+1
-1
AMDiS/src/VertexVector.h
AMDiS/src/VertexVector.h
+2
-2
No files found.
AMDiS/src/AdaptBase.h
View file @
745701c4
...
...
@@ -43,7 +43,7 @@ namespace AMDiS {
/** \brief
* Constructor
*/
AdaptBase
(
const
::
std
::
string
&
name
,
AdaptBase
(
const
std
::
string
&
name
,
ProblemIterationInterface
*
problemIteration
,
AdaptInfo
*
adaptInfo
,
ProblemTimeInterface
*
problemTime
=
NULL
,
...
...
@@ -69,7 +69,7 @@ namespace AMDiS {
/** \brief
* Returns \ref name_
*/
inline
const
::
std
::
string
&
getName
()
const
{
inline
const
std
::
string
&
getName
()
const
{
return
name_
;
};
...
...
@@ -113,7 +113,7 @@ namespace AMDiS {
/** \brief
* Name of the adaption loop
*/
::
std
::
string
name_
;
std
::
string
name_
;
/** \brief
* Problem iteration interface
...
...
AMDiS/src/AdaptInstationary.h
View file @
745701c4
...
...
@@ -88,12 +88,12 @@ namespace AMDiS {
/** \brief
* serialization
*/
virtual
void
serialize
(
::
std
::
ostream
&
out
);
virtual
void
serialize
(
std
::
ostream
&
out
);
/** \brief
* deserialization
*/
virtual
void
deserialize
(
::
std
::
istream
&
in
);
virtual
void
deserialize
(
std
::
istream
&
in
);
protected:
...
...
@@ -111,7 +111,7 @@ namespace AMDiS {
/** \brief
* Initialisation of this AdaptInstationary object
*/
void
initialize
(
const
::
std
::
string
&
aName
);
void
initialize
(
const
std
::
string
&
aName
);
/** \brief
* Implements the explit time strategy. Used by \ref oneTimestep().
...
...
@@ -169,7 +169,7 @@ namespace AMDiS {
/** \brief
* Name of the file used to automatically serialize the problem.
*/
::
std
::
string
queueSerializationFilename_
;
std
::
string
queueSerializationFilename_
;
/** \brief
* Timestamp at the beginning of all calculations. It is used to calculate the overall
...
...
@@ -186,7 +186,7 @@ namespace AMDiS {
/** \brief
* Stores the runtime (in seconds) of some last timestep iterations.
*/
::
std
::
queue
<
int
>
lastIterationsDuration_
;
std
::
queue
<
int
>
lastIterationsDuration_
;
};
}
...
...
AMDiS/src/Assembler.cc
View file @
745701c4
...
...
@@ -11,15 +11,15 @@
namespace
AMDiS
{
::
std
::
vector
<
SubAssembler
*>
ZeroOrderAssembler
::
optimizedSubAssemblers
;
::
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
optimizedSubAssemblersGrdPhi
;
::
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
optimizedSubAssemblersGrdPsi
;
::
std
::
vector
<
SubAssembler
*>
SecondOrderAssembler
::
optimizedSubAssemblers
;
std
::
vector
<
SubAssembler
*>
ZeroOrderAssembler
::
optimizedSubAssemblers
;
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
optimizedSubAssemblersGrdPhi
;
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
optimizedSubAssemblersGrdPsi
;
std
::
vector
<
SubAssembler
*>
SecondOrderAssembler
::
optimizedSubAssemblers
;
::
std
::
vector
<
SubAssembler
*>
ZeroOrderAssembler
::
standardSubAssemblers
;
::
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
standardSubAssemblersGrdPhi
;
::
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
standardSubAssemblersGrdPsi
;
::
std
::
vector
<
SubAssembler
*>
SecondOrderAssembler
::
standardSubAssemblers
;
std
::
vector
<
SubAssembler
*>
ZeroOrderAssembler
::
standardSubAssemblers
;
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
standardSubAssemblersGrdPhi
;
std
::
vector
<
SubAssembler
*>
FirstOrderAssembler
::
standardSubAssemblersGrdPsi
;
std
::
vector
<
SubAssembler
*>
SecondOrderAssembler
::
standardSubAssemblers
;
SubAssembler
::
SubAssembler
(
Operator
*
op
,
Assembler
*
assembler
,
...
...
@@ -98,20 +98,20 @@ namespace AMDiS {
coordsValid
=
false
;
// set values at QPs invalid
::
std
::
map
<
const
DOFVectorBase
<
double
>*
,
ValuesAtQPs
*>::
iterator
it1
;
std
::
map
<
const
DOFVectorBase
<
double
>*
,
ValuesAtQPs
*>::
iterator
it1
;
for
(
it1
=
valuesAtQPs
.
begin
();
it1
!=
valuesAtQPs
.
end
();
++
it1
)
{
((
*
it1
).
second
)
->
valid
=
false
;
}
// set gradients at QPs invalid
::
std
::
map
<
const
DOFVectorBase
<
double
>*
,
GradientsAtQPs
*>::
iterator
it2
;
std
::
map
<
const
DOFVectorBase
<
double
>*
,
GradientsAtQPs
*>::
iterator
it2
;
for
(
it2
=
gradientsAtQPs
.
begin
();
it2
!=
gradientsAtQPs
.
end
();
++
it2
)
{
((
*
it2
).
second
)
->
valid
=
false
;
}
int
myRank
=
omp_get_thread_num
();
// calls initElement of each term
::
std
::
vector
<
OperatorTerm
*>::
iterator
it
;
std
::
vector
<
OperatorTerm
*>::
iterator
it
;
for
(
it
=
terms
[
myRank
].
begin
();
it
!=
terms
[
myRank
].
end
();
++
it
)
{
(
*
it
)
->
initElement
(
elInfo
,
this
,
quad
);
}
...
...
@@ -298,20 +298,20 @@ namespace AMDiS {
ZeroOrderAssembler
*
newAssembler
;
::
std
::
vector
<
SubAssembler
*>
*
subAssemblers
=
std
::
vector
<
SubAssembler
*>
*
subAssemblers
=
optimized
?
&
optimizedSubAssemblers
:
&
standardSubAssemblers
;
int
myRank
=
omp_get_thread_num
();
::
std
::
vector
<
OperatorTerm
*>
opTerms
=
op
->
zeroOrder
[
myRank
];
std
::
vector
<
OperatorTerm
*>
opTerms
=
op
->
zeroOrder
[
myRank
];
sort
(
opTerms
.
begin
(),
opTerms
.
end
());
// check if a new assembler is needed
if
(
quad
)
{
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
subAssemblers
->
size
());
i
++
)
{
::
std
::
vector
<
OperatorTerm
*>
assTerms
=
*
((
*
subAssemblers
)[
i
]
->
getTerms
());
std
::
vector
<
OperatorTerm
*>
assTerms
=
*
((
*
subAssemblers
)[
i
]
->
getTerms
());
sort
(
assTerms
.
begin
(),
assTerms
.
end
());
...
...
@@ -354,7 +354,7 @@ namespace AMDiS {
FirstOrderType
type
,
bool
optimized
)
{
::
std
::
vector
<
SubAssembler
*>
*
subAssemblers
=
std
::
vector
<
SubAssembler
*>
*
subAssemblers
=
optimized
?
(
type
==
GRD_PSI
?
&
optimizedSubAssemblersGrdPsi
:
...
...
@@ -364,7 +364,7 @@ namespace AMDiS {
&
standardSubAssemblersGrdPhi
);
int
myRank
=
omp_get_thread_num
();
::
std
::
vector
<
OperatorTerm
*>
opTerms
std
::
vector
<
OperatorTerm
*>
opTerms
=
(
type
==
GRD_PSI
)
?
op
->
firstOrderGrdPsi
[
myRank
]
:
op
->
firstOrderGrdPhi
[
myRank
];
...
...
@@ -381,7 +381,7 @@ namespace AMDiS {
// check if a new assembler is needed
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
subAssemblers
->
size
());
i
++
)
{
::
std
::
vector
<
OperatorTerm
*>
assTerms
=
*
((
*
subAssemblers
)[
i
]
->
getTerms
());
std
::
vector
<
OperatorTerm
*>
assTerms
=
*
((
*
subAssemblers
)[
i
]
->
getTerms
());
sort
(
assTerms
.
begin
(),
assTerms
.
end
());
...
...
@@ -440,18 +440,18 @@ namespace AMDiS {
SecondOrderAssembler
*
newAssembler
;
::
std
::
vector
<
SubAssembler
*>
*
subAssemblers
=
std
::
vector
<
SubAssembler
*>
*
subAssemblers
=
optimized
?
&
optimizedSubAssemblers
:
&
standardSubAssemblers
;
::
std
::
vector
<
OperatorTerm
*>
opTerms
=
op
->
zeroOrder
[
myRank
];
std
::
vector
<
OperatorTerm
*>
opTerms
=
op
->
zeroOrder
[
myRank
];
sort
(
opTerms
.
begin
(),
opTerms
.
end
());
// check if a new assembler is needed
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
subAssemblers
->
size
());
i
++
)
{
::
std
::
vector
<
OperatorTerm
*>
assTerms
=
*
((
*
subAssemblers
)[
i
]
->
getTerms
());
std
::
vector
<
OperatorTerm
*>
assTerms
=
*
((
*
subAssemblers
)[
i
]
->
getTerms
());
sort
(
assTerms
.
begin
(),
assTerms
.
end
());
...
...
@@ -508,7 +508,7 @@ namespace AMDiS {
}
int
myRank
=
omp_get_thread_num
();
::
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
for
(
termIt
=
terms
[
myRank
].
begin
();
termIt
!=
terms
[
myRank
].
end
();
++
termIt
)
{
(
static_cast
<
ZeroOrderTerm
*>
((
*
termIt
)))
->
getC
(
elInfo
,
nPoints
,
c
);
}
...
...
@@ -565,7 +565,7 @@ namespace AMDiS {
}
int
myRank
=
omp_get_thread_num
();
::
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
for
(
termIt
=
terms
[
myRank
].
begin
();
termIt
!=
terms
[
myRank
].
end
();
++
termIt
)
{
(
static_cast
<
ZeroOrderTerm
*>
((
*
termIt
)))
->
getC
(
elInfo
,
nPoints
,
c
);
}
...
...
@@ -615,7 +615,7 @@ namespace AMDiS {
c
[
iq
]
=
0.0
;
}
::
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
for
(
termIt
=
terms
[
myRank
].
begin
();
termIt
!=
terms
[
myRank
].
end
();
++
termIt
)
{
(
static_cast
<
ZeroOrderTerm
*>
((
*
termIt
)))
->
getC
(
elInfo
,
nPoints
,
c
);
}
...
...
@@ -668,7 +668,7 @@ namespace AMDiS {
}
int
myRank
=
omp_get_thread_num
();
::
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
for
(
termIt
=
terms
[
myRank
].
begin
();
termIt
!=
terms
[
myRank
].
end
();
++
termIt
)
{
(
static_cast
<
ZeroOrderTerm
*>
((
*
termIt
)))
->
getC
(
elInfo
,
nPoints
,
c
);
}
...
...
@@ -738,7 +738,7 @@ namespace AMDiS {
firstCall
=
false
;
}
::
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
std
::
vector
<
OperatorTerm
*>::
iterator
termIt
;
int
myRank
=
omp_get_thread_num
();
double
c
=
0.0
;
...
...
AMDiS/src/BFGS_Precond.cc
View file @
745701c4
...
...
@@ -40,7 +40,7 @@ namespace AMDiS
double
beta
;
double
*
alpha
=
GET_MEMORY
(
double
,
k
);
::
std
::
deque
<
BFGS_Vectors
>::
iterator
pairsIterator
(
pairsVec
.
begin
());
std
::
deque
<
BFGS_Vectors
>::
iterator
pairsIterator
(
pairsVec
.
begin
());
while
(
pairsIterator
!=
pairsVec
.
end
())
{
alpha
[
i
]
=
pairsIterator
->
s
*
*
vec
;
...
...
AMDiS/src/BasisFunction.cc
View file @
745701c4
...
...
@@ -15,7 +15,7 @@ namespace AMDiS {
/* are those corresponding to these barycentric coordinates. */
/****************************************************************************/
BasisFunction
::
BasisFunction
(
const
::
std
::
string
&
name_
,
int
dim_
,
int
degree_
)
BasisFunction
::
BasisFunction
(
const
std
::
string
&
name_
,
int
dim_
,
int
degree_
)
:
name
(
name_
),
degree
(
degree_
),
dim
(
dim_
)
...
...
AMDiS/src/BasisFunction.h
View file @
745701c4
...
...
@@ -131,7 +131,7 @@ namespace AMDiS {
/** \brief
* Creates a BasisFunction object of given dim and degree
*/
BasisFunction
(
const
::
std
::
string
&
name_
,
int
dim_
,
int
degree_
);
BasisFunction
(
const
std
::
string
&
name_
,
int
dim_
,
int
degree_
);
/** \brief
* destructor
...
...
@@ -214,7 +214,7 @@ namespace AMDiS {
/** \brief
* Returns \ref name of BasisFunction
*/
inline
const
::
std
::
string
&
getName
()
const
{
inline
const
std
::
string
&
getName
()
const
{
return
name
;
};
...
...
@@ -415,7 +415,7 @@ namespace AMDiS {
/** \brief
* Textual description
*/
::
std
::
string
name
;
std
::
string
name
;
/** \brief
* Number of basisfunctions on one Element
...
...
@@ -445,30 +445,30 @@ namespace AMDiS {
/** \brief
* Vector of the local functions
*/
::
std
::
vector
<
BasFctType
*>
*
phi
;
std
::
vector
<
BasFctType
*>
*
phi
;
/** \brief
* Vector of gradients
*/
::
std
::
vector
<
GrdBasFctType
*>
*
grdPhi
;
std
::
vector
<
GrdBasFctType
*>
*
grdPhi
;
/** \brief
* Vector of second derivatives
*/
::
std
::
vector
<
D2BasFctType
*>
*
d2Phi
;
std
::
vector
<
D2BasFctType
*>
*
d2Phi
;
/** \brief
* Is used by function evalGrdUh. To make it thread safe, we need a
* temporary DimVec for every thread.
*/
::
std
::
vector
<
DimVec
<
double
>*
>
grdTmpVec1
;
std
::
vector
<
DimVec
<
double
>*
>
grdTmpVec1
;
/** \brief
* Is used by function evalGrdUh. To make it thread safe, we need a
* temporary DimVec for every thread.
*/
::
std
::
vector
<
DimVec
<
double
>*
>
grdTmpVec2
;
std
::
vector
<
DimVec
<
double
>*
>
grdTmpVec2
;
};
}
...
...
AMDiS/src/BiCGSolver.h
View file @
745701c4
...
...
@@ -66,7 +66,7 @@ namespace AMDiS {
/** \brief
* constructor
*/
BiCGSolver
(
::
std
::
string
name
);
BiCGSolver
(
std
::
string
name
);
/** \brief
* destructor
...
...
AMDiS/src/BiCGSolver.hh
View file @
745701c4
...
...
@@ -3,7 +3,7 @@
namespace
AMDiS
{
template
<
typename
VectorType
>
BiCGSolver
<
VectorType
>::
BiCGSolver
(
::
std
::
string
name
)
BiCGSolver
<
VectorType
>::
BiCGSolver
(
std
::
string
name
)
:
OEMSolver
<
VectorType
>
(
name
),
rstar
(
NULL
),
d
(
NULL
),
s
(
NULL
),
CAd
(
NULL
),
h
(
NULL
)
{
...
...
AMDiS/src/BiCGStab.h
View file @
745701c4
...
...
@@ -68,7 +68,7 @@ namespace AMDiS
/** \brief
* constructor
*/
BiCGStab
(
::
std
::
string
name
);
BiCGStab
(
std
::
string
name
);
/** \brief
* destructor
...
...
AMDiS/src/BiCGStab.hh
View file @
745701c4
...
...
@@ -4,7 +4,7 @@ namespace AMDiS
{
template
<
typename
VectorType
>
BiCGStab
<
VectorType
>::
BiCGStab
(
::
std
::
string
name
)
BiCGStab
<
VectorType
>::
BiCGStab
(
std
::
string
name
)
:
OEMSolver
<
VectorType
>
(
name
),
r
(
NULL
),
rstar
(
NULL
),
...
...
AMDiS/src/BiCGStab2.h
View file @
745701c4
...
...
@@ -67,7 +67,7 @@ namespace AMDiS
/** \brief
* constructor
*/
BiCGStab2
(
::
std
::
string
name
);
BiCGStab2
(
std
::
string
name
);
/** \brief
* destructor
...
...
AMDiS/src/BiCGStab2.hh
View file @
745701c4
...
...
@@ -4,7 +4,7 @@ namespace AMDiS
{
template
<
typename
VectorType
>
BiCGStab2
<
VectorType
>::
BiCGStab2
(
::
std
::
string
name
)
BiCGStab2
<
VectorType
>::
BiCGStab2
(
std
::
string
name
)
:
OEMSolver
<
VectorType
>
(
name
),
r
(
NULL
),
rstar
(
NULL
),
u
(
NULL
),
v
(
NULL
),
s
(
NULL
),
w
(
NULL
),
t
(
NULL
),
xmin
(
NULL
)
...
...
AMDiS/src/BiCGStab_M.h
View file @
745701c4
...
...
@@ -63,7 +63,7 @@ namespace AMDiS {
/** \brief
* constructor
*/
BiCGStab_M
(
::
std
::
string
name
);
BiCGStab_M
(
std
::
string
name
);
/** \brief
* destructor
...
...
AMDiS/src/BiCGStab_M.hh
View file @
745701c4
namespace
AMDiS
{
template
<
typename
VectorType
>
BiCGStab_M
<
VectorType
>::
BiCGStab_M
(
::
std
::
string
name
)
:
OEMSolver
<
VectorType
>
(
name
)
{}
BiCGStab_M
<
VectorType
>::
BiCGStab_M
(
std
::
string
name
)
:
OEMSolver
<
VectorType
>
(
name
)
{}
template
<
typename
VectorType
>
BiCGStab_M
<
VectorType
>::~
BiCGStab_M
()
{}
...
...
AMDiS/src/BoundaryManager.cc
View file @
745701c4
...
...
@@ -14,7 +14,7 @@ namespace AMDiS {
const
DOFVectorBase
<
double
>
*
dv
)
{
double
result
=
0
;
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
for
(
it
=
localBCs
.
begin
();
it
!=
localBCs
.
end
();
++
it
)
{
if
((
*
it
).
second
)
result
+=
(
*
it
).
second
->
boundResidual
(
elInfo
,
matrix
,
dv
);
...
...
@@ -32,7 +32,7 @@ namespace AMDiS {
int
nBasFcts
=
basisFcts
->
getNumber
();
DOFAdmin
*
admin
=
feSpace
->
getAdmin
();
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
if
(
localBCs
.
size
()
>
0
)
{
...
...
@@ -75,7 +75,7 @@ namespace AMDiS {
int
nBasFcts
=
basisFcts
->
getNumber
();
DOFAdmin
*
admin
=
feSpace
->
getAdmin
();
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
if
(
localBCs
.
size
()
>
0
)
{
// get boundaries of all DOFs
...
...
@@ -105,7 +105,7 @@ namespace AMDiS {
void
BoundaryManager
::
initMatrix
(
DOFMatrix
*
matrix
)
{
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
for
(
it
=
localBCs
.
begin
();
it
!=
localBCs
.
end
();
++
it
)
{
if
((
*
it
).
second
)
{
...
...
@@ -125,7 +125,7 @@ namespace AMDiS {
void
BoundaryManager
::
exitMatrix
(
DOFMatrix
*
matrix
)
{
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
for
(
it
=
localBCs
.
begin
();
it
!=
localBCs
.
end
();
++
it
)
{
if
((
*
it
).
second
)
{
if
(
!
(
*
it
).
second
->
isDirichlet
())
{
...
...
@@ -144,7 +144,7 @@ namespace AMDiS {
void
BoundaryManager
::
initVector
(
DOFVectorBase
<
double
>
*
vector
)
{
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
for
(
it
=
localBCs
.
begin
();
it
!=
localBCs
.
end
();
++
it
)
{
if
((
*
it
).
second
)
{
if
(
!
(
*
it
).
second
->
isDirichlet
())
{
...
...
@@ -163,7 +163,7 @@ namespace AMDiS {
void
BoundaryManager
::
exitVector
(
DOFVectorBase
<
double
>
*
vector
)
{
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>::
iterator
it
;
for
(
it
=
localBCs
.
begin
();
it
!=
localBCs
.
end
();
++
it
)
{
if
((
*
it
).
second
)
{
if
(
!
(
*
it
).
second
->
isDirichlet
())
{
...
...
AMDiS/src/BoundaryManager.h
View file @
745701c4
...
...
@@ -97,11 +97,11 @@ namespace AMDiS {
// */
// void fillGlobalBoundVector(DOFVectorBase<BoundaryType> *bound);
const
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>&
getBoundaryConditionMap
()
{
const
std
::
map
<
BoundaryType
,
BoundaryCondition
*>&
getBoundaryConditionMap
()
{
return
localBCs
;
};
void
setBoundaryConditionMap
(
const
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>&
bcs
)
{
void
setBoundaryConditionMap
(
const
std
::
map
<
BoundaryType
,
BoundaryCondition
*>&
bcs
)
{
localBCs
=
bcs
;
};
...
...
@@ -109,7 +109,7 @@ namespace AMDiS {
/** \brief
* Map of managed local boundary conditions.
*/
::
std
::
map
<
BoundaryType
,
BoundaryCondition
*>
localBCs
;
std
::
map
<
BoundaryType
,
BoundaryCondition
*>
localBCs
;
};
}
...
...
AMDiS/src/BoundaryManager.hh
View file @
745701c4
...
...
@@ -13,7 +13,7 @@ namespace AMDiS {
double
BoundaryManager
<
T
>::
boundResidual
(
ElInfo
*
elInfo
,
Estimator
<
T
>
*
estimator
)
{
double
result
=
0
;
typename
::
std
::
list
<
LocalBC
<
T
>*>::
iterator
it
;
typename
std
::
list
<
LocalBC
<
T
>*>::
iterator
it
;
for
(
it
=
localBCs
.
begin
();
it
!=
localBCs
.
end
();
++
it
)
{
result
+=
(
*
it
)
->
boundResidual
(
elInfo
,
estimator
);
}
...
...
@@ -75,7 +75,7 @@ namespace AMDiS {
LocalBC
<
T
>
*
localBC
;
DOFAdmin
*
admin
=
feSpace
->
getAdmin
();
typename
::
std
::
list
<
LocalBC
<
T
>*>::
iterator
it
;
typename
std
::
list
<
LocalBC
<
T
>*>::
iterator
it
;
if
(
localBCs
.
size
()
>
0
)
{
...
...
@@ -109,7 +109,7 @@ namespace AMDiS {
LocalBC
<
T
>
*
localBC
;
DOFAdmin
*
admin
=
feSpace
->
getAdmin
();
typename
::
std
::
list
<
LocalBC
<
T
>*>::
iterator
it
;
typename
std
::
list
<
LocalBC
<
T
>*>::
iterator
it
;
if
(
localBCs
.
size
()
>
0
)
{
...
...
AMDiS/src/BoxSmoother.h
View file @
745701c4
...
...
@@ -17,7 +17,7 @@ namespace AMDiS {
class
BoxSmoother
:
public
SmootherBase
<
Matrix
<
DOFMatrix
*>
,
Vector
<
SparseVector
<
double
>*>
,
Vector
<
::
std
::
set
<
DegreeOfFreedom
>*>
>
Vector
<
std
::
set
<
DegreeOfFreedom
>*>
>
{
public:
MEMORY_MANAGED
(
BoxSmoother
);
...
...
@@ -25,23 +25,23 @@ namespace AMDiS {
class
Creator
:
public
SmootherCreator
<
Matrix
<
DOFMatrix
*>
,
Vector
<
SparseVector
<
double
>*>
,
Vector
<
::
std
::
set
<
DegreeOfFreedom
>*>
>
Vector
<
std
::
set
<
DegreeOfFreedom
>*>
>
{
public:
MEMORY_MANAGED
(
Creator
);
SmootherBase
<
Matrix
<
DOFMatrix
*>
,
Vector
<
SparseVector
<
double
>*>
,
Vector
<
::
std
::
set
<
DegreeOfFreedom
>*>
>*
Vector
<
std
::
set
<
DegreeOfFreedom
>*>
>*
create
()
{
return
NEW
BoxSmoother
(
this
->
name
);
};
};
BoxSmoother
(
::
std
::
string
name
)
BoxSmoother
(
std
::
string
name
)
:
SmootherBase
<
Matrix
<
DOFMatrix
*>
,
Vector
<
SparseVector
<
double
>*>
,
Vector
<
::
std
::
set
<
DegreeOfFreedom
>*>
>
(
name
),
Vector
<
std
::
set
<
DegreeOfFreedom
>*>
>
(
name
),
boxMatrix_
(
NULL
),
boxSolution_
(
NULL
),
boxRHS_
(
NULL
),
...
...
@@ -64,7 +64,7 @@ namespace AMDiS {
Vector
<
SparseVector
<
double
>*>
*
solution
,
Vector
<
SparseVector
<
double
>*>
*
rhs
,