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: Conflict resolution

Browse Source
This commit is contained in:
andy
2011-06-08 16:34:27 +01:00
parent 29c485361a 61d21f7622
commit 050bcfafb3
86 changed files with 1180 additions and 2710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
View File

@ -6,5 +6,6 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
rm -r constant/panelRegion/polyMesh
rm -rf constant/panelRegion/polyMesh
# ----------------------------------------------------------------- end-of-file

3
tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
View File

@ -1,4 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@ -30,3 +31,5 @@ decomposePar -force > log.decomposePar.log 2>&1
decomposePar -region panelRegion > log.decomposParPanelRegion.log 2>&1
runParallel `getApplication` 6
# ----------------------------------------------------------------- end-of-file