GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 09:32:38 +00:00
246 changed files with 4020 additions and 788 deletions

View File

@ -9,26 +9,27 @@ runApplication blockMesh
#cp system/decomposeParDict-2 system/decomposeParDict
#runApplication decomposePar
#- redistributePar to do decomposition
# redistributePar to do decomposition
runParallel redistributePar 2 -decompose
#- bit of renumbering and running
# Bit of renumbering and running
runParallel -log log.renumberMesh-CuthillMcKee renumberMesh 2 -overwrite
runParallel -log log.icoFoam-CuthillMcKee icoFoam 2
#- bit of bad renumbering and running
# Bit of bad renumbering and running
runParallel -log log.renumberMesh-parallel renumberMesh 2 -overwrite -dict system/renumberMeshDict-random
runParallel -log log.icoFoam-random icoFoam 2
#- pick up last result
# Pick up last result
cp system/controlDict-latestTime system/controlDict
#- redistribute to 5 processors
# Redistribute to 5 processors
runParallel -log log.redistributePar-5 redistributePar 5 -decomposeParDict system/decomposeParDict-5 -cellDist
#- run a bit more
# Run a bit more
runParallel -log log.icoFoam-5 icoFoam 5 -decomposeParDict system/decomposeParDict-5
#- reconstruct mesh and results
# Reconstruct mesh and results
runParallel -log log.redistributePar-1 redistributePar 5 -reconstruct -decomposeParDict system/decomposeParDict