From bc3600f528e12569e8e36185281d6192bd5a77c3 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 13 Jan 2009 16:35:45 +0000 Subject: [PATCH 01/17] const reference to thermo --- .../PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C | 2 +- .../PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index eaaafc99d4..5adde282fa 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - basicThermo& thermophysicalModel + const basicThermo& thermophysicalModel ) : RASModel(typeName, rho, U, phi, thermophysicalModel), diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index 0866a28a8e..7a8f7ae54d 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -93,7 +93,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - basicThermo& thermophysicalModel + const basicThermo& thermophysicalModel ); From e059870ad20d816b838303d376f93f25594bbde1 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 14 Jan 2009 10:21:16 +0000 Subject: [PATCH 02/17] typo --- bin/foamEbrowse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/foamEbrowse b/bin/foamEbrowse index 10816c61e0..e303a77264 100755 --- a/bin/foamEbrowse +++ b/bin/foamEbrowse @@ -27,7 +27,7 @@ # foamEbrowse # # Description -# Build the Ebrowse dadbase for all the .C and .H files +# Build the Ebrowse database for all the .C and .H files # #------------------------------------------------------------------------------ headersFile=${TMPDIR:-/tmp}/headersFile.$$ From e16a7676cb6f36df6d030f0a040f544e72798fae Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 14 Jan 2009 10:21:59 +0000 Subject: [PATCH 03/17] minor updates + removed old FoamX cfg option --- bin/foamTemplates/source/foamTemplate.H | 10 +++---- bin/foamTemplates/source/foamUtilTemplate.cfg | 27 ------------------- bin/foamTemplates/source/newSource | 6 +---- .../sourceTemplate/foamTemplateTemplate.H | 5 ++-- 4 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 bin/foamTemplates/source/foamUtilTemplate.cfg diff --git a/bin/foamTemplates/source/foamTemplate.H b/bin/foamTemplates/source/foamTemplate.H index 7390df1aeb..963fc74cdf 100644 --- a/bin/foamTemplates/source/foamTemplate.H +++ b/bin/foamTemplates/source/foamTemplate.H @@ -55,7 +55,7 @@ Ostream& operator<<(Ostream&, const className&); /*---------------------------------------------------------------------------*\ - Class className Declaration + Class className Declaration \*---------------------------------------------------------------------------*/ class className @@ -64,6 +64,7 @@ class className { // Private data + //- Description of data_ dataType data_; @@ -80,7 +81,7 @@ public: // Static data members - //- Static data someStaticData + //- Static data staticData static const dataType staticData; @@ -105,9 +106,8 @@ public: static autoPtr New(); - // Destructor - - ~className(); + //- Destructor + ~className(); // Member Functions diff --git a/bin/foamTemplates/source/foamUtilTemplate.cfg b/bin/foamTemplates/source/foamUtilTemplate.cfg deleted file mode 100644 index 159b04a929..0000000000 --- a/bin/foamTemplates/source/foamUtilTemplate.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// className tool definition - -description ""; - -classNameDict -{ - type dictionary; - description "className control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseTimeArguments; - } - } -} - -// ************************************************************************* // diff --git a/bin/foamTemplates/source/newSource b/bin/foamTemplates/source/newSource index ee357a429b..a06d1bcc73 100755 --- a/bin/foamTemplates/source/newSource +++ b/bin/foamTemplates/source/newSource @@ -40,7 +40,7 @@ usage: $Script * create a new standard OpenFOAM source file -type: (C|H|I|IO|App|cfg) +type: (C|H|I|IO|App) USAGE exit 1 @@ -74,10 +74,6 @@ app|App) wmakeFilesAndOptions fi ;; -cfg) - template=foamUtilTemplate - fileType=$1 - ;; *) usage "unknown type" ;; diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H index 42ad127142..79250a7019 100644 --- a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H +++ b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H @@ -112,9 +112,8 @@ public: static autoPtr > New(); - // Destructor - - ~ClassName(); + //- Destructor + ~ClassName(); // Member Functions From ee416e81058b382a287f952cc9cef45557934b8d Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 14 Jan 2009 11:57:05 +0000 Subject: [PATCH 04/17] promoting MESA paths to top level --- bin/buildParaView3.5-cvs | 2 ++ bin/tools/buildParaViewFunctions | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/buildParaView3.5-cvs b/bin/buildParaView3.5-cvs index fa024f7799..f12a158973 100755 --- a/bin/buildParaView3.5-cvs +++ b/bin/buildParaView3.5-cvs @@ -53,6 +53,8 @@ PYTHON_LIBRARY="" # MESA graphics support: WITH_MESA=OFF +MESA_INCLUDE_DIR="/usr/include/GL" +MESA_LIBRARY="/usr/lib64/libOSMesa.so" # # No further editing below this line diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions index b126a98614..f1da2c0e3e 100644 --- a/bin/tools/buildParaViewFunctions +++ b/bin/tools/buildParaViewFunctions @@ -154,9 +154,6 @@ addMesaSupport() { [ "$WITH_MESA" = ON ] || return - MESA_INCLUDE_DIR=/usr/include/GL - MESA_LIBRARY=/usr/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so - if [ -d "$MESA_INCLUDE_DIR" -a -f "$MESA_LIBRARY" ] then OBJ_ADD="$OBJ_ADD-mesa" @@ -167,6 +164,10 @@ addMesaSupport() else echo "*** Error: no MESA information found" + echo "*** Deactivate MESA support by setting WITH_MESA=OFF, or" + echo "*** correct paths given by:" + echo "*** - MESA_INCLUDE_DIR ($MESA_INCLUDE_DIR)" + echo "*** - MESA_LIBRARY ($MESA_LIBRARY)" exit 1 fi } From 03c7baf7870d172e64f6e44358763c3d991e34b7 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 14 Jan 2009 11:58:03 +0000 Subject: [PATCH 05/17] adding kinematic->dynamic pressure function object --- src/postProcessing/functionObjects/Allwmake | 4 +- .../functionObjects/utilities/Make/files | 4 + .../functionObjects/utilities/Make/options | 9 ++ .../dynamicPressure/IOdynamicPressure.H | 50 ++++++ .../dynamicPressure/dynamicPressure.C | 141 +++++++++++++++++ .../dynamicPressure/dynamicPressure.H | 147 ++++++++++++++++++ .../dynamicPressureFunctionObject.C | 43 +++++ .../dynamicPressureFunctionObject.H | 55 +++++++ 8 files changed, 451 insertions(+), 2 deletions(-) create mode 100644 src/postProcessing/functionObjects/utilities/Make/files create mode 100644 src/postProcessing/functionObjects/utilities/Make/options create mode 100644 src/postProcessing/functionObjects/utilities/dynamicPressure/IOdynamicPressure.H create mode 100644 src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.C create mode 100644 src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.H create mode 100644 src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.H diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake index 48e5f4d856..051f73227f 100755 --- a/src/postProcessing/functionObjects/Allwmake +++ b/src/postProcessing/functionObjects/Allwmake @@ -2,9 +2,9 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso fieldAverage +wmake libso field wmake libso forces -wmake libso minMaxFields +wmake libso utilities wmake libso systemCall # ----------------------------------------------------------------- end-of-file diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files new file mode 100644 index 0000000000..ae95721ac8 --- /dev/null +++ b/src/postProcessing/functionObjects/utilities/Make/files @@ -0,0 +1,4 @@ +dynamicPressure/dynamicPressure.C +dynamicPressure/dynamicPressureFunctionObject.C + +LIB = $(FOAM_LIBBIN)/libutilityFunctionObjects diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options new file mode 100644 index 0000000000..5166bcc9e3 --- /dev/null +++ b/src/postProcessing/functionObjects/utilities/Make/options @@ -0,0 +1,9 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude + +LIB_LIBS = \ + -lfiniteVolume \ + -lmeshTools \ + -lsampling diff --git a/src/postProcessing/functionObjects/utilities/dynamicPressure/IOdynamicPressure.H b/src/postProcessing/functionObjects/utilities/dynamicPressure/IOdynamicPressure.H new file mode 100644 index 0000000000..df3d645bd4 --- /dev/null +++ b/src/postProcessing/functionObjects/utilities/dynamicPressure/IOdynamicPressure.H @@ -0,0 +1,50 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. + \\/ 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 + +Typedef + Foam::IOdynamicPressure + +Description + Instance of the generic IOOutputFilter for dynamicPressure. + +\*---------------------------------------------------------------------------*/ + +#ifndef IOdynamicPressure_H +#define IOdynamicPressure_H + +#include "dynamicPressure.H" +#include "IOOutputFilter.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef IOOutputFilter IOdynamicPressure; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.C b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.C new file mode 100644 index 0000000000..3ad644ab14 --- /dev/null +++ b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.C @@ -0,0 +1,141 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. + \\/ 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 + +\*---------------------------------------------------------------------------*/ + +#include "dynamicPressure.H" +#include "volFields.H" +#include "dictionary.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(dynamicPressure, 0); +} + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +bool Foam::dynamicPressure::isKinematicPressure() +{ + const volScalarField& p = obr_.lookupObject(pName_); + + return p.dimensions() == sqr(dimLength)/sqr(dimTime); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::dynamicPressure::dynamicPressure +( + const word& name, + const objectRegistry& obr, + const dictionary& dict, + const bool loadFromFiles +) +: + name_(name), + obr_(obr), + active_(true), + pName_(dict.lookup("p")), + rho_(readScalar(dict.lookup("rho"))) +{ + // Check if the available mesh is an fvMesh, otherwise deactivate + if (!isA(obr_)) + { + active_ = false; + WarningIn + ( + "dynamicPressure::dynamicPressure" + "(const objectRegistry& obr, const dictionary& dict)" + ) << "No fvMesh available, deactivating." << nl + << endl; + } + else + { + // Check if the pressure is kinematic pressure, otherwise deactivate + if (!isKinematicPressure()) + { + active_ = false; + WarningIn + ( + "dynamicPressure::dynamicPressure" + "(const objectRegistry& obr, const dictionary& dict)" + ) << "Pressure is not kinematic pressure, deactivating." << nl + << endl; + } + } + + read(dict); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::dynamicPressure::~dynamicPressure() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::dynamicPressure::read(const dictionary& dict) +{ + if (active_) + { + dict.lookup("p") >> pName_; + dict.lookup("rho") >> rho_; + } +} + + +void Foam::dynamicPressure::execute() +{ + // Do nothing - only valid on write +} + + +void Foam::dynamicPressure::write() +{ + if (active_) + { + const volScalarField& p = obr_.lookupObject(pName_); + + volScalarField pDyn + ( + IOobject + ( + "pDyn", + obr_.time().timeName(), + obr_, + IOobject::NO_READ + ), + dimensionedScalar("rho", dimDensity, rho_)*p + ); + + pDyn.write(); + } +} + + +// ************************************************************************* // diff --git a/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.H b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.H new file mode 100644 index 0000000000..4c6147583d --- /dev/null +++ b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressure.H @@ -0,0 +1,147 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. + \\/ 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 + +Class + Foam::dynamicPressure + +Description + Converts kinematic pressure to dynamic pressure, from the name of the + pressure field, and density. + +SourceFiles + dynamicPressure.C + IOdynamicPressure.H + +\*---------------------------------------------------------------------------*/ + +#ifndef dynamicPressure_H +#define dynamicPressure_H + +#include "pointFieldFwd.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +class objectRegistry; +class dictionary; +class mapPolyMesh; + +/*---------------------------------------------------------------------------*\ + Class dynamicPressure Declaration +\*---------------------------------------------------------------------------*/ + +class dynamicPressure +{ + // Private data + + //- Name of this set of dynamicPressure objects + word name_; + + const objectRegistry& obr_; + + //- on/off switch + bool active_; + + //- Name of pressure field + word pName_; + + //- Density + scalar rho_; + + + // Private Member Functions + + //- Return true if the pressure field corresponds to kinematic pressure + bool isKinematicPressure(); + + //- Disallow default bitwise copy construct + dynamicPressure(const dynamicPressure&); + + //- Disallow default bitwise assignment + void operator=(const dynamicPressure&); + + +public: + + //- Runtime type information + TypeName("dynamicPressure"); + + + // Constructors + + //- Construct for given objectRegistry and dictionary. + // Allow the possibility to load fields from files + dynamicPressure + ( + const word& name, + const objectRegistry&, + const dictionary&, + const bool loadFromFiles = false + ); + + + // Destructor + + virtual ~dynamicPressure(); + + + // Member Functions + + //- Return name of the set of dynamicPressure + virtual const word& name() const + { + return name_; + } + + //- Read the dynamicPressure data + virtual void read(const dictionary&); + + //- Execute + virtual void execute(); + + //- Calculate the dynamicPressure and write + virtual void write(); + + //- Update for changes of mesh + virtual void updateMesh(const mapPolyMesh&) + {} + + //- Update for changes of mesh + virtual void movePoints(const pointField&) + {} +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.C b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.C new file mode 100644 index 0000000000..cde905e13a --- /dev/null +++ b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.C @@ -0,0 +1,43 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. + \\/ 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 + +\*---------------------------------------------------------------------------*/ + +#include "dynamicPressureFunctionObject.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineNamedTemplateTypeNameAndDebug(dynamicPressureFunctionObject, 0); + + addToRunTimeSelectionTable + ( + functionObject, + dynamicPressureFunctionObject, + dictionary + ); +} + +// ************************************************************************* // diff --git a/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.H b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.H new file mode 100644 index 0000000000..6c5f7da0ba --- /dev/null +++ b/src/postProcessing/functionObjects/utilities/dynamicPressure/dynamicPressureFunctionObject.H @@ -0,0 +1,55 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. + \\/ 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 + +Typedef + Foam::dynamicPressureFunctionObject + +Description + FunctionObject wrapper around dynamicPressure to allow it to be created via + the functions list within controlDict. + +SourceFiles + dynamicPressureFunctionObject.C + +\*---------------------------------------------------------------------------*/ + +#ifndef dynamicPressureFunctionObject_H +#define dynamicPressureFunctionObject_H + +#include "dynamicPressure.H" +#include "OutputFilterFunctionObject.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef OutputFilterFunctionObject + dynamicPressureFunctionObject; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // From 9a1d3aec1d40f25faa66c63aea0e2612947a37dc Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 14 Jan 2009 12:24:09 +0000 Subject: [PATCH 06/17] debug printing --- ...ixedTemperatureCoupledFvPatchScalarField.C | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C index ee7f2943bd..b6bcfffa3f 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C @@ -129,9 +129,20 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::updateCoeffs() { Info<< "solidWallMixedTemperatureCoupledFvPatchScalarField::" << "updateCoeffs() :" + << " patch:" << patch().name() << " walltemperature " - << " min:" << gMin(*this) - << " max:" << gMax(*this) + << " min:" + << returnReduce + ( + (this->size() > 0 ? min(*this) : VGREAT), + minOp() + ) + << " max:" + << returnReduce + ( + (this->size() > 0 ? max(*this) : -VGREAT), + maxOp() + ) << " avg:" << gAverage(*this) << endl; } @@ -163,7 +174,9 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::updateCoeffs() label nTotSize = returnReduce(this->size(), sumOp