diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler index 43ebc5582520b45169cbebadcba94b9c38f8bec4..e8fb26ae402c2fe19b014329f8fd0fb1dbc3601f 100644 --- a/etc/config.csh/compiler +++ b/etc/config.csh/compiler @@ -69,6 +69,9 @@ case ThirdParty: case Gcc: set gcc_version="$default_gcc_version" breaksw + case Gcc111*: + set gcc_version=gcc-11.1.1 + breaksw case Gcc103*: set gcc_version=gcc-10.3.0 breaksw @@ -156,6 +159,9 @@ case ThirdParty: case Clang: set clang_version="$default_clang_version" breaksw + case Clang120*: + set clang_version=llvm-12.0.0 + breaksw case Clang111*: set clang_version=llvm-11.1.0 breaksw diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler index 07dabda36f5e5c0fab6ba163d8940308fe9e5ea3..b7006a54be6f9299508b86946e7b75abe3dc4b07 100644 --- a/etc/config.sh/compiler +++ b/etc/config.sh/compiler @@ -70,6 +70,7 @@ ThirdParty) case "$WM_COMPILER" in Gcc) gcc_version="$default_gcc_version" ;; + Gcc111*) gcc_version=gcc-11.1.1 ;; Gcc103*) gcc_version=gcc-10.3.0 ;; Gcc102*) gcc_version=gcc-10.2.0 ;; Gcc101*) gcc_version=gcc-10.1.0 ;; @@ -100,6 +101,7 @@ ThirdParty) Gcc48*) gcc_version=gcc-4.8.5 ;; Clang) clang_version="$default_clang_version" ;; + Clang120*) clang_version=llvm-12.0.0 ;; Clang111*) clang_version=llvm-11.1.0 ;; Clang110*) clang_version=llvm-11.0.1 ;; Clang100*) clang_version=llvm-10.0.1 ;; diff --git a/src/sampling/surface/distanceSurface/distanceSurface.H b/src/sampling/surface/distanceSurface/distanceSurface.H index 621ad8490bd9631083e2e765d6a1ef76c6d0ef94..856302033174e65a9ad7f2b258989079ca744a24 100644 --- a/src/sampling/surface/distanceSurface/distanceSurface.H +++ b/src/sampling/surface/distanceSurface/distanceSurface.H @@ -93,7 +93,7 @@ Usage Checks the resulting faces against the original search surface and rejects faces with a distance greater than \c absProximity. - - \c proxityRegions (post-filter): + - \c proximityRegions (post-filter): Checks the distance of the resulting faces against the original search surface. Filters based on the area-weighted distance of each topologically connected region. diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel index 3f019bcaa246a8435ee97246f38fb9fe96f11b24..1a6a193a11e9bc4e5ba5464340e61dbd42d05927 100755 --- a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel +++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel @@ -3,6 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh runApplication decomposePar diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun index e52e17f06e75e5403d3f145f33d22287f545a4a3..0e412cf90eda8b1f4e49b394bbca05f2d9e8d865 100755 --- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun +++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun @@ -5,6 +5,8 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir +#NO blockMesh (pre-meshed geometry and pre-calculated U field) + runApplication makeFaMesh runApplication $(getApplication) diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel index abf8463e41b88edd8db56c9ba020fe0717b656c4..e30b40dd6edbf900859026bbfe47291f233daf8d 100755 --- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel +++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel @@ -5,6 +5,8 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir +#NO blockMesh (pre-meshed geometry and pre-calculated U field) + runApplication makeFaMesh runApplication decomposePar diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel index 0b836b10535e062b435171f20906b38d972a6f62..aca8d95243124e9d137f9509f3cb57e6eb224927 100755 --- a/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel @@ -7,6 +7,8 @@ decompDict="-decomposeParDict system/decomposeParDict-procBoundary8" fileHandler="-fileHandler collated" # reconstruct=true +restore0Dir + runApplication blockMesh runApplication $decompDict decomposePar $fileHandler