diff --git a/AMDiS/CMakeLists.txt b/AMDiS/CMakeLists.txt index 658b61fdf0d47953483bb3b5f100f274f9d565c1..93f88a9ad9ddbdecebe77dbb9653a36c9cb1a3ba 100644 --- a/AMDiS/CMakeLists.txt +++ b/AMDiS/CMakeLists.txt @@ -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 diff --git a/AMDiS/src/AMDiS.cc b/AMDiS/src/AMDiS.cc index 998ea2210ccb343986c2735d443dd02e7359852c..876a63b29ff7f960fd3b71b1ce3bd7a44485186d 100644 --- a/AMDiS/src/AMDiS.cc +++ b/AMDiS/src/AMDiS.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); diff --git a/AMDiS/src/Global.cc b/AMDiS/src/Global.cc index 55ad68b6e69b1cd0ed6ce9aea3f0c023476c055a..ff24e8d930c2e33bc0cf46b000940912731094a9 100644 --- a/AMDiS/src/Global.cc +++ b/AMDiS/src/Global.cc @@ -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); diff --git a/AMDiS/src/parallel/MeshDistributor.cc b/AMDiS/src/parallel/MeshDistributor.cc index 90569e02a62b0addce071bd9dadf5813dbc413e3..e77fba2058bbde3a2ed5c76787548e4ccd697b9c 100644 --- a/AMDiS/src/parallel/MeshDistributor.cc +++ b/AMDiS/src/parallel/MeshDistributor.cc @@ -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) { diff --git a/AMDiS/src/parallel/PetscMultigridPrecon.cc b/AMDiS/src/parallel/PetscMultigridPrecon.cc deleted file mode 100644 index 0b6ce2e5461e159b8ac64bc03ec3a7763f4dfcbf..0000000000000000000000000000000000000000 --- a/AMDiS/src/parallel/PetscMultigridPrecon.cc +++ /dev/null @@ -1,65 +0,0 @@ -// -// 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 - -} diff --git a/AMDiS/src/parallel/PetscMultigridPrecon.h b/AMDiS/src/parallel/PetscMultigridPrecon.h deleted file mode 100644 index 1f92c547b667a6b1d395a73c757fce9f4c58ce34..0000000000000000000000000000000000000000 --- a/AMDiS/src/parallel/PetscMultigridPrecon.h +++ /dev/null @@ -1,51 +0,0 @@ -// ============================================================================ -// == == -// == 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