From 9c0a04d8bed97345d2715619a562bed15dfd429e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 1 Jul 2016 17:55:03 +0200 Subject: [PATCH 1/6] BUG: need 'unset -f' to unset functions (issue #170) - triggered by dash. --- etc/config.sh/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/config.sh/functions b/etc/config.sh/functions index dcec6549d4..026755edc4 100644 --- a/etc/config.sh/functions +++ b/etc/config.sh/functions @@ -116,7 +116,7 @@ else # Cleanup environment: # ~~~~~~~~~~~~~~~~~~~~ unset WM_BASH_FUNCTIONS - unset _foamAddPath _foamAddLib _foamAddMan - unset _foamSource _foamEval + unset -f _foamAddPath _foamAddLib _foamAddMan + unset -f _foamSource _foamEval fi From 6494f0378e7e78a85b7a79dd0adcee684c89b53a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 5 Jul 2016 14:43:59 +0200 Subject: [PATCH 2/6] BUG: randomProcesses/Allwmake not being called (fixes #171) --- src/Allwmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Allwmake b/src/Allwmake index e07067fb66..cc3d1b89b7 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -58,10 +58,9 @@ wmake $targetType sampling # Compile scotchDecomp, metisDecomp etc. parallel/Allwmake $targetType $* +randomProcesses/Allwmake $targetType $* wmake $targetType ODE -wmake $targetType randomProcesses - wmake $targetType fvMotionSolver transportModels/Allwmake $targetType $* From 1e82e1a1dd2319627122807e945f2974a553b759 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 5 Jul 2016 16:15:03 +0200 Subject: [PATCH 3/6] CONFIG: use ThirdParty boost, FFTW instead of system versions - many systems may not have boost or FFTW installed, or in an older version. Using ThirdParty for them should lead to a more robust build process. --- etc/config.csh/CGAL | 2 +- etc/config.csh/FFTW | 2 +- etc/config.sh/CGAL | 2 +- etc/config.sh/FFTW | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL index 5371099a25..2fd06120eb 100644 --- a/etc/config.csh/CGAL +++ b/etc/config.csh/CGAL @@ -50,7 +50,7 @@ # #------------------------------------------------------------------------------ -set boost_version=boost-system +set boost_version=boost_1_61_0 set cgal_version=CGAL-4.8 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW index 514216e1bf..78d24e17b1 100644 --- a/etc/config.csh/FFTW +++ b/etc/config.csh/FFTW @@ -48,7 +48,7 @@ # #------------------------------------------------------------------------------ -set fftw_version=fftw-system +set fftw_version=fftw-3.3.4 setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL index afb178d709..e23164d2c9 100644 --- a/etc/config.sh/CGAL +++ b/etc/config.sh/CGAL @@ -49,7 +49,7 @@ # - the LD_LIBRARY_PATH is not adjusted. #------------------------------------------------------------------------------ -boost_version=boost-system +boost_version=boost_1_61_0 cgal_version=CGAL-4.8 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW index 74115fccfc..7c0a48861d 100644 --- a/etc/config.sh/FFTW +++ b/etc/config.sh/FFTW @@ -47,7 +47,7 @@ # - the LD_LIBRARY_PATH is not adjusted. #------------------------------------------------------------------------------ -fftw_version=fftw-system +fftw_version=fftw-3.3.4 export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version From c1fb5e9021129343dea5d84d8baea375ce01632b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 6 Jul 2016 08:11:42 +0200 Subject: [PATCH 4/6] CONFIG: rename config file to avoid premature filtering of its name --- applications/utilities/mesh/conversion/Optional/Allwmake | 2 +- etc/config.sh/{libccmio => ccmio} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename etc/config.sh/{libccmio => ccmio} (98%) diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake index f84479c089..adf350c5c8 100755 --- a/applications/utilities/mesh/conversion/Optional/Allwmake +++ b/applications/utilities/mesh/conversion/Optional/Allwmake @@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # Get version info and arch-path . $WM_PROJECT_DIR/etc/config.sh/functions -_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/libccmio) +_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/ccmio) set -x diff --git a/etc/config.sh/libccmio b/etc/config.sh/ccmio similarity index 98% rename from etc/config.sh/libccmio rename to etc/config.sh/ccmio index 1ef4205640..6bd6aa42ac 100644 --- a/etc/config.sh/libccmio +++ b/etc/config.sh/ccmio @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see . # # File -# etc/config.sh/libccmio +# etc/config.sh/ccmio # # Description # Setup file for libccmio include/libraries. From b99515ea9597c40e7cb5f89a3081e6d7c8f9f14b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 7 Jul 2016 11:17:09 +0200 Subject: [PATCH 5/6] COMP: template ambiguity for 64-bit labels (issue #175) --- .../turbulentDFSEMInletFvPatchVectorField.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C index 5b229917ac..b0df476fe0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C @@ -80,7 +80,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::writeEddyOBJ() const // label i2 = ((i + 1) % nPoint) + nPoint; // os << "l " << i1 << " " << i2 << nl; //} - } + } { const Time& time = db().time(); @@ -95,7 +95,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::writeEddyOBJ() const const eddy& e = eddies_[eddyI]; pointOffset += e.writeSurfaceOBJ(pointOffset, patchNormal_, os); } - } + } } @@ -141,7 +141,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::writeLumleyCoeffs() const scalar eta = sqrt(-ii/3.0); os << xi << token::TAB << eta << token::TAB << ii << token::TAB << iii << endl; - } + } } // After interpolation @@ -1107,7 +1107,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const writeEntryIfDifferent(os, "d", 1.0, d_); writeEntryIfDifferent(os, "kappa", 0.41, kappa_); writeEntryIfDifferent(os, "perturb", 1e-5, perturb_); - writeEntryIfDifferent(os, "nCellPerEddy", 5, nCellPerEddy_); + writeEntryIfDifferent