11 Allwmake | 5 +-
22 applications/Allwmake | 2 +
33 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 4 +-
4- .../utilities/mesh/generation/foamyMesh/Allwmake | 7 +-
4+ .../utilities/mesh/generation/foamyMesh/Allwmake | 5 +-
55 .../DelaunayMesh/DelaunayMesh.C | 7 +-
6- .../DelaunayMesh/DistributedDelaunayMesh.C | 7 +-
6+ .../DelaunayMesh/DistributedDelaunayMesh.C | 6 +-
77 .../foamyMesh/conformalVoronoiMesh/Make/options | 1 +
88 .../cellShapeControlMesh/cellShapeControlMesh.H | 7 ++
99 .../CGALTriangulation3DKernel.H | 5 +
1010 .../generation/foamyMesh/foamyHexMesh/Make/options | 1 +
1111 .../foamyMesh/foamyQuadMesh/Make/options | 1 +
1212 .../foamyQuadMesh/insertSurfaceNearestPointPairs.C | 2 +-
13- .../mesh/manipulation/renumberMesh/Allwmake | 9 +-
1413 .../postProcessing/graphics/PVReaders/Allwmake | 6 +
1514 bin/foamMonitor | 15 ++-
1615 bin/paraFoam | 6 +
7978 wmake/src/Makefile | 2 +
8079 wmake/wmake | 5 +
8180 wmake/wmakeLnIncludeAll | 1 +
82- 81 files changed, 1276 insertions(+), 98 deletions(-)
81+ 80 files changed, 1265 insertions(+), 97 deletions(-)
8382
8483diff --git a/Allwmake b/Allwmake
8584index 3f6a7523d..00810aff6 100755
@@ -128,10 +127,10 @@ index 2b725832b..8f96f6ec1 100755
128127 wmake -all $targetType solvers
129128 wmake -all $targetType utilities
130129diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
131- index b7f887dc5..8d0902af0 100644
130+ index 91e4ff09a..b97c3bf52 100644
132131--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
133132+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
134- @@ -1076 ,8 +1076 ,8 @@ int main(int argc, char *argv[])
133+ @@ -1078 ,8 +1078 ,8 @@ int main(int argc, char *argv[])
135134 if
136135 (
137136 nbrType != type
@@ -143,7 +142,7 @@ index b7f887dc5..8d0902af0 100644
143142 {
144143 nbrPatchis[nbrPatchi] = patchi;
145144diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwmake b/applications/utilities/mesh/generation/foamyMesh/Allwmake
146- index 273a56e5f..0ca85d92f 100755
145+ index 194ec84b4..ec0b9d7ae 100755
147146--- a/applications/utilities/mesh/generation/foamyMesh/Allwmake
148147+++ b/applications/utilities/mesh/generation/foamyMesh/Allwmake
149148@@ -4,8 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
@@ -159,13 +158,6 @@ index 273a56e5f..0ca85d92f 100755
159158 then
160159 . $settings
161160 if [ -n "$BOOST_ARCH_PATH" ]
162- @@ -31,4 +34,6 @@ wmake $targetType foamyHexMesh
163- #(cd foamyHexMeshSurfaceSimplify && ./Allwmake $targetType $*)
164- #wmake $targetType cellSizeAndAlignmentGrid
165-
166- + unset CGAL_CONF_FILE
167- +
168- #------------------------------------------------------------------------------
169161diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
170162index 73a3323d3..7b1a6b466 100644
171163--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
@@ -192,20 +184,19 @@ index 73a3323d3..7b1a6b466 100644
192184 spatial_sort
193185 (
194186diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
195- index 0b59e0ead..ddbf3c175 100644
187+ index c7c60bcf8..61e45f6c8 100644
196188--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
197189+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
198- @@ -24,6 +24,9 @@ License
190+ @@ -23,6 +23,8 @@ License
191+
199192 \*---------------------------------------------------------------------------*/
200193
201- #include "DistributedDelaunayMesh.H"
202- +
203194+ #include <random>
204195+
196+ #include "DistributedDelaunayMesh.H"
205197 #include "meshSearch.H"
206- #include "mapDistribute.H"
207- #include "zeroGradientFvPatchFields.H"
208- @@ -900,7 +903,9 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
198+ #include "distributionMap.H"
199+ @@ -900,7 +902,9 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
209200 );
210201 }
211202
@@ -307,41 +298,6 @@ index 48d9ed870..843f28abd 100644
307298 (
308299 number_of_vertices(),
309300 size_t(10*sqrt(scalar(number_of_vertices())))
310- diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
311- index ee135cc37..1d3f69f2b 100755
312- --- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
313- +++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
314- @@ -4,22 +4,29 @@ cd ${0%/*} || exit 1 # Run from this directory
315- # Parse arguments for compilation (at least for error catching)
316- . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
317-
318- + _soExt=so
319- + [ "$(uname -s)" = "Darwin" ] && _soExt=dylib
320- +
321- export COMPILE_FLAGS=''
322- export LINK_FLAGS=''
323-
324- - if [ -f "${FOAM_LIBBIN}/libSloanRenumber.so" ]
325- + if [ -f "${FOAM_LIBBIN}/libSloanRenumber.$_soExt" ]
326- then
327- echo "Found libSloanRenumber.so -- enabling Sloan renumbering support."
328- export LINK_FLAGS="${LINK_FLAGS} -lSloanRenumber"
329- fi
330-
331- + [ -n "$ZOLTAN_ARCH_PATH" ] && {
332- if [ -f "${ZOLTAN_ARCH_PATH}/lib/libzoltan.a" -a -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ]
333- then
334- echo "Found libzoltanRenumber.so -- enabling zoltan renumbering support."
335- export COMPILE_FLAGS="-DFOAM_USE_ZOLTAN"
336- export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan"
337- fi
338- + }
339-
340- wmake $targetType
341-
342- + unset _soExt
343- +
344- #------------------------------------------------------------------------------
345301diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
346302index f270c064b..7e474f909 100755
347303--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@@ -415,7 +371,7 @@ index 32b62d792..603771302 100755
415371 test "$mod_time" -gt "$idle_ago" || break
416372 sleep "$refresh"
417373diff --git a/bin/paraFoam b/bin/paraFoam
418- index 78911fdce..d70dc4bf9 100755
374+ index aab19870b..d2ca9569b 100755
419375--- a/bin/paraFoam
420376+++ b/bin/paraFoam
421377@@ -101,6 +101,12 @@ extension=OpenFOAM
@@ -432,7 +388,7 @@ index 78911fdce..d70dc4bf9 100755
432388 while [ "$#" -gt 0 ]
433389 do
434390diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
435- index 1a040df6a..67a2ef2b9 100644
391+ index 1f21022b2..b57655033 100644
436392--- a/bin/tools/RunFunctions
437393+++ b/bin/tools/RunFunctions
438394@@ -28,6 +28,9 @@
@@ -622,7 +578,7 @@ index 78b14e474..db7040a51 100644
622578- #------------------------------------------------------------------------------
623579+ #-------------------- vi: set ft=tcsh et sw=4 ts=4 sts=4: ---------------------
624580diff --git a/etc/config.csh/settings b/etc/config.csh/settings
625- index f7cf4020c..580667000 100644
581+ index d4d8836a6..ca2534282 100644
626582--- a/etc/config.csh/settings
627583+++ b/etc/config.csh/settings
628584@@ -32,8 +32,12 @@
@@ -665,9 +621,9 @@ index f7cf4020c..580667000 100644
665621
666622 # Site-specific directory
667623 if ( $?WM_PROJECT_SITE ) then
668- @@ -202,7 +215,11 @@ unset siteDir
624+ @@ -205,7 +218,11 @@ endif
625+ unset siteDir
669626
670- _foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}
671627 # Make sure to pick up dummy versions of external libraries last
672628- _foamAddLib ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_EXT_LIBBIN}:${FOAM_LIBBIN}/dummy
673629+ _foamAddLib ${FOAM_LIBBIN}/dummy
@@ -678,7 +634,7 @@ index f7cf4020c..580667000 100644
678634
679635 # Compiler settings
680636 # ~~~~~~~~~~~~~~~~~
681- @@ -341 ,4 +358 ,4 @@ endsw
637+ @@ -350 ,4 +367 ,4 @@ endsw
682638 unset minBufferSize
683639 unsetenv WM_COMPILER_TYPE
684640
@@ -1121,7 +1077,7 @@ index b368cc51a..56bca560b 100644
11211077
11221078
11231079diff --git a/etc/config.sh/settings b/etc/config.sh/settings
1124- index d48896bac..9a3bfba53 100644
1080+ index b3b71c1bc..6357f304c 100644
11251081--- a/etc/config.sh/settings
11261082+++ b/etc/config.sh/settings
11271083@@ -131,7 +131,12 @@ SunOS)
@@ -1147,9 +1103,9 @@ index d48896bac..9a3bfba53 100644
11471103
11481104 # Site-specific directory
11491105 siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_INST_DIR/site}"
1150- @@ -204,7 +209,12 @@ unset siteDir
1106+ @@ -207,7 +212,12 @@ fi
1107+ unset siteDir
11511108
1152- _foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN
11531109 # Make sure to pick up dummy versions of external libraries last
11541110- _foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_EXT_LIBBIN:$FOAM_LIBBIN/dummy
11551111+ if [ -n "$FOAM_EXT_LIBBIN" ]
@@ -1161,7 +1117,7 @@ index d48896bac..9a3bfba53 100644
11611117
11621118 # Compiler settings
11631119 # ~~~~~~~~~~~~~~~~~
1164- @@ -297 ,4 +307 ,6 @@ system)
1120+ @@ -300 ,4 +310 ,6 @@ system)
11651121 ;;
11661122 esac
11671123
@@ -1356,7 +1312,7 @@ index d2c5194f8..f779dacca 100644
13561312- #------------------------------------------------------------------------------
13571313+ #--------------------- vi: set ft=tcsh et sw=4 ts=4 sts=4: ---------------------
13581314diff --git a/src/Allwmake b/src/Allwmake
1359- index 29f8b1f14..18c261d2e 100755
1315+ index bcc574e2d..5a957e781 100755
13601316--- a/src/Allwmake
13611317+++ b/src/Allwmake
13621318@@ -12,11 +12,13 @@ wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
@@ -1374,7 +1330,7 @@ index 29f8b1f14..18c261d2e 100755
13741330 # Update OpenFOAM version strings if required
13751331 wmakePrintBuild -check || wrmo OpenFOAM/global/global.o 2>/dev/null
13761332diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
1377- index f8c840468..17cf058a5 100644
1333+ index 74a801a30..ad85c97bc 100644
13781334--- a/src/OSspecific/POSIX/POSIX.C
13791335+++ b/src/OSspecific/POSIX/POSIX.C
13801336@@ -56,7 +56,11 @@ Description
@@ -1768,7 +1724,7 @@ index b3fb45c9b..4cbcb2928 100644
17681724 static void* mallocNan(size_t size);
17691725 #endif
17701726diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
1771- index cb7645f7c..9b17a343b 100644
1727+ index f97bb5afe..05bc7c1c1 100644
17721728--- a/src/OpenFOAM/Make/files
17731729+++ b/src/OpenFOAM/Make/files
17741730@@ -29,11 +29,13 @@ $(chars)/wchar/wcharIO.C
@@ -2252,10 +2208,10 @@ index 7c6c07708..a2d01e160 100644
22522208
22532209 // ************************************************************************* //
22542210diff --git a/src/OpenFOAM/primitives/strings/word/wordIOList.C b/src/OpenFOAM/primitives/strings/word/wordIOList.C
2255- index b5fee5be9..60b3c4a32 100644
2211+ index 726885e03..155f5b1e5 100644
22562212--- a/src/OpenFOAM/primitives/strings/word/wordIOList.C
22572213+++ b/src/OpenFOAM/primitives/strings/word/wordIOList.C
2258- @@ -53 ,7 +53 ,7 @@ void Foam::printTable
2214+ @@ -54 ,7 +54 ,7 @@ void Foam::printTable
22592215 {
22602216 forAll(wll, i)
22612217 {
@@ -2311,7 +2267,7 @@ index 69f63dbe5..18d31d422 100644
23112267+ EXE_INC += -I$(ParMGridGen)/MGridGen/IMlib/lnInclude
23122268+ endif
23132269diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
2314- index ea8550c8c..430392f5e 100755
2270+ index c2a0a6629..170516d91 100755
23152271--- a/src/parallel/decompose/Allwmake
23162272+++ b/src/parallel/decompose/Allwmake
23172273@@ -6,7 +6,9 @@ cd ${0%/*} || exit 1 # Run from this directory
@@ -2446,10 +2402,10 @@ index cf6e54861..e3b7efff8 100644
24462402+ LIB_LIBS += -lboost_system
24472403+ endif
24482404diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
2449- index 0960bbb1f..9d4edaefe 100644
2405+ index 030cf0bad..f0b196781 100644
24502406--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
24512407+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
2452- @@ -138 ,7 +138 ,7 @@ Foam::wordList Foam::basicThermo::splitThermoName
2408+ @@ -136 ,7 +136 ,7 @@ Foam::wordList Foam::basicThermo::splitThermoName
24532409 }
24542410 else if ((endc = thermoName.find(',', beg)) != string::npos)
24552411 {
0 commit comments