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

TUT: add parallel version for various squareBend cases

Browse Source 
- adjust commented-out evaluation to avoid warnings.

  With code like this
  ```
  #if 0
  nxin    #eval{ round($nxin / 5) };
  #endif
  ```

  The handling of the "#if 0 / #endif" clause uses the plain ISstream
  parser to tokenize. This means that the "round(" is parsed as a word
  with a mismatched closing ')', whereas the "#eval" parser will slurp
  everything in until the closing brace and send it off as a string
  to the expression parser.
This commit is contained in:
Mark Olesen
2021-06-17 10:20:10 +02:00
parent a3d90ae9b9
commit 096b9dc52e
25 changed files with 151 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/test/parallelOverset/heatTransfer/Allclean
View File

@ -3,10 +3,8 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
cleanCase cleanCase0
rm -f constant/polyMesh/boundary rm -f constant/polyMesh/boundary
rm -f constant/polyMesh/zoneID rm -f constant/polyMesh/zoneID
rm -rf 0
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

1
applications/test/volField/cavity/Allclean
View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
cd "${0%/*}" || exit # Run from this directory cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
#------------------------------------------------------------------------------
cleanCase cleanCase

8
etc/templates/axisymmetricJet/Allclean
View File

@ -1,8 +1,10 @@
#!/bin/sh #!/bin/sh
cd "${0%/*}" || exit # Run from this directory cd "${0%/*}" || exit # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
#------------------------------------------------------------------------------
cleanCase cleanCase
rm constant/polyMesh/boundary
rm -f constant/polyMesh/boundary
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

5
etc/templates/axisymmetricJet/Allrun
View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
cd "${0%/*}" || exit # Run from this directory cd "${0%/*}" || exit # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
runApplication blockMesh runApplication blockMesh
runApplication extrudeMesh runApplication extrudeMesh

8
tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allclean
View File

@ -1,8 +0,0 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
#------------------------------------------------------------------------------
cleanCase0
#------------------------------------------------------------------------------

6
tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun
View File

@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
restore0Dir ./Allrun.pre
runApplication blockMesh
runApplication topoSet
runApplication $(getApplication) runApplication $(getApplication)

8
tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allclean → tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun-parallel
View File

@ -1,8 +1,12 @@
#!/bin/sh #!/bin/sh
cd "${0%/*}" || exit # Run from this directory cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
cleanCase0 ./Allrun.pre
runApplication decomposePar
runParallel $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

8
tutorials/incompressible/simpleFoam/squareBend/Allclean → tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun.pre
View File

@ -1,10 +1,12 @@
#!/bin/sh #!/bin/sh
cd "${0%/*}" || exit # Run from this directory cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
cleanCase0 restore0Dir
rm -rf constant/triSurface runApplication blockMesh
runApplication topoSet
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

8
tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2012 | | \\ / O peration | Version: v2106 |
| \\ / A nd | Website: www.openfoam.com | | \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | | | \\/ M anipulation | |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -34,9 +34,9 @@ xin #eval{ $xin / 5 };
xout #eval{ $xout / 5 }; xout #eval{ $xout / 5 };
zmax #eval{ $zmax / 5 }; zmax #eval{ $zmax / 5 };
nxin #eval{ round($nxin / 5) }; nxin #eval{ round ($nxin / 5) };
nxout #eval{ round($nxout / 5) }; nxout #eval{ round ($nxout / 5) };
nz #eval{ round($nz / 5) }; nz #eval{ round ($nz / 5) };
#endif #endif
zmin #eval{ -$zmax }; zmin #eval{ -$zmax };

25
tutorials/compressible/rhoSimpleFoam/squareBend/Allrun
View File

@ -3,30 +3,7 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
restore0Dir ./Allrun.pre
cp -rf \
"$FOAM_TUTORIALS"/resources/geometry/squareBend \
constant/triSurface
runApplication blockMesh
# Extract some faces for sampling
runApplication surfaceMeshExtract \
-patches inlet -time 0 \
constant/triSurface/inlet_sample0.obj
# Recentre and inflate
runApplication surfaceTransformPoints \
-recentre \
-scale 3.5 \
constant/triSurface/inlet_sample0.obj \
constant/triSurface/inlet_sample1.obj
# Finer mesh
runApplication surfaceRefineRedGreen \
constant/triSurface/inlet_sample1.obj \
constant/triSurface/oversized_sample.obj
runApplication $(getApplication) runApplication $(getApplication)

12
tutorials/compressible/rhoSimpleFoam/squareBend/Allrun-parallel Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
./Allrun.pre
runApplication decomposePar
runParallel $(getApplication)
#------------------------------------------------------------------------------

32
tutorials/compressible/rhoSimpleFoam/squareBend/Allrun.pre Executable file
View File

@ -0,0 +1,32 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
restore0Dir
cp -rf \
"$FOAM_TUTORIALS"/resources/geometry/squareBend \
constant/triSurface
runApplication blockMesh
# Extract some faces for sampling
runApplication surfaceMeshExtract \
-patches inlet -time 0 \
constant/triSurface/inlet_sample0.obj
# Recentre and inflate
runApplication surfaceTransformPoints \
-recentre \
-scale 3.5 \
constant/triSurface/inlet_sample0.obj \
constant/triSurface/inlet_sample1.obj
# Finer mesh
runApplication surfaceRefineRedGreen \
constant/triSurface/inlet_sample1.obj \
constant/triSurface/oversized_sample.obj
#------------------------------------------------------------------------------

