GIT: conflict resolution

This commit is contained in:
andy
2012-09-26 12:32:07 +01:00
27 changed files with 1646 additions and 1387 deletions

View File

@ -31,27 +31,18 @@ done
#runApplication `getApplication`
# Decompose
for i in bottomAir topAir heater leftSolid rightSolid
do
decomposePar -region $i > log.decomposePar.$i 2>&1
done
runApplication decomposePar -allRegions
# Run
runParallel `getApplication` 4
# Reconstruct
for i in bottomAir topAir heater leftSolid rightSolid
do
reconstructPar -region $i > log.reconstructPar.$i2 >&1
done
runApplication reconstructPar -allRegions
echo
echo "creating files for paraview post-processing"
echo
for i in bottomAir topAir heater leftSolid rightSolid
do
paraFoam -touch -region $i
done
paraFoam -touchAll
# ----------------------------------------------------------------- end-of-file

View File

@ -31,19 +31,13 @@ done
#runApplication chtMultiRegionFoam
# Decompose
for i in bottomWater topAir heater leftSolid rightSolid
do
decomposePar -region $i > log.decomposePar.$i 2>&1
done
runApplication decomposePar -allRegions
# Run
runParallel `getApplication` 4
# Reconstruct
for i in bottomWater topAir heater leftSolid rightSolid
do
reconstructPar -region $i > log.reconstructPar.$i 2>&1
done
runApplication reconstructPar -allRegions
echo

View File

@ -36,27 +36,18 @@ runApplication `getApplication`
## Decompose
#for i in bottomAir topAir heater leftSolid rightSolid
#do
# decomposePar -region $i > log.decomposePar.$i 2>&1
#done
#runApplication decomposePar -allRegions
#
## Run
#runParallel `getApplication` 4
#
## Reconstruct
#for i in bottomAir topAir heater leftSolid rightSolid
#do
# reconstructPar -region $i > log.reconstructPar.$i 2>&1
#done
#runApplication reconstructPar -allRegions
echo
echo "creating files for paraview post-processing"
echo
for i in bottomAir topAir heater leftSolid rightSolid
do
paraFoam -touch -region $i
done
paraFoam -touchAll
# ----------------------------------------------------------------- end-of-file

View File

@ -31,19 +31,13 @@ done
runApplication `getApplication`
## Decompose
#for i in bottomAir topAir heater leftSolid rightSolid
#do
# decomposePar -region $i > log.decomposePar.$i 2>&1
#done
#runApplication decomposePar -allRegions
#
## Run
#runParallel `getApplication` 4
#
## Reconstruct
#for i in bottomAir topAir heater leftSolid rightSolid
#do
# reconstructPar -region $i > log.reconstructPar.$i 2>&1
#done
#runApplication reconstructPar -allRegions
echo

View File

@ -44,10 +44,7 @@ runApplication `getApplication`
## Run in parallel
## Decompose
#for i in bottomAir topAir heater leftSolid rightSolid
#do
# decomposePar -region $i > log.decomposePar.$i 2>&1
#done
#runApplication decomposePar -allRegions
#
#for i in bottomAir topAir
#do
@ -63,10 +60,7 @@ runApplication `getApplication`
#runParallel `getApplication` 4
#
## Reconstruct
#for i in bottomAir topAir heater leftSolid rightSolid
#do
# reconstructPar -region $i > log.reconstructPar.$i 2>&1
#done
#runApplication reconstructPar -allRegions
echo