Commit ecf99819 authored by mattijs's avatar mattijs
Browse files

ENH: redistributeMeshPar : allow generic

parent c5822f57
...@@ -6,6 +6,7 @@ EXE_INC = \ ...@@ -6,6 +6,7 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lgenericPatchFields \
-ldecompositionMethods \ -ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
-lmeshTools \ -lmeshTools \
......
...@@ -87,12 +87,6 @@ autoPtr<fvMesh> createMesh ...@@ -87,12 +87,6 @@ autoPtr<fvMesh> createMesh
{ {
// Create dummy mesh. Only used on procs that don't have mesh. // Create dummy mesh. Only used on procs that don't have mesh.
// Switch timeStamp checking to one which does not do any
// parallel sync
regIOobject::fileCheckTypes oldCheckType =
regIOobject::fileModificationChecking;
regIOobject::fileModificationChecking = regIOobject::timeStamp;
{ {
IOdictionary fvSolution IOdictionary fvSolution
( (
...@@ -146,8 +140,6 @@ autoPtr<fvMesh> createMesh ...@@ -146,8 +140,6 @@ autoPtr<fvMesh> createMesh
Pout<< "Writing dummy mesh to " << dummyMesh.polyMesh::objectPath() Pout<< "Writing dummy mesh to " << dummyMesh.polyMesh::objectPath()
<< endl; << endl;
dummyMesh.write(); dummyMesh.write();
regIOobject::fileModificationChecking = oldCheckType;
} }
Pout<< "Reading mesh from " << io.objectPath() << endl; Pout<< "Reading mesh from " << io.objectPath() << endl;
...@@ -569,8 +561,13 @@ int main(int argc, char *argv[]) ...@@ -569,8 +561,13 @@ int main(int argc, char *argv[])
mkDir(args.path()); mkDir(args.path());
} }
// Switch timeStamp checking to one which does not do any
// parallel sync for same reason
regIOobject::fileModificationChecking = regIOobject::timeStamp;
# include "createTime.H" # include "createTime.H"
word regionName = polyMesh::defaultRegion; word regionName = polyMesh::defaultRegion;
fileName meshSubDir; fileName meshSubDir;
......
...@@ -57,8 +57,10 @@ runParallel() ...@@ -57,8 +57,10 @@ runParallel()
then then
echo "$APP_RUN already run on $PWD: remove log file to run" echo "$APP_RUN already run on $PWD: remove log file to run"
else else
echo "Running $APP_RUN in parallel on $PWD using $1 processes" nProcs=$1
( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_RUN 2>&1 ) shift
echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_RUN 2>&1 )
fi fi
} }
......
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