6
tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun
View File

@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
restore0Dir ./Allrun.pre
runApplication blockMesh
runApplication topoSet
runApplication $(getApplication) runApplication $(getApplication)

12
tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun-parallel Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
./Allrun.pre
runApplication decomposePar
runParallel $(getApplication)
#------------------------------------------------------------------------------

8
tutorials/compressible/rhoSimpleFoam/squareBend/Allclean → tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun.pre
View File

@ -1,10 +1,12 @@
#!/bin/sh #!/bin/sh
cd "${0%/*}" || exit # Run from this directory cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
cleanCase0 restore0Dir
rm -rf constant/triSurface runApplication blockMesh
runApplication topoSet
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

8
tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2012 | | \\ / O peration | Version: v2106 |
| \\ / A nd | Website: www.openfoam.com | | \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | | | \\/ M anipulation | |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -34,9 +34,9 @@ xin #eval{ $xin / 5 };
xout #eval{ $xout / 5 }; xout #eval{ $xout / 5 };
zmax #eval{ $zmax / 5 }; zmax #eval{ $zmax / 5 };
nxin #eval{ round($nxin / 5) }; nxin #eval{ round ($nxin / 5) };
nxout #eval{ round($nxout / 5) }; nxout #eval{ round ($nxout / 5) };
nz #eval{ round($nz / 5) }; nz #eval{ round ($nz / 5) };
#endif #endif
zmin #eval{ -$zmax }; zmin #eval{ -$zmax };

6
tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun
View File

@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
restore0Dir ./Allrun.pre
runApplication blockMesh
runApplication topoSet
runApplication $(getApplication) runApplication $(getApplication)

12
tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun-parallel Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
./Allrun.pre
runApplication decomposePar
runParallel $(getApplication)
#------------------------------------------------------------------------------

8
tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allclean → tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun.pre
View File

@ -1,8 +1,12 @@
#!/bin/sh #!/bin/sh
cd "${0%/*}" || exit # Run from this directory cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
cleanCase0 restore0Dir
runApplication blockMesh
runApplication topoSet
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

8
tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2012 | | \\ / O peration | Version: v2106 |
| \\ / A nd | Website: www.openfoam.com | | \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | | | \\/ M anipulation | |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -34,9 +34,9 @@ xin #eval{ $xin / 5 };
xout #eval{ $xout / 5 }; xout #eval{ $xout / 5 };
zmax #eval{ $zmax / 5 }; zmax #eval{ $zmax / 5 };
nxin #eval{ round($nxin / 5) }; nxin #eval{ round ($nxin / 5) };
nxout #eval{ round($nxout / 5) }; nxout #eval{ round ($nxout / 5) };
nz #eval{ round($nz / 5) }; nz #eval{ round ($nz / 5) };
#endif #endif
zmin #eval{ -$zmax }; zmin #eval{ -$zmax };

8
tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
View File

@ -1,8 +0,0 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
#------------------------------------------------------------------------------
cleanCase
#------------------------------------------------------------------------------

12
tutorials/incompressible/simpleFoam/squareBend/Allrun
View File

@ -3,17 +3,7 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
mkdir -p constant/triSurface ./Allrun.pre
cp -f \
"$FOAM_TUTORIALS"/resources/geometry/angledPlane.obj.gz \
constant/triSurface
restore0Dir
runApplication blockMesh
runApplication topoSet
runApplication $(getApplication) runApplication $(getApplication)

12
tutorials/incompressible/simpleFoam/squareBend/Allrun-parallel Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
./Allrun.pre
runApplication decomposePar
runParallel $(getApplication)
#------------------------------------------------------------------------------

18
tutorials/incompressible/simpleFoam/squareBend/Allrun.pre Executable file
View File

@ -0,0 +1,18 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
mkdir -p constant/triSurface
cp -f \
"$FOAM_TUTORIALS"/resources/geometry/angledPlane.obj.gz \
constant/triSurface
restore0Dir
runApplication blockMesh
runApplication topoSet
#------------------------------------------------------------------------------

8
tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2012 | | \\ / O peration | Version: v2106 |
| \\ / A nd | Website: www.openfoam.com | | \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | | | \\/ M anipulation | |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -34,9 +34,9 @@ xin #eval{ $xin / 5 };
xout #eval{ $xout / 5 }; xout #eval{ $xout / 5 };
zmax #eval{ $zmax / 5 }; zmax #eval{ $zmax / 5 };
nxin #eval{ round($nxin / 5) }; nxin #eval{ round ($nxin / 5) };
nxout #eval{ round($nxout / 5) }; nxout #eval{ round ($nxout / 5) };
nz #eval{ round($nz / 5) }; nz #eval{ round ($nz / 5) };
#endif #endif
zmin #eval{ -$zmax }; zmin #eval{ -$zmax };