Liebe Gitlab-Nutzer, lieber Gitlab-Nutzer, es ist nun möglich sich mittels des ZIH-Logins/LDAP an unserem Dienst anzumelden. Ein Anmelden über dieses erzeugt ein neues Konto. Das alte Konto ist über den Reiter "Standard" erreichbar. Die Administratoren

Dear Gitlab user, it is now possible to log in to our service using the ZIH login/LDAP. Logging in via this will create a new account. The old account can be accessed via the "Standard" tab. The administrators

Commit 8b79fef4 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Just a change of class name to make consistant with my diss.

parent ace7781a
......@@ -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/ParallelCoarseSpaceMatVec.cc
${SOURCE_DIR}/parallel/ParallelCoarseSpaceSolver.cc
${SOURCE_DIR}/parallel/PetscHelper.cc
${SOURCE_DIR}/parallel/PetscSolver.cc
${SOURCE_DIR}/parallel/PetscProblemStat.cc
......
......@@ -10,7 +10,7 @@
// See also license.opensource.txt in the distribution.
#include "parallel/ParallelCoarseSpaceMatVec.h"
#include "parallel/ParallelCoarseSpaceSolver.h"
#include "parallel/ParallelDofMapping.h"
#include "parallel/MatrixNnzStructure.h"
......@@ -18,7 +18,7 @@ namespace AMDiS {
using namespace std;
ParallelCoarseSpaceMatVec::ParallelCoarseSpaceMatVec()
ParallelCoarseSpaceSolver::ParallelCoarseSpaceSolver()
: interiorMap(NULL),
lastMeshNnz(-1),
alwaysCreateNnzStructure(false),
......@@ -32,10 +32,10 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::setCoarseSpaceDofMapping(ParallelDofMapping *coarseDofs,
void ParallelCoarseSpaceSolver::setCoarseSpaceDofMapping(ParallelDofMapping *coarseDofs,
int component)
{
FUNCNAME("ParallelCoarseSpaceMatVec::setCoarseSpaceDofMapping()");
FUNCNAME("ParallelCoarseSpaceSolver::setCoarseSpaceDofMapping()");
TEST_EXIT_DBG(coarseDofs)("Should not happen!\n");
......@@ -59,9 +59,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::prepare()
void ParallelCoarseSpaceSolver::prepare()
{
FUNCNAME("ParallelCoarseSpaceMatVec:prepare()");
FUNCNAME("ParallelCoarseSpaceSolver:prepare()");
TEST_EXIT(uniqueCoarseMap.size() <= 2)
("Not yet implemented for more than two coarse spaces!\n");
......@@ -94,9 +94,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::createMatVec(Matrix<DOFMatrix*>& seqMat)
void ParallelCoarseSpaceSolver::createMatVec(Matrix<DOFMatrix*>& seqMat)
{
FUNCNAME("ParallelCoarseSpaceMatVec::createMatVec()");
FUNCNAME("ParallelCoarseSpaceSolver::createMatVec()");
// === Prepare coarse space information and generate the correct number ===
// === of empty PETSc matrix and vector objects. ===
......@@ -208,9 +208,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::matDestroy()
void ParallelCoarseSpaceSolver::matDestroy()
{
FUNCNAME("ParallelCoarseSpaceMatVec::matDestroy()");
FUNCNAME("ParallelCoarseSpaceSolver::matDestroy()");
int nMatrix = mat.size();
for (int i = 0; i < nMatrix; i++)
......@@ -219,9 +219,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::vecDestroy()
void ParallelCoarseSpaceSolver::vecDestroy()
{
FUNCNAME("ParallelCoarseSpaceMatVec::vecDestroy()");
FUNCNAME("ParallelCoarseSpaceSolver::vecDestroy()");
int nVec = vecSol.size();
for (int i = 0; i < nVec; i++) {
......@@ -231,9 +231,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::matAssembly()
void ParallelCoarseSpaceSolver::matAssembly()
{
FUNCNAME("ParallelCoarseSpaceMatVec::matAssembly()");
FUNCNAME("ParallelCoarseSpaceSolver::matAssembly()");
int nMatrix = mat.size();
for (int i = 0; i < nMatrix; i++) {
......@@ -245,9 +245,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::vecRhsAssembly()
void ParallelCoarseSpaceSolver::vecRhsAssembly()
{
FUNCNAME("ParallelCoarseSpaceMatVec::vecRhsAssembly()");
FUNCNAME("ParallelCoarseSpaceSolver::vecRhsAssembly()");
int nVec = vecRhs.size();
for (int i = 0; i < nVec; i++) {
......@@ -257,9 +257,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::vecSolAssembly()
void ParallelCoarseSpaceSolver::vecSolAssembly()
{
FUNCNAME("ParallelCoarseSpaceMatVec::vecSolAssembly()");
FUNCNAME("ParallelCoarseSpaceSolver::vecSolAssembly()");
int nVec = vecRhs.size();
for (int i = 0; i < nVec; i++) {
......@@ -269,9 +269,9 @@ namespace AMDiS {
}
bool ParallelCoarseSpaceMatVec::checkMeshChange()
bool ParallelCoarseSpaceSolver::checkMeshChange()
{
FUNCNAME("ParallelCoarseSpaceMatVec::checkMeshChange()");
FUNCNAME("ParallelCoarseSpaceSolver::checkMeshChange()");
int recvAllValues = 0;
int sendValue =
......@@ -287,9 +287,9 @@ namespace AMDiS {
}
void ParallelCoarseSpaceMatVec::updateSubdomainData()
void ParallelCoarseSpaceSolver::updateSubdomainData()
{
FUNCNAME("ParallelCoarseSpaceMatVec::updateSubdomainData()");
FUNCNAME("ParallelCoarseSpaceSolver::updateSubdomainData()");
if (mpiCommLocal.Get_size() == 1) {
rStartInterior = 0;
......
......@@ -18,10 +18,10 @@
/** \file ParallelCoarseSpaceMatVec.h */
/** \file ParallelCoarseSpaceSolver.h */
#ifndef AMDIS_PARALLEL_COARSE_SPACE_MAT_VEC_H
#define AMDIS_PARALLEL_COARSE_SPACE_MAT_VEC_H
#ifndef AMDIS_PARALLEL_COARSE_SPACE_SOLVER_H
#define AMDIS_PARALLEL_COARSE_SPACE_SOLVER_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 ParallelCoarseSpaceMatVec {
class ParallelCoarseSpaceSolver {
public:
/// Constructor
ParallelCoarseSpaceMatVec();
ParallelCoarseSpaceSolver();
/// 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("ParallelCoarseSpaceMatVec::getVecSolCoarse()");
FUNCNAME("ParallelCoarseSpaceSolver::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("ParallelCoarseSpaceMatVec::isCoarseSpace()");
FUNCNAME("ParallelCoarseSpaceSolver::isCoarseSpace()");
if (coarseSpaceMap.empty())
return false;
......
......@@ -21,7 +21,7 @@ namespace AMDiS {
using namespace std;
PetscSolver::PetscSolver(string name)
: ParallelCoarseSpaceMatVec(),
: ParallelCoarseSpaceSolver(),
initFileStr(name),
dofMap(FESPACE_WISE, true),
dofMapSd(FESPACE_WISE, true),
......
......@@ -36,7 +36,7 @@
#include "Initfile.h"
#include "DOFMatrix.h"
#include "parallel/MeshDistributor.h"
#include "parallel/ParallelCoarseSpaceMatVec.h"
#include "parallel/ParallelCoarseSpaceSolver.h"
namespace AMDiS {
......@@ -44,10 +44,10 @@ namespace AMDiS {
/**
* Create an abstract interface to an arbitrary PETSc solver. This class is
* based on \ref ParallelCoarseSpaceMatVec to support for solvers which make
* based on \ref ParallelCoarseSpaceSolver to support for solvers which make
* use of a coarse grid problem.
*/
class PetscSolver : public ParallelCoarseSpaceMatVec
class PetscSolver : public ParallelCoarseSpaceSolver
{
public:
PetscSolver(string name);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment