tutorials: Renamed .org -> .orig
See http://www.openfoam.org/mantisbt/view.php?id=2076 - .org is the file extension for emacs org-mode as well - .orig is more to the point (.org isn't always recognized as "original") - .original is too long, although more consistent with the convention of source code file naming Update script contributed by Bruno Santos
This commit is contained in:
parent
81f31acbb3
commit
1b34231340
@ -156,22 +156,22 @@ then
|
||||
fi
|
||||
|
||||
echo "Modifying ${MAIN_CONTROL_DICT}"
|
||||
if [ -e ${MAIN_CONTROL_DICT}.org ]
|
||||
if [ -e ${MAIN_CONTROL_DICT}.orig ]
|
||||
then
|
||||
echo "File ${MAIN_CONTROL_DICT}.org already exists"
|
||||
echo "File ${MAIN_CONTROL_DICT}.orig already exists"
|
||||
echo "Did Alltest fail in some way and then run again?"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Clean up on termination and on Ctrl-C
|
||||
trap 'mv ${MAIN_CONTROL_DICT}.org ${MAIN_CONTROL_DICT} 2>/dev/null; exit 0' \
|
||||
trap 'mv ${MAIN_CONTROL_DICT}.orig ${MAIN_CONTROL_DICT} 2>/dev/null; exit 0' \
|
||||
EXIT TERM INT
|
||||
cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.org
|
||||
cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.orig
|
||||
|
||||
sed \
|
||||
-e s/"\(fvSchemes[ \t]*\)\([0-9]\);"/"\1 1;"/g \
|
||||
-e s/"\(solution[ \t]*\)\([0-9]\);"/"\1 1;"/g \
|
||||
${MAIN_CONTROL_DICT}.org > ${MAIN_CONTROL_DICT}
|
||||
${MAIN_CONTROL_DICT}.orig > ${MAIN_CONTROL_DICT}
|
||||
|
||||
echo "Copying the tutorials"
|
||||
cp -a ${TUTORIALS_DIR} ${TEST_RUN_DIR}
|
||||
@ -181,13 +181,13 @@ cd ${TEST_RUN_DIR} || exit 1
|
||||
|
||||
for CD in `find . -name "controlDict*"`
|
||||
do
|
||||
mv ${CD} ${CD}.org
|
||||
mv ${CD} ${CD}.orig
|
||||
sed \
|
||||
-e s/"\(startFrom[ \t]*\)\([a-zA-Z]*\);"/"\1 latestTime;"/g \
|
||||
-e s/"\(stopAt[ \t]*\)\([a-zA-Z]*\);"/"\1 nextWrite;"/g \
|
||||
-e s/"\(writeControl[ \t]*\)\([a-zA-Z]*\);"/"\1 timeStep;"/g \
|
||||
-e s/"\(writeInterval[ \t]*\)\([0-9a-zA-Z.-]*\);"/"\1 1;"/g \
|
||||
${CD}.org > ${CD}
|
||||
${CD}.orig > ${CD}
|
||||
done
|
||||
|
||||
if [ "$DEFAULT_SCHEMES" = true ]
|
||||
@ -197,8 +197,8 @@ then
|
||||
do
|
||||
for S in $FV_SCHEMES
|
||||
do
|
||||
mv ${FV_SC} ${FV_SC}.org
|
||||
sed -e /"${S}"/,/$p/d ${FV_SC}.org > ${FV_SC}
|
||||
mv ${FV_SC} ${FV_SC}.orig
|
||||
sed -e /"${S}"/,/$p/d ${FV_SC}.orig > ${FV_SC}
|
||||
done
|
||||
setDefaultFvSchemes >> ${FV_SC}
|
||||
done
|
||||
|
@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
|
||||
application=`getApplication`
|
||||
|
||||
cp -r 0.org 0 > /dev/null 2>&1
|
||||
cp -r 0.orig 0 > /dev/null 2>&1
|
||||
runApplication blockMesh
|
||||
runApplication $application -withFunctionObjects -writePhi -writep
|
||||
runApplication streamFunction
|
||||
|
@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
|
||||
application=`getApplication`
|
||||
|
||||
cp -r 0.org 0 > /dev/null 2>&1
|
||||
cp -r 0.orig 0 > /dev/null 2>&1
|
||||
runApplication blockMesh
|
||||
runApplication $application -writePhi -writep
|
||||
runApplication streamFunction
|
||||
|
@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
rm -rf 0
|
||||
cp -r 0.org 0
|
||||
cp -r 0.orig 0
|
||||
runApplication blockMesh
|
||||
runApplication changeDictionary
|
||||
runApplication topoSet
|
||||
|
@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
rm -rf 0
|
||||
cp -r 0.org 0
|
||||
cp -r 0.orig 0
|
||||
cleanCase
|
||||
cleanSamples
|
||||
|
||||
|
@ -17,7 +17,7 @@ runApplication createPatch -overwrite
|
||||
runApplication createBaffles -overwrite
|
||||
runApplication mergeOrSplitBaffles -split -overwrite
|
||||
|
||||
cp -r 0.org 0
|
||||
cp -r 0.orig 0
|
||||
|
||||
runApplication $(getApplication)
|
||||
|
||||
|
@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
|
||||
cleanCase
|
||||
rm -rf 0
|
||||
cp -r 0.org 0
|
||||
cp -r 0.orig 0
|
||||
cleanSamples
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
application=`getApplication`
|
||||
|
||||
runApplication blockMesh
|
||||
cp 0/T.org 0/T
|
||||
cp 0/T.orig 0/T
|
||||
runApplication setFields
|
||||
runApplication $application
|
||||
|
||||
|
@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
application=`getApplication`
|
||||
|
||||
runApplication blockMesh
|
||||
cp 0/T.org 0/T
|
||||
cp 0/T.orig 0/T
|
||||
runApplication setFields
|
||||
runApplication $application
|
||||
|
||||
|
@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
cleanCase
|
||||
cp 0/T.org 0/T
|
||||
cp 0/T.orig 0/T
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
@ -6,7 +6,7 @@ application=`getApplication`
|
||||
|
||||
runApplication blockMesh
|
||||
|
||||
cp -r 0.org 0
|
||||
cp -r 0.orig 0
|
||||
|
||||
# Create 1D and 3D baffles
|
||||
runApplication createBaffles -overwrite
|
||||
|
@ -26,4 +26,4 @@ paraFoam -touch -region porous
|
||||
paraFoam -touch -region air
|
||||
|
||||
|
||||
cp -rf 0.org 0
|
||||
cp -rf 0.orig 0
|
||||
|
@ -14,4 +14,4 @@ runApplication createBaffles -overwrite
|
||||
# remove zero-sized patches
|
||||
runApplication createPatch -overwrite
|
||||
|
||||
cp -rf 0.org 0
|
||||
cp -rf 0.orig 0
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user