From 85d60f68831d029f108982a45c3d0d2b9f2a5bee Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 30 Jan 2014 09:05:10 +0000 Subject: [PATCH 1/2] BUG: etc: CGAL setup --- etc/config/CGAL.csh | 4 ++++ etc/config/CGAL.sh | 5 +++++ etc/config/settings.csh | 2 +- etc/config/settings.sh | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh index 2e3f81f0e4..5f7dceecc2 100644 --- a/etc/config/CGAL.csh +++ b/etc/config/CGAL.csh @@ -41,6 +41,10 @@ if ($?FOAM_VERBOSE && $?prompt) then echo " $boost_version at $BOOST_ARCH_PATH" endif +if ( -d "$CGAL_ARCH_PATH" ) then + _foamAddLib $CGAL_ARCH_PATH/lib +endif + if ( -d "$BOOST_ARCH_PATH" ) then _foamAddLib $BOOST_ARCH_PATH/lib endif diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh index cc67908f10..dc8772dd16 100644 --- a/etc/config/CGAL.sh +++ b/etc/config/CGAL.sh @@ -42,6 +42,11 @@ then echo " $boost_version at $BOOST_ARCH_PATH" fi +if [ -d "$CGAL_ARCH_PATH" ] +then + _foamAddLib $CGAL_ARCH_PATH/lib +fi + if [ -d "$BOOST_ARCH_PATH" ] then _foamAddLib $BOOST_ARCH_PATH/lib diff --git a/etc/config/settings.csh b/etc/config/settings.csh index a316037710..244e52fdcf 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -562,7 +562,7 @@ endif # cleanup environment: # ~~~~~~~~~~~~~~~~~~~~ -unalias _foamAddPath _foamAddLib _foamAddMan +#- keep _foamAddPath _foamAddLib _foamAddMan unset foamCompiler minBufferSize # ----------------------------------------------------------------- end-of-file diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 487c550d24..4fa9120ec1 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -569,6 +569,7 @@ export MPI_BUFFER_SIZE # cleanup environment: # ~~~~~~~~~~~~~~~~~~~~ -unset _foamAddPath _foamAddLib _foamAddMan foamCompiler minBufferSize +#keep _foamAddPath _foamAddLib _foamAddMan +unset foamCompiler minBufferSize # ----------------------------------------------------------------- end-of-file From 699b7d25179f3553daade5d93e86467a48b386ee Mon Sep 17 00:00:00 2001 From: william Date: Thu, 30 Jan 2014 10:17:32 +0000 Subject: [PATCH 2/2] BUG: removed executable permissions on flameSpreadWaterSuppressionPanel case files and foamy make/options --- applications/utilities/mesh/generation/foamyQuadMesh/Make/files | 0 applications/utilities/mesh/generation/foamyQuadMesh/Make/options | 0 .../generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/files | 0 .../generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/options | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault | 0 .../combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2 | 0 .../combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 | 0 .../combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T | 0 .../combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf | 0 .../les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf | 0 .../combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs | 0 .../combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh | 0 .../les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr | 0 .../les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T | 0 .../flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default | 0 .../les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char | 0 .../les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p | 0 .../les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood | 0 .../flameSpreadWaterSuppressionPanel/constant/additionalControls | 0 .../constant/combustionProperties | 0 .../fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g | 0 .../les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones | 0 .../flameSpreadWaterSuppressionPanel/constant/radiationProperties | 0 .../constant/reactingCloud1Positions | 0 .../constant/reactingCloud1Properties | 0 .../les/flameSpreadWaterSuppressionPanel/constant/reactions | 0 .../constant/surfaceFilmProperties | 0 .../constant/thermo.compressibleGas | 0 .../constant/thermophysicalProperties | 0 .../constant/turbulenceProperties | 0 .../system/extrudeToRegionMeshDictFilm | 0 .../system/extrudeToRegionMeshDictPyr | 0 .../flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes | 0 .../flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution | 0 .../les/flameSpreadWaterSuppressionPanel/system/fvSchemes | 0 .../les/flameSpreadWaterSuppressionPanel/system/fvSolution | 0 .../system/pyrolysisRegion/fvSchemes | 0 .../system/pyrolysisRegion/fvSolution | 0 44 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 applications/utilities/mesh/generation/foamyQuadMesh/Make/files mode change 100755 => 100644 applications/utilities/mesh/generation/foamyQuadMesh/Make/options mode change 100755 => 100644 applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/files mode change 100755 => 100644 applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/options mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2 mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes mode change 100755 => 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/files b/applications/utilities/mesh/generation/foamyQuadMesh/Make/files old mode 100755 new mode 100644 diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options old mode 100755 new mode 100644 diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/files b/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/files old mode 100755 new mode 100644 diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/options old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2 old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes old mode 100755 new mode 100644 diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution old mode 100755 new mode 100644