From 4018425e0bf65599829ed5f463eedbae72acb2da Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 8 Jun 2011 15:22:05 +0100 Subject: [PATCH 1/4] ENH: pointHitSort: define < operator for sorting --- .../meshes/primitiveShapes/objectHit/pointHitSort.H | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H index bd85bb8677..d64471294d 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H +++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,7 @@ public: //- Construct null pointHitSort() : - inter_(false, vector::zero, GREAT), + inter_(false, vector::zero, GREAT, false), index_(-1) {} @@ -96,9 +96,9 @@ public: return inter_.distance() == rhs.inter().distance(); } - bool operator>(const pointHitSort& rhs) const + bool operator<(const pointHitSort& rhs) const { - return inter_.distance() > rhs.inter().distance(); + return inter_.distance() < rhs.inter().distance(); } }; From 3a5f546aeb4bdd629e666dbe966e7cda3438e99b Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 8 Jun 2011 15:37:11 +0100 Subject: [PATCH 2/4] COMP: Applications/test: clean build --- applications/test/dataEntry/Make/options | 3 ++- applications/test/maxMem/Make/options | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/test/dataEntry/Make/options b/applications/test/dataEntry/Make/options index 405e346e80..a071d9557c 100644 --- a/applications/test/dataEntry/Make/options +++ b/applications/test/dataEntry/Make/options @@ -9,4 +9,5 @@ EXE_LIBS = \ -llagrangianIntermediate \ -lradiationModels \ -lthermophysicalFunctions \ - -lregionModels + -lregionModels \ + -lsampling diff --git a/applications/test/maxMem/Make/options b/applications/test/maxMem/Make/options index 1570a9377e..c1239ff7aa 100644 --- a/applications/test/maxMem/Make/options +++ b/applications/test/maxMem/Make/options @@ -1 +1 @@ -EXE_LIBS = $(FOAM_EXT_LIBBIN)/libfbsdmalloc.o +EXE_LIBS = /* $(FOAM_EXT_LIBBIN)/libfbsdmalloc.o */ From ecdd20cf9de67ab17660507f485fed676565cd25 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 8 Jun 2011 16:06:32 +0100 Subject: [PATCH 3/4] ENH: cylinder/Allrun: keep backup separate --- tutorials/basic/potentialFoam/cylinder/Allrun | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun index bb35ba990c..b9695da975 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allrun +++ b/tutorials/basic/potentialFoam/cylinder/Allrun @@ -12,24 +12,18 @@ application=`getApplication` MAIN_CONTROL_DICT=`foamEtcFile controlDict` if [ -f "$MAIN_CONTROL_DICT" ] then - echo "Modifying ${MAIN_CONTROL_DICT}" - if [ -e ${MAIN_CONTROL_DICT}.org ] - then - echo "File ${MAIN_CONTROL_DICT}.org already exists" - echo "Did Allrun fail in some way and then run again?" - exit 1 - fi + echo "Modifying ${MAIN_CONTROL_DICT} to enable allowSystemOperations" # Clean up on termination and on Ctrl-C - trap 'mv ${MAIN_CONTROL_DICT}.org ${MAIN_CONTROL_DICT} 2>/dev/null; exit 0' \ + trap 'mv ${MAIN_CONTROL_DICT}.$$ ${MAIN_CONTROL_DICT} 2>/dev/null; exit 0' \ EXIT TERM INT - cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.org + cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.$$ echo "Enabling allowSystemOperations in ${MAIN_CONTROL_DICT}." sed \ -e s/"\(allowSystemOperations[ \t]*\)\([0-9]\);"/"\1 1;"/g \ - ${MAIN_CONTROL_DICT}.org > ${MAIN_CONTROL_DICT} + ${MAIN_CONTROL_DICT}.$$ > ${MAIN_CONTROL_DICT} fi cp -r 0.org 0 > /dev/null 2>&1 From df1edc08ac2563052c308080e98f9653cc0acbfc Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 8 Jun 2011 16:11:10 +0100 Subject: [PATCH 4/4] BUG: foamRunTutorials: reverted to non-parallel running --- bin/foamRunTutorials | 49 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials index 2893be0a2c..d98b87ccb1 100755 --- a/bin/foamRunTutorials +++ b/bin/foamRunTutorials @@ -38,29 +38,29 @@ # normally use "make" make="make" -# set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set -if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ] -then - WM_NCOMPPROCS=$(wmakeScheduler -count) - [ $? -eq 0 ] || unset WM_NCOMPPROCS -fi - -if [ "$WM_NCOMPPROCS" ] -then - if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ] - then - lockDir=$HOME/.$WM_PROJECT/.wmake - - if [ -d $lockDir ] - then - rm -f $lockDir/* - else - mkdir -p $lockDir - fi - - make="make --no-print-directory -j "$WM_NCOMPPROCS - fi -fi +## set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set +#if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ] +#then +# WM_NCOMPPROCS=$(wmakeScheduler -count) +# [ $? -eq 0 ] || unset WM_NCOMPPROCS +#fi +# +#if [ "$WM_NCOMPPROCS" ] +#then +# if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ] +# then +# lockDir=$HOME/.$WM_PROJECT/.wmake +# +# if [ -d $lockDir ] +# then +# rm -f $lockDir/* +# else +# mkdir -p $lockDir +# fi +# +# make="make --no-print-directory -j "$WM_NCOMPPROCS +# fi +#fi @@ -103,7 +103,8 @@ else # fi #done FOAM_TARGETS=$(for d in *; do [ -d "$d" ] && echo "$d"; done | xargs) - $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript" + #$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript" + $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$thisScript" fi #------------------------------------------------------------------------------