From 820ae84da039fd3a5df9922190650a5f64f0b22e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 14 Oct 2010 16:31:03 +0200 Subject: [PATCH 01/31] STYLE: do not need intermediate variables when calling _foamSource - sh/ksh/bash only, doesn't seem possible for csh --- etc/bashrc | 12 +++--------- etc/settings.csh | 2 ++ etc/settings.sh | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index e194bba3d0..c6aa460846 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -87,8 +87,7 @@ _foamSource() # Add in preset user or site preferences: -foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` && _foamSource $foamPrefs -unset foamPrefs +_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` # Evaluate command-line parameters while [ $# -gt 0 ] @@ -259,13 +258,8 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh # Source user setup files for optional packages # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc` \ - && _foamSource $paraview3 -unset paraview3 - -ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc` \ - && _foamSource $ensight -unset ensight +_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc` +_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc` # Clean environment paths again. Only remove duplicates diff --git a/etc/settings.csh b/etc/settings.csh index d1d9a413fc..8159eed539 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -37,6 +37,8 @@ alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}' # prefix to MANPATH alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}' +#------------------------------------------------------------------------------ + # location of the jobControl directory setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl diff --git a/etc/settings.sh b/etc/settings.sh index 4a1ce214c3..5b53c59f2b 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -60,6 +60,7 @@ _foamAddMan() done } +#------------------------------------------------------------------------------ # location of the jobControl directory export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl From 0b6b6ce184d1eb0761c39a858f8999e3080bad0e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 2 Nov 2010 09:16:26 +0100 Subject: [PATCH 02/31] ENH: StaticAssert to avoid invalid sizing in DynamicField, DynamicList --- src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H | 4 ++++ src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H index fdf1a3c931..f3135fefec 100644 --- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H +++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H @@ -44,6 +44,7 @@ SourceFiles #define DynamicList_H #include "List.H" +#include "StaticAssert.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -78,6 +79,9 @@ class DynamicList : public List { + //- Avoid invalid sizing parameters + StaticAssert((SizeInc || SizeMult) && SizeDiv); + // Private data //- The capacity (allocated size) of the underlying list. diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H index d05d2f5d84..e1870f4f47 100644 --- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H +++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H @@ -37,6 +37,7 @@ SourceFiles #define DynamicField_H #include "Field.H" +#include "StaticAssert.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -71,6 +72,9 @@ class DynamicField : public Field { + //- Avoid invalid sizing parameters + StaticAssert((SizeInc || SizeMult) && SizeDiv); + // Private data //- The capacity (allocated size) of the underlying field. From d5acd22a635bd089fd04cc96f167adc3bf26582d Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 2 Nov 2010 09:32:32 +0100 Subject: [PATCH 03/31] STYLE: use labelUList typedef instead of UList