mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
STYLE: avoid old-style shell backticks in various places
This commit is contained in:
@ -44,9 +44,9 @@ done
|
||||
|
||||
sample $timeOpt
|
||||
SDIR=sets
|
||||
LSDIR=`ls $SDIR | head -1`
|
||||
EXAMPLE_FILE=`ls -1 $SDIR/${LSDIR}/* | head -1`
|
||||
FS=`basename $EXAMPLE_FILE | cut -d_ -f2-`
|
||||
LSDIR=$(ls $SDIR | head -1)
|
||||
EXAMPLE_FILE=$(ls -1 $SDIR/${LSDIR}/* | head -1)
|
||||
FS=$(basename $EXAMPLE_FILE | cut -d_ -f2-)
|
||||
|
||||
for d in $SDIR/*
|
||||
do
|
||||
|
||||
@ -95,7 +95,7 @@ then
|
||||
fi
|
||||
|
||||
# paths to data
|
||||
LATESTTIME=`ls $SETSDIR`
|
||||
LATESTTIME=$(ls $SETSDIR)
|
||||
OFDATAROOT=$SETSDIR/$LATESTTIME
|
||||
|
||||
EXPTDATAROOT=./exptData
|
||||
|
||||
@ -82,7 +82,7 @@ do
|
||||
break
|
||||
elif [ -s $lockFile ]
|
||||
then
|
||||
log "found lock file ${lockFile} containing '$(cat $lockFile)' - waiting"
|
||||
log "found lock file ${lockFile} containing '$(< $lockFile)' - waiting"
|
||||
else
|
||||
log "found lock file ${lockFile} - waiting"
|
||||
fi
|
||||
|
||||
@ -25,8 +25,8 @@ do
|
||||
|
||||
if [ -e logs/yPlus_0 ]
|
||||
then
|
||||
yPlus=`awk < logs/yPlus_0 'END{print $2}'`
|
||||
uPlus=`awk < logs/uPlus_0 'END{print $2}'`
|
||||
yPlus=$(awk < logs/yPlus_0 'END{print $2}')
|
||||
uPlus=$(awk < logs/uPlus_0 'END{print $2}')
|
||||
|
||||
echo "$yPlus $uPlus" >> yPlus_vs_uPlus
|
||||
fi
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
#--------------------------------*- C++ -*------------------------------------#
|
||||
#-----------------------------------------------------------------------------#
|
||||
# ========= | #
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox #
|
||||
# \\ / O peration | Version: plus #
|
||||
@ -77,80 +77,80 @@ for xi in $(seq 1 1 $nx); do
|
||||
|
||||
# side 1
|
||||
side=1
|
||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
z1=`echo $z $l $tol | awk '{print $1 + $2 - $3}'`
|
||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||
z1=$(echo $z $l $tol | awk '{print $1 + $2 - $3}')
|
||||
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||
|
||||
# side 2
|
||||
side=2
|
||||
x1=`echo $x $l $tol | awk '{print $1 + $2 - $3}'`
|
||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
x1=$(echo $x $l $tol | awk '{print $1 + $2 - $3}')
|
||||
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||
|
||||
# side 3
|
||||
side=3
|
||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
||||
z2=`echo $z $tol | awk '{print $1 + $2}'`
|
||||
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||
z2=$(echo $z $tol | awk '{print $1 + $2}')
|
||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||
|
||||
# side 4
|
||||
side=4
|
||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
||||
x2=`echo $x $tol | awk '{print $1 + $2}'`
|
||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||
x2=$(echo $x $tol | awk '{print $1 + $2}')
|
||||
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||
|
||||
# side 5
|
||||
side=5
|
||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
y1=`echo $y $l $tol | awk '{print $1 + $2 - $3}'`
|
||||
y2=`echo $y $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||
y1=$(echo $y $l $tol | awk '{print $1 + $2 - $3}')
|
||||
y2=$(echo $y $l $tol | awk '{print $1 + $2 + $3}')
|
||||
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||
|
||||
# side 6
|
||||
side=6
|
||||
x1=`echo $x $tol | awk '{print $1 - $2}'`
|
||||
x2=`echo $x $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
y1=`echo $y $tol | awk '{print $1 - $2}'`
|
||||
y2=`echo $y $tol | awk '{print $1 + $2}'`
|
||||
z1=`echo $z $tol | awk '{print $1 - $2}'`
|
||||
z2=`echo $z $l $tol | awk '{print $1 + $2 + $3}'`
|
||||
x1=$(echo $x $tol | awk '{print $1 - $2}')
|
||||
x2=$(echo $x $l $tol | awk '{print $1 + $2 + $3}')
|
||||
y1=$(echo $y $tol | awk '{print $1 - $2}')
|
||||
y2=$(echo $y $tol | awk '{print $1 + $2}')
|
||||
z1=$(echo $z $tol | awk '{print $1 - $2}')
|
||||
z2=$(echo $z $l $tol | awk '{print $1 + $2 + $3}')
|
||||
addToFaceSet cube${pad}${n}_side${side} $x1 $x2 $y1 $y2 $z1 $z2
|
||||
|
||||
n=$((n+1))
|
||||
|
||||
z=`echo $z $offset | awk '{print $1 + $2}'`
|
||||
z=$(echo $z $offset | awk '{print $1 + $2}')
|
||||
done
|
||||
|
||||
y=`echo $y $offset | awk '{print $1 + $2}'`
|
||||
y=$(echo $y $offset | awk '{print $1 + $2}')
|
||||
done
|
||||
|
||||
x=`echo $x $offset | awk '{print $1 + $2}'`
|
||||
x=$(echo $x $offset | awk '{print $1 + $2}')
|
||||
done
|
||||
|
||||
echo "cellSet cubeFacesCells new faceToCell cubeFaceSet owner" >> $tmpSetSet
|
||||
echo "faceZoneSet cubeFaces new setsToFaceZone cubeFaceSet cubeFacesCells" >> $tmpSetSet
|
||||
|
||||
echo "processing floor"
|
||||
floorMax=`echo 1 $tol | awk '{print $1 + $2}'`
|
||||
floorMax=$(echo 1 $tol | awk '{print $1 + $2}')
|
||||
createSetsAndZone Floor -$tol $floorMax -$tol $floorMax -$tol $tol
|
||||
echo "cellSet floorCells new faceToCell FloorFaces owner" >> $tmpSetSet
|
||||
echo "faceZoneSet floorFaces new setsToFaceZone FloorFaces floorCells" >> $tmpSetSet
|
||||
|
||||
@ -4,17 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
application=$(getApplication)
|
||||
|
||||
runApplication blockMesh
|
||||
|
||||
echo "Creating channel"
|
||||
i=1
|
||||
while [ "$i" -lt 3 ] ; do
|
||||
for i in 1 2
|
||||
do
|
||||
cp system/extrudeMeshDict.${i} system/extrudeMeshDict
|
||||
echo "Running extrudeMesh, instance" ${i}
|
||||
extrudeMesh > log.extrudeMesh.${i}
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user