diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C index 81562f6998..c840c89e1a 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C @@ -257,10 +257,13 @@ Foam::label Foam::UPstream::allocateCommunicator treeCommunication_.append(List(0)); } - Pout<< "Communicators : Allocating communicator " << index << endl - << " parent : " << parentIndex << endl - << " procs : " << subRanks << endl - << endl; + if (debug) + { + Pout<< "Communicators : Allocating communicator " << index << endl + << " parent : " << parentIndex << endl + << " procs : " << subRanks << endl + << endl; + } // Initialise; overwritten by allocatePstreamCommunicator myProcNo_[index] = 0; @@ -305,10 +308,13 @@ void Foam::UPstream::freeCommunicator const bool doPstream ) { - Pout<< "Communicators : Freeing communicator " << communicator << endl - << " parent : " << parentCommunicator_[communicator] << endl - << " myProcNo : " << myProcNo_[communicator] << endl - << endl; + if (debug) + { + Pout<< "Communicators : Freeing communicator " << communicator << endl + << " parent : " << parentCommunicator_[communicator] << endl + << " myProcNo : " << myProcNo_[communicator] << endl + << endl; + } if (doPstream && parRun()) { @@ -326,9 +332,6 @@ void Foam::UPstream::freeCommunicator void Foam::UPstream::freeCommunicators(const bool doPstream) { - Pout<< "Communicators : Freeing all communicators" << endl - << endl; - forAll(myProcNo_, communicator) { if (myProcNo_[communicator] != -1) diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H index f23ee07bfc..dc4d142c26 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H @@ -384,12 +384,6 @@ public: static void freeTag(const word&, const int tag); -// //- Return (index of) request to use in calls to nonblocking ops -// static label allocateRequest(const word&); -// -// //- Free (index of) request -// static void freeRequest(const word&, const label request); - //- Is this a parallel run? static bool& parRun() @@ -426,13 +420,6 @@ public: return parentCommunicator_(communicator); } -// //- Process IDs -// static const List& procIDs() -// { -// return procIDs_; -// } - - //- Process ID of given process index static List& procID(int communicator) { diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C index 2fb1cbe39b..c47c0aeee6 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C @@ -91,19 +91,12 @@ Foam::GAMGSolver::GAMGSolver { if (agglomeration_.hasMeshLevel(fineLevelIndex)) { - Pout<< "Level:" << fineLevelIndex - << " agglomerating matrix." << endl; - if ( (fineLevelIndex+1) < agglomeration_.size() - //&& agglomeration_.procBoundaryMap_.set(fineLevelIndex+1) && agglomeration_.hasProcMesh(fineLevelIndex+1) ) { - Pout<< "Level:" << fineLevelIndex - << " agglomerating onto dummy coarse mesh." << endl; - // Construct matrix without referencing the coarse mesh so // construct a dummy mesh instead. This will get overwritten // by the call to procAgglomerateMatrix so is only to get @@ -174,36 +167,21 @@ Foam::GAMGSolver::GAMGSolver const List& procIDs = agglomeration_.agglomProcIDs(fineLevelIndex+1); - Pout<< "Level:" << fineLevelIndex - << " agglomerating onto procIDs:" << procIDs << endl; - procAgglomerateMatrix ( procAgglomMap, procIDs, fineLevelIndex ); - - Pout<< "Level:" << fineLevelIndex - << " DONE agglomerating onto procIDs:" << procIDs - << endl; } else { - Pout<< "Level:" << fineLevelIndex - << " agglomerating onto coarse mesh at level " - << fineLevelIndex + 1 << endl; - agglomerateMatrix ( fineLevelIndex, agglomeration_.meshLevel(fineLevelIndex + 1), agglomeration_.interfaceLevel(fineLevelIndex + 1) ); - Pout<< "Level:" << fineLevelIndex - << " DONE agglomerating onto coarse mesh at level " - << fineLevelIndex + 1 << endl; - } } else @@ -273,9 +251,6 @@ Foam::GAMGSolver::GAMGSolver { const label coarsestLevel = matrixLevels_.size() - 1; - Pout<< "GAMGSolver :" - << " coarsestLevel:" << coarsestLevel << endl; - if (matrixLevels_.set(coarsestLevel)) { const lduMesh& coarsestMesh = @@ -285,9 +260,6 @@ Foam::GAMGSolver::GAMGSolver label oldWarn = UPstream::warnComm; UPstream::warnComm = coarseComm; - Pout<< "Solve direct on coasestmesh (level=" << coarsestLevel - << ") using communicator " << coarseComm << endl; - coarsestLUMatrixPtr_.set ( new LUscalarMatrix @@ -301,119 +273,6 @@ Foam::GAMGSolver::GAMGSolver UPstream::warnComm = oldWarn; } } - //else if (agglomeration_.processorAgglomerate()) - //{ - //// Pick a level to processor agglomerate - //label agglomLevel = matrixLevels_.size() - 1;//1; - // - // - //// Get mesh and matrix at this level - //const lduMatrix& levelMatrix = matrixLevels_[agglomLevel]; - //const lduMesh& levelMesh = levelMatrix.mesh(); - // - // - //label levelComm = levelMesh.comm(); - //label oldWarn = UPstream::warnComm; - //UPstream::warnComm = levelComm; - // - //Pout<< "Solve generic on mesh (level=" << agglomLevel - // << ") using communicator " << levelComm << endl; - // - //// Processor restriction map: per processor the coarse processor - //labelList procAgglomMap(UPstream::nProcs(levelComm)); - //// Master processor - //labelList masterProcs; - //// Local processors that agglomerate. agglomProcIDs[0] is in - //// masterProc. - //List agglomProcIDs; - // - //{ - // procAgglomMap[0] = 0; - // procAgglomMap[1] = 0; - // procAgglomMap[2] = 1; - // procAgglomMap[3] = 1; - // - // // Determine the master processors - // Map