Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Backofen, Rainer
amdis
Commits
8b79fef4
Commit
8b79fef4
authored
Oct 27, 2012
by
Thomas Witkowski
Browse files
Just a change of class name to make consistant with my diss.
parent
ace7781a
Changes
5
Hide whitespace changes
Inline
Side-by-side
AMDiS/CMakeLists.txt
View file @
8b79fef4
...
...
@@ -256,7 +256,7 @@ if(ENABLE_PARALLEL_DOMAIN)
list
(
APPEND AMDIS_INCLUDE_DIRS
${
PETSC_DIR
}
/include
${
PETSC_DIR
}
/
${
PETSC_ARCH
}
/include
)
list
(
APPEND PARALLEL_DOMAIN_AMDIS_SRC
${
SOURCE_DIR
}
/parallel/BddcMlSolver.cc
${
SOURCE_DIR
}
/parallel/ParallelCoarseSpace
MatVec
.cc
${
SOURCE_DIR
}
/parallel/ParallelCoarseSpace
Solver
.cc
${
SOURCE_DIR
}
/parallel/PetscHelper.cc
${
SOURCE_DIR
}
/parallel/PetscSolver.cc
${
SOURCE_DIR
}
/parallel/PetscProblemStat.cc
...
...
AMDiS/src/parallel/ParallelCoarseSpace
MatVec
.cc
→
AMDiS/src/parallel/ParallelCoarseSpace
Solver
.cc
View file @
8b79fef4
...
...
@@ -10,7 +10,7 @@
// See also license.opensource.txt in the distribution.
#include
"parallel/ParallelCoarseSpace
MatVec
.h"
#include
"parallel/ParallelCoarseSpace
Solver
.h"
#include
"parallel/ParallelDofMapping.h"
#include
"parallel/MatrixNnzStructure.h"
...
...
@@ -18,7 +18,7 @@ namespace AMDiS {
using
namespace
std
;
ParallelCoarseSpace
MatVec
::
ParallelCoarseSpace
MatVec
()
ParallelCoarseSpace
Solver
::
ParallelCoarseSpace
Solver
()
:
interiorMap
(
NULL
),
lastMeshNnz
(
-
1
),
alwaysCreateNnzStructure
(
false
),
...
...
@@ -32,10 +32,10 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
setCoarseSpaceDofMapping
(
ParallelDofMapping
*
coarseDofs
,
void
ParallelCoarseSpace
Solver
::
setCoarseSpaceDofMapping
(
ParallelDofMapping
*
coarseDofs
,
int
component
)
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::setCoarseSpaceDofMapping()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::setCoarseSpaceDofMapping()"
);
TEST_EXIT_DBG
(
coarseDofs
)(
"Should not happen!
\n
"
);
...
...
@@ -59,9 +59,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
prepare
()
void
ParallelCoarseSpace
Solver
::
prepare
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
:prepare()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
:prepare()"
);
TEST_EXIT
(
uniqueCoarseMap
.
size
()
<=
2
)
(
"Not yet implemented for more than two coarse spaces!
\n
"
);
...
...
@@ -94,9 +94,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
createMatVec
(
Matrix
<
DOFMatrix
*>&
seqMat
)
void
ParallelCoarseSpace
Solver
::
createMatVec
(
Matrix
<
DOFMatrix
*>&
seqMat
)
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::createMatVec()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::createMatVec()"
);
// === Prepare coarse space information and generate the correct number ===
// === of empty PETSc matrix and vector objects. ===
...
...
@@ -208,9 +208,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
matDestroy
()
void
ParallelCoarseSpace
Solver
::
matDestroy
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::matDestroy()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::matDestroy()"
);
int
nMatrix
=
mat
.
size
();
for
(
int
i
=
0
;
i
<
nMatrix
;
i
++
)
...
...
@@ -219,9 +219,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
vecDestroy
()
void
ParallelCoarseSpace
Solver
::
vecDestroy
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::vecDestroy()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::vecDestroy()"
);
int
nVec
=
vecSol
.
size
();
for
(
int
i
=
0
;
i
<
nVec
;
i
++
)
{
...
...
@@ -231,9 +231,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
matAssembly
()
void
ParallelCoarseSpace
Solver
::
matAssembly
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::matAssembly()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::matAssembly()"
);
int
nMatrix
=
mat
.
size
();
for
(
int
i
=
0
;
i
<
nMatrix
;
i
++
)
{
...
...
@@ -245,9 +245,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
vecRhsAssembly
()
void
ParallelCoarseSpace
Solver
::
vecRhsAssembly
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::vecRhsAssembly()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::vecRhsAssembly()"
);
int
nVec
=
vecRhs
.
size
();
for
(
int
i
=
0
;
i
<
nVec
;
i
++
)
{
...
...
@@ -257,9 +257,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
vecSolAssembly
()
void
ParallelCoarseSpace
Solver
::
vecSolAssembly
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::vecSolAssembly()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::vecSolAssembly()"
);
int
nVec
=
vecRhs
.
size
();
for
(
int
i
=
0
;
i
<
nVec
;
i
++
)
{
...
...
@@ -269,9 +269,9 @@ namespace AMDiS {
}
bool
ParallelCoarseSpace
MatVec
::
checkMeshChange
()
bool
ParallelCoarseSpace
Solver
::
checkMeshChange
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::checkMeshChange()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::checkMeshChange()"
);
int
recvAllValues
=
0
;
int
sendValue
=
...
...
@@ -287,9 +287,9 @@ namespace AMDiS {
}
void
ParallelCoarseSpace
MatVec
::
updateSubdomainData
()
void
ParallelCoarseSpace
Solver
::
updateSubdomainData
()
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::updateSubdomainData()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::updateSubdomainData()"
);
if
(
mpiCommLocal
.
Get_size
()
==
1
)
{
rStartInterior
=
0
;
...
...
AMDiS/src/parallel/ParallelCoarseSpace
MatVec
.h
→
AMDiS/src/parallel/ParallelCoarseSpace
Solver
.h
View file @
8b79fef4
...
...
@@ -18,10 +18,10 @@
/** \file ParallelCoarseSpace
MatVec
.h */
/** \file ParallelCoarseSpace
Solver
.h */
#ifndef AMDIS_PARALLEL_COARSE_SPACE_
MAT_
VE
C
_H
#define AMDIS_PARALLEL_COARSE_SPACE_
MAT_
VE
C
_H
#ifndef AMDIS_PARALLEL_COARSE_SPACE_
SOL
VE
R
_H
#define AMDIS_PARALLEL_COARSE_SPACE_
SOL
VE
R
_H
#include
<mpi.h>
#include
<vector>
...
...
@@ -48,10 +48,10 @@ namespace AMDiS {
* - This class also manages the creation of the corresponding non zero
* structure of the matrices.
*/
class
ParallelCoarseSpace
MatVec
{
class
ParallelCoarseSpace
Solver
{
public:
/// Constructor
ParallelCoarseSpace
MatVec
();
ParallelCoarseSpace
Solver
();
/// Set parallel DOF mapping for the interior DOFs.
void
setDofMapping
(
ParallelDofMapping
*
interiorDofs
)
...
...
@@ -193,7 +193,7 @@ namespace AMDiS {
/// Get the solution vector of some coarse space.
inline
Vec
&
getVecSolCoarse
(
int
coarseSpace
=
0
)
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::getVecSolCoarse()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::getVecSolCoarse()"
);
TEST_EXIT_DBG
(
coarseSpace
+
1
<
vecSol
.
size
())
(
"Wrong component %d, vecSol has only %d!
\n
"
,
coarseSpace
+
1
,
vecSol
.
size
());
...
...
@@ -222,7 +222,7 @@ namespace AMDiS {
inline
bool
isCoarseSpace
(
int
component
,
DegreeOfFreedom
dof
)
{
FUNCNAME
(
"ParallelCoarseSpace
MatVec
::isCoarseSpace()"
);
FUNCNAME
(
"ParallelCoarseSpace
Solver
::isCoarseSpace()"
);
if
(
coarseSpaceMap
.
empty
())
return
false
;
...
...
AMDiS/src/parallel/PetscSolver.cc
View file @
8b79fef4
...
...
@@ -21,7 +21,7 @@ namespace AMDiS {
using
namespace
std
;
PetscSolver
::
PetscSolver
(
string
name
)
:
ParallelCoarseSpace
MatVec
(),
:
ParallelCoarseSpace
Solver
(),
initFileStr
(
name
),
dofMap
(
FESPACE_WISE
,
true
),
dofMapSd
(
FESPACE_WISE
,
true
),
...
...
AMDiS/src/parallel/PetscSolver.h
View file @
8b79fef4
...
...
@@ -36,7 +36,7 @@
#include
"Initfile.h"
#include
"DOFMatrix.h"
#include
"parallel/MeshDistributor.h"
#include
"parallel/ParallelCoarseSpace
MatVec
.h"
#include
"parallel/ParallelCoarseSpace
Solver
.h"
namespace
AMDiS
{
...
...
@@ -44,10 +44,10 @@ namespace AMDiS {
/**
* Create an abstract interface to an arbitrary PETSc solver. This class is
* based on \ref ParallelCoarseSpace
MatVec
to support for solvers which make
* based on \ref ParallelCoarseSpace
Solver
to support for solvers which make
* use of a coarse grid problem.
*/
class
PetscSolver
:
public
ParallelCoarseSpace
MatVec
class
PetscSolver
:
public
ParallelCoarseSpace
Solver
{
public:
PetscSolver
(
string
name
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment