From 6694baf96f3c026b1c18e04a8ae18c6126f41ef9 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 27 Feb 2012 10:24:22 +0000 Subject: [PATCH 1/2] ENH: tutorial script: rm was producing an error if folder was not presnt --- tutorials/incompressible/pimpleDyMFoam/propeller/Allclean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean index e9710c501f..f87f062960 100755 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean @@ -7,6 +7,6 @@ cd ${0%/*} || exit 1 # run from this directory cleanCase \rm -rf 0 -\rm -r constant/extendedFeatureEdgeMesh/ +\rm -rf constant/extendedFeatureEdgeMesh/ \rm -f constant/triSurface/*.eMesh* From 2bc3004af303e2832b7ee3d70f7e001277f9e784 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 27 Feb 2012 11:59:07 +0000 Subject: [PATCH 2/2] ENH: Updated CGAL to version 3.9 --- etc/config/settings.csh | 2 +- etc/config/settings.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/config/settings.csh b/etc/config/settings.csh index 5eaed0c13c..5d461ded19 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -339,7 +339,7 @@ endif # ~~~~~~~~~~~~~~ set boost_version=boost_1_45_0 -set cgal_version=CGAL-3.8 +set cgal_version=CGAL-3.9 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 13939070cd..192fa817af 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -367,7 +367,7 @@ fi # ~~~~~~~~~~~~~~ boost_version=boost_1_45_0 -cgal_version=CGAL-3.8 +cgal_version=CGAL-3.9 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version