Liebe Gitlab-Nutzer, lieber Gitlab-Nutzer,
es ist nun möglich sich mittels des ZIH-Logins/LDAP an unserem Dienst anzumelden. Die Konten der externen Nutzer:innen sind ü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. The accounts of external users can be accessed via the "Standard" tab.
The administrators

Commit 58a86bc4 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Fixed for using petsc-dev, have to remove the petsc multigrid class which is...

Fixed for using petsc-dev, have to remove the petsc multigrid class which is far away from being usefull.
parent a67a72e0
......@@ -258,7 +258,6 @@ if(ENABLE_PARALLEL_DOMAIN)
${SOURCE_DIR}/parallel/BddcMlSolver.cc
${SOURCE_DIR}/parallel/ParallelCoarseSpaceMatVec.cc
${SOURCE_DIR}/parallel/PetscHelper.cc
${SOURCE_DIR}/parallel/PetscMultigridPrecon.cc
${SOURCE_DIR}/parallel/PetscSolver.cc
${SOURCE_DIR}/parallel/PetscProblemStat.cc
${SOURCE_DIR}/parallel/PetscSolverFeti.cc
......
......@@ -37,6 +37,8 @@ namespace AMDiS {
mpi::startRand();
#endif
Parameters::get("parallel->log main rank", Msg::outputMainRank);
#ifdef HAVE_ZOLTAN
float zoltanVersion = 0.0;
Zoltan_Initialize(argc, argv, &zoltanVersion);
......
......@@ -26,7 +26,7 @@ namespace AMDiS {
const char *funcName = NULL;
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
bool Msg::outputMainRank = false;
bool Msg::outputMainRank = true;
#endif
ThreadPrivate<const char *> Msg::oldFuncName(NULL);
......
......@@ -101,7 +101,6 @@ namespace AMDiS {
Parameters::get(name + "->repartitioning", repartitioningAllowed);
Parameters::get(name + "->debug output dir", debugOutputDir);
Parameters::get(name + "->repartition ith change", repartitionIthChange);
Parameters::get(name + "->log main rank", Msg::outputMainRank);
Parameters::get(name + "->mesh adaptivity", meshAdaptivity);
string partStr = "parmetis";
......@@ -852,8 +851,6 @@ namespace AMDiS {
levelData.init(neighbours);
MSG("INIT MESH LEVEL %d\n", levelData.getLevelNumber());
bool multiLevelTest = false;
Parameters::get("parallel->multi level test", multiLevelTest);
if (multiLevelTest) {
......
//
// Software License for AMDiS
//
// Copyright (c) 2010 Dresden University of Technology
// All rights reserved.
// Authors: Simon Vey, Thomas Witkowski et al.
//
// This file is part of AMDiS
//
// See also license.opensource.txt in the distribution.
#include "parallel/PetscMultigridPrecon.h"
namespace AMDiS {
#ifdef HAVE_PETSC_DEV
using namespace std;
PetscErrorCode multigridComputeRhs(DM da, Vec x, Vec b)
{
}
PetscErrorCode multigridComputeMatrix(DM da, Vec x,
Mat J, Mat jac, MatStructure *str)
{
}
PetscMultigridPrecon::PetscMultigridPrecon()
{}
void PetscMultigridPrecon::init(KSP &ksp)
{
int globalDofX = 100;
int globalDofY = 100;
int nProc = sqrt(MPI::COMM_WORLD.Get_rank());
int nDofsPerNode = 1000;
DMDACreate2d(PETSC_COMM_WORLD,
DMDA_BOUNDARY_NONE, DMDA_BOUNDARY_NONE,
DMDA_STENCIL_STAR,
globalDofX, globalDofY,
nProc, nProc,
nDofsPerNode,
1,
PETSC_NULL, PETSC_NULL, &dmObj);
DMSetFunction(dmObj, multigridComputeRhs);
DMSetJacobian(dmObj, multigridComputeMatrix);
KSPSetDM(ksp, dm);
}
void PetscMultigridPrecon::cleanUp()
{
DMDestroy(dmObj);
}
#endif
}
// ============================================================================
// == ==
// == AMDiS - Adaptive multidimensional simulations ==
// == ==
// == http://www.amdis-fem.org ==
// == ==
// ============================================================================
//
// Software License for AMDiS
//
// Copyright (c) 2010 Dresden University of Technology
// All rights reserved.
// Authors: Simon Vey, Thomas Witkowski et al.
//
// This file is part of AMDiS
//
// See also license.opensource.txt in the distribution.
/** \file PetscMultigridPrecon.h */
#ifndef AMDIS_PETSC_MULTIGRID_PRECON_H
#define AMDIS_PETSC_MULTIGRID_PRECON_H
#include <petsc.h>
namespace AMDiS {
using namespace std;
#ifdef HAVE_PETSC_DEV
class PetscMultigridPrecon
{
public:
PetscMultigridPrecon();
void init(KSP &ksp);
void cleanUp();
protected:
DM dmObj;
};
#endif
} // namespace AMDiS
#endif
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