diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C index 5b2ba58060..56dd95d341 100644 --- a/src/sampling/meshToMesh/meshToMeshTemplates.C +++ b/src/sampling/meshToMesh/meshToMeshTemplates.C @@ -771,7 +771,7 @@ void Foam::meshToMesh::mapAndOpTgtToSrc const CombineOp& cop ) const { - srcField = Type(Tero); + srcField = Type(Zero); AMI.interpolateToSource ( diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh index 43192922b4..27f296d69a 100755 --- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh @@ -8,14 +8,14 @@ rm -f log.* constant/polyMesh/*Level runApplication blockMesh -runApplication -log log.createPatch.cyclic \ +runApplication -s cyclic \ createPatch -dict system/createPatchDict.cyclic -overwrite runApplication snappyHexMesh -overwrite rm -rf 0 -runApplication -log log.createPatch.ami \ +runApplication -s ami \ createPatch -dict system/createPatchDict.ami -overwrite runApplication transformPoints -scale '(0.01 0.01 0.01)' diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel index b3628006eb..ba2fd3c6bb 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel @@ -9,17 +9,14 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=$(getApplication) -# Get number of processors to run on -nProcs=4 #$(getNumberOfProcessors) - # decompose -runApplication -log log.decomposePar.cabin decomposePar -region cabin -runApplication -log log.decomposePar.ice decomposePar -region ice -runApplication -log log.decomposePar.exterior decomposePar -region exterior +runApplication -s cabin decomposePar -region cabin +runApplication -s ice decomposePar -region ice +runApplication -s exterior decomposePar -region exterior -runParallel $application $nProcs +runParallel $application -runApplication -log log.reconstructPar.cabin reconstructPar -region cabin -runApplication -log log.reconstructPar.ice reconstructPar -region ice -runApplication -log log.reconstructPar.exterior reconstructPar -region exterior +runApplication -s cabin reconstructPar -region cabin +runApplication -s ice reconstructPar -region ice +runApplication -s exterior reconstructPar -region exterior diff --git a/tutorials/mesh/parallel/cavity/Allrun b/tutorials/mesh/parallel/cavity/Allrun index 22412ea287..75a608df01 100755 --- a/tutorials/mesh/parallel/cavity/Allrun +++ b/tutorials/mesh/parallel/cavity/Allrun @@ -10,27 +10,27 @@ runApplication blockMesh #runApplication decomposePar # redistributePar to do decomposition -runParallel redistributePar 2 -decompose +runParallel redistributePar -decompose # Bit of renumbering and running -runParallel -log log.renumberMesh-CuthillMcKee renumberMesh 2 -overwrite -runParallel -log log.icoFoam-CuthillMcKee icoFoam 2 +runParallel -s CuthillMcKee renumberMesh -overwrite +runParallel -s CuthillMcKee icoFoam # 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 +runParallel -s random renumberMesh -overwrite -dict system/renumberMeshDict-random +runParallel -s random icoFoam # Pick up last result cp system/controlDict-latestTime system/controlDict # Redistribute to 5 processors -runParallel -log log.redistributePar-5 redistributePar 5 -decomposeParDict system/decomposeParDict-5 -cellDist +runParallel -s 5 redistributePar -np 5 -decomposeParDict system/decomposeParDict-5 -cellDist # Run a bit more -runParallel -log log.icoFoam-5 icoFoam 5 -decomposeParDict system/decomposeParDict-5 +runParallel -s 5 icoFoam -np 5 -decomposeParDict system/decomposeParDict-5 # Reconstruct mesh and results -runParallel -log log.redistributePar-1 redistributePar 5 -reconstruct -decomposeParDict system/decomposeParDict +runParallel -s 1 redistributePar -np 5 -reconstruct -decomposeParDict system/decomposeParDict -# ----------------------------------------------------------------- end-of-file +# ----------------------------------------------------------------------------- diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun index 8367f6c36f..9dabedb155 100755 --- a/tutorials/mesh/parallel/filter/Allrun +++ b/tutorials/mesh/parallel/filter/Allrun @@ -4,30 +4,30 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application=`getApplication` +application=$(getApplication) -# create mesh +# Create mesh runApplication blockMesh -# copy 0.org to 0 +# Copy 0.org to 0 cp -r 0.org 0 -# create sets +# Create sets runApplication topoSet -# create baffles and fields +# Create baffles and fields runApplication createBaffles -overwrite runApplication $application -#- redistributePar to do decomposition -runParallel redistributePar 3 -decompose -cellDist +#- RedistributePar to do decomposition +runParallel redistributePar -decompose -cellDist #- Continue running for a bit more -runParallel -log log.reactingParcelFoam-par $application 3 +runParallel -s parallel $application #- Reconstruct all times -runParallel -log log.redistributePar-1 redistributePar 3 -reconstruct +runParallel -s 1 redistributePar -reconstruct # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun b/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun index e476b947cc..776643da4d 100755 --- a/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun +++ b/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun @@ -6,16 +6,15 @@ cd ${0%/*} || exit 1 # Run from this directory ./Allrun.pre -#runApplication `getApplication` -runParallel `getApplication` 5 +runParallel $(getApplication) unset FOAM_SIGFPE -runParallel -log log.reconstruct redistributePar 5 -reconstruct +runParallel -s reconstruct redistributePar -reconstruct # A bit more testing of decomposing \cp system/controlDict_nextWrite system/controlDict -runParallel -log log.decompose redistributePar 5 -decompose -latestTime -runParallel -log log.interDyMFoam_restart `getApplication` 5 +runParallel -s decompose redistributePar -decompose -latestTime +runParallel -s restart $(getApplication) # ----------------------------------------------------------------- end-of-file