zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolve conflict

Browse Source
This commit is contained in:
Andrew Heather
2016-06-10 16:05:48 +01:00
parent 1fd05b2d1b c91712fbc3
commit 7572c99c79
14 changed files with 116 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
View File

@ -40,7 +40,7 @@ boundaryField
type activePressureForceBaffleVelocity;
value uniform (0 0 0);
cyclicPatch baffleCyclic_half0;
orientation 1;
opening 1;
openingTime 0.01;
maxOpenFractionDelta 0.1;
openFraction 0;

8
tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
View File

@ -11,11 +11,11 @@ cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
mkdir 0
runApplication blockMesh
cp system/decomposeParDict.hierarchical system/decomposeParDict
runApplication decomposePar
# cp system/decomposeParDict.hierarchical system/decomposeParDict
runApplication decomposePar -decomposeParDict system/decomposeParDict.hierarchical
cp system/decomposeParDict.ptscotch system/decomposeParDict
runParallel snappyHexMesh -overwrite -parallel
# cp system/decomposeParDict.ptscotch system/decomposeParDict
runParallel snappyHexMesh -decomposeParDict system/decomposeParDict.ptscotch -overwrite -parallel
find . -type f -iname "*level*" -exec rm {} \;