Commit 7fb827a1 authored by Franjo's avatar Franjo
Browse files

Cleanup of Infos and Pouts

parent 7e74654a
......@@ -274,15 +274,10 @@ Foam::Istream& Foam::operator>>
template<class T, Foam::label Offset>
void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
{
if( !is.good() )
Pout << "Drekec" << endl;
is.fatalCheck("appendFromStream(Istream& is)");
token firstToken(is);
Pout << "Read "<< firstToken.info() << endl;
is.fatalCheck
(
"appendFromStream(Istream& is) : reading first token"
......
......@@ -136,8 +136,6 @@ void meshOctreeCreator::refineBoundary()
reduce(useNLayers, maxOp<label>());
if( useNLayers )
{
returnReduce(1, sumOp<label>());
Info << "Marking additional layers" << endl;
nMarked +=
octreeModifier.markAdditionalLayers
(
......@@ -145,9 +143,6 @@ void meshOctreeCreator::refineBoundary()
nLayers,
targetLevel
);
returnReduce(1, sumOp<label>());
Info << "Finished marking additional layers" << endl;
}
//- refine boxes
......@@ -161,12 +156,9 @@ void meshOctreeCreator::refineBoundary()
if( Pstream::parRun() )
{
reduce(nMarked, sumOp<label>());
Info << "nMarked " << nMarked << endl;
if( nMarked )
{
returnReduce(1, sumOp<label>());
Info << "1.Here" << endl;
octreeModifier.distributeLeavesToProcessors();
# ifdef OCTREETiming
......@@ -175,13 +167,8 @@ void meshOctreeCreator::refineBoundary()
<< (distTime-refTime) << endl;
# endif
returnReduce(2, sumOp<label>());
Info << "Starting load distribution" << endl;
loadDistribution();
returnReduce(1, sumOp<label>());
Info << "Finished load distribution" << endl;
# ifdef OCTREETiming
Info << "Time for load distribution "
<< (omp_get_wtime()-distTime) << endl;
......
......@@ -235,7 +235,7 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors()
}
}
//# ifdef OCTREE_DEBUG
# ifdef OCTREE_DEBUG
for(label i=0;i<Pstream::nProcs();++i)
{
if( i == Pstream::myProcNo() )
......@@ -250,16 +250,16 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors()
returnReduce(i, sumOp<label>());
}
//# endif
# endif
//- exchange data with other processors
LongList<meshOctreeCubeBasic> receivedCoordinates;
help::exchangeMap(toProcs, receivedCoordinates, Pstream::blocking);
//# ifdef OCTREE_DEBUG
# ifdef OCTREE_DEBUG
Pout << "Received " << receivedCoordinates.size()
<< " from other procs" << endl;
//# endif
# endif
//- cubes which share a common, face, edge or vertex are added into
//- the current processor's tree
......
......@@ -148,7 +148,6 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
Pout << "Upper diag communication " << endl;
dataToReceive.appendFromStream(fromOtherProc);
}
......@@ -174,7 +173,6 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
Pout << "Lower diag communication " << endl;
dataToReceive.appendFromStream(fromOtherProc);
}
......
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