From 6e54723ee01db02e8852d047342ce6b894475917 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 27 Aug 2010 12:59:28 +0100 Subject: [PATCH] Updates, compilation --- etc/apps/paraview3/bashrc | 2 +- etc/apps/paraview3/cshrc | 6 +-- etc/cshrc | 4 +- src/OpenFOAM/Make/files | 13 ++----- src/OpenFOAM/db/IOobject/IOobjectI.H | 2 +- src/OpenFOAM/global/debug/debug.C | 9 +---- src/OpenFOAM/global/debug/debug.H | 2 +- src/OpenFOAM/global/foamVersion.H | 9 ++++- src/OpenFOAM/global/global.Cver | 1 - src/OpenFOAM/primitives/Lists/wordIOList.C | 44 ++++++++++++++++++++++ wmake/rules/General/general | 2 +- 11 files changed, 68 insertions(+), 26 deletions(-) create mode 100644 src/OpenFOAM/primitives/Lists/wordIOList.C diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index f5fdc1e4a..bc9b8399d 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -38,7 +38,7 @@ export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH if [ -r $CMAKE_HOME ]; then # determine the cmake to be used unset CMAKE_HOME -for cmake in cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 +for cmake in cmake-2.8.2 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 do cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH if [ -r $cmake ] diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index 66aaf1841..921bf4860 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -35,7 +35,7 @@ # determine the cmake to be used unsetenv CMAKE_HOME -foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 ) +foreach cmake ( cmake-2.8.2 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 ) set cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH if ( -r $cmake ) then setenv CMAKE_HOME $cmake @@ -44,8 +44,8 @@ foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 ) endif end -if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR paraview-3.6 -if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1 +if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR paraview-3.8 +if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.8.0 setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER diff --git a/etc/cshrc b/etc/cshrc index 044841310..0c15f4cda 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -98,7 +98,9 @@ if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64 if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP # WM_COMPILE_OPTION = Opt | Debug | Prof -if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt +#if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt +#setenv WM_COMPILE_OPTION Opt +setenv WM_COMPILE_OPTION Debug # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index eec21db5d..b67459678 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -63,14 +63,13 @@ coordinateSystems/coordinateSystems.C coordinateSystems/parabolicCylindricalCS.C coordinateSystems/ellipticCylindricalCS.C coordinateSystems/toroidalCS.C -coordinateSystems/cartesianCS.C coordinateSystems/newCoordinateSystem.C coordinateSystems/cylindricalCS.C coordinateSystems/sphericalCS.C -coordinateSystems/coordinateRotation/coordinateRotation/coordinateRotation.C -coordinateSystems/coordinateRotation/EulerCoordinateRotation/EulerCoordinateRotation.C -coordinateSystems/coordinateRotation/STARCDCoordinateRotation/STARCDCoordinateRotation.C -coordinateSystems/coordinateRotation/axisCoordinateRotation/axisCoordinateRotation.C +coordinateSystems/coordinateRotation/coordinateRotation.C +coordinateSystems/coordinateRotation/EulerCoordinateRotation.C +coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C +coordinateSystems/coordinateRotation/axisCoordinateRotation.C primitives/random/Random.C @@ -98,7 +97,6 @@ $(Streams)/token/tokenIO.C IOstreams = $(Streams)/IOstreams $(IOstreams)/IOstream.C -$(IOstreams)/versionNumber.C $(IOstreams)/Istream.C $(IOstreams)/Ostream.C @@ -206,9 +204,6 @@ dimensionedTypes/dimensionedTensor/dimensionedTensor.C matrices/solution/solution.C matrices/constraint/scalarConstraint.C -scalarMatrix = matrices/scalarMatrix -$(scalarMatrix)/scalarMatrix.C - LUscalarMatrix = matrices/LUscalarMatrix $(LUscalarMatrix)/LUscalarMatrix.C $(LUscalarMatrix)/procLduMatrix.C diff --git a/src/OpenFOAM/db/IOobject/IOobjectI.H b/src/OpenFOAM/db/IOobject/IOobjectI.H index 4b4950cf4..f1de065c7 100644 --- a/src/OpenFOAM/db/IOobject/IOobjectI.H +++ b/src/OpenFOAM/db/IOobject/IOobjectI.H @@ -42,7 +42,7 @@ inline Stream& Foam::IOobject::writeBanner(Stream& os, bool noHint) memset(spacesRev, ' ', 40); spacesRev[38 - strlen(Foam::FOAMDevRevisionNumber)] = '\0'; - + spacesSet = true; } diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C index ddb79a3b7..3ade6c181 100644 --- a/src/OpenFOAM/global/debug/debug.C +++ b/src/OpenFOAM/global/debug/debug.C @@ -162,9 +162,9 @@ int Foam::debug::optimisationSwitch(const char* name, const int defaultValue) } -double Foam::debug::debugTolerance +double Foam::debug::tolerances ( - const char* switchName, + const char* name, const double defaultValue ) { @@ -174,10 +174,5 @@ double Foam::debug::debugTolerance ); } -} // End namespace debug - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // ************************************************************************* // diff --git a/src/OpenFOAM/global/debug/debug.H b/src/OpenFOAM/global/debug/debug.H index 762cfdf61..10829f714 100644 --- a/src/OpenFOAM/global/debug/debug.H +++ b/src/OpenFOAM/global/debug/debug.H @@ -75,7 +75,7 @@ namespace debug int optimisationSwitch(const char* name, const int defaultValue = 0); //- Lookup tolerances switch or add default value. - double optimisationSwitch(const char* name, const double defaultValue = 0); + double tolerances(const char* name, const double defaultValue = 0); //- Internal function to lookup a sub-dictionary from controlDict. dictionary& switchSet(const char* subDictName, dictionary*& subDictPtr); diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H index 705351092..2fc78c0c2 100644 --- a/src/OpenFOAM/global/foamVersion.H +++ b/src/OpenFOAM/global/foamVersion.H @@ -35,6 +35,12 @@ Global Description OpenFOAM version number static string. +Global + Foam::FOAMbuild + +Description + OpenFOAM version number static string with build information + SourceFiles global.Cver @@ -48,7 +54,7 @@ SourceFiles namespace Foam { extern const char* const FOAMversion; - extern const char* const FOAMDevRevisionNumber; + extern const char* const FOAMbuild; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,3 +62,4 @@ namespace Foam #endif // ************************************************************************* // + diff --git a/src/OpenFOAM/global/global.Cver b/src/OpenFOAM/global/global.Cver index 49257dcbb..ef77a513b 100644 --- a/src/OpenFOAM/global/global.Cver +++ b/src/OpenFOAM/global/global.Cver @@ -37,7 +37,6 @@ Description const char* const Foam::FOAMversion = "VERSION_STRING"; const char* const Foam::FOAMbuild = "BUILD_STRING"; -const char* const Foam::FOAMDevRevisionNumber = STR_FOAM_DEV_REVISION_NUMBER(FOAM_DEV_REVISION_NUMBER); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/Lists/wordIOList.C b/src/OpenFOAM/primitives/Lists/wordIOList.C new file mode 100644 index 000000000..ee199aa48 --- /dev/null +++ b/src/OpenFOAM/primitives/Lists/wordIOList.C @@ -0,0 +1,44 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright held by original author + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Description + Declaration of IOList ClassNames for IOLists that do not have .C files. + +\*---------------------------------------------------------------------------*/ + +#include "wordIOList.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + defineCompoundTypeName(List, wordList); + addCompoundToRunTimeSelectionTable(List, wordList); + + defineTemplateTypeNameAndDebugWithName(wordIOList, "wordList", 0); + defineTemplateTypeNameAndDebugWithName(wordListIOList, "wordListList", 0); +} + +// ************************************************************************* // diff --git a/wmake/rules/General/general b/wmake/rules/General/general index a146b7987..d7bebaa84 100644 --- a/wmake/rules/General/general +++ b/wmake/rules/General/general @@ -5,7 +5,7 @@ LD = ld FOAM_DEV_REVISION_NUMBER = $(shell foamVersion -revision) -GFLAGS = -D$(WM_ARCH) -D$(WM_PRECISION_OPTION) -DFOAM_DEV_REVISION_NUMBER=$(FOAM_DEV_REVISION_NUMBER) +GFLAGS = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION) GINC = GLIBS = -lm GLIB_LIBS =