From c6e6cddeb5083e177fb422903bb8413a47374f2c Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 17 Mar 2011 16:30:18 +0000 Subject: [PATCH 1/3] ENH: Added and updated Sergio's infiniteReactionRate --- .../infiniteReactionRate.H | 110 ++++++++++++++++++ .../infiniteReactionRateI.H | 70 +++++++++++ .../reaction/reactions/makeChemkinReactions.C | 19 +-- .../reactions/makeReactionThermoReactions.C | 19 +-- 4 files changed, 204 insertions(+), 14 deletions(-) create mode 100644 src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H create mode 100644 src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H new file mode 100644 index 0000000000..c31e750de2 --- /dev/null +++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H @@ -0,0 +1,110 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2009-2011 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::infiniteReactionRate + +Description + infinite reaction rate. + +SourceFiles + infiniteReactionRateI.H + +\*---------------------------------------------------------------------------*/ + +#ifndef infiniteReactionRate_H +#define infiniteReactionRate_H + +#include "scalarField.H" +#include "typeInfo.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class infiniteReactionRate Declaration +\*---------------------------------------------------------------------------*/ + +class infiniteReactionRate +{ +public: + + // Constructors + + //- Null constructor + inline infiniteReactionRate + (); + + //- Construct from Istream + inline infiniteReactionRate + ( + const speciesTable& species, + const dictionary& dict + ); + + + // Member Functions + + //- Return the type name + static word type() + { + return "infinite"; + } + + inline scalar operator() + ( + const scalar T, + const scalar p, + const scalarField& c + ) const; + + //- Write to stream + inline void write(Ostream& os) const; + + + // Ostream Operator + + inline friend Ostream& operator<< + ( + Ostream&, + const infiniteReactionRate& + ); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "infiniteReactionRateI.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H new file mode 100644 index 0000000000..bfb09b32bf --- /dev/null +++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H @@ -0,0 +1,70 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2009-2011 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 + +\*---------------------------------------------------------------------------*/ + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +inline Foam::infiniteReactionRate::infiniteReactionRate() +{} + + +inline Foam::infiniteReactionRate::infiniteReactionRate +( + const speciesTable&, + const dictionary& +) +{} + + +inline void Foam::infiniteReactionRate::write(Ostream& os) const +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +inline Foam::scalar Foam::infiniteReactionRate::operator() +( + const scalar, + const scalar, + const scalarField& +) const +{ + return (1); +} + + +inline Foam::Ostream& Foam::operator<< +( + Ostream& os, + const infiniteReactionRate& rr +) +{ + os << token::BEGIN_LIST + << token::END_LIST; + return os; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C index f8cac0a271..450eaf2371 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C +++ b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C @@ -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 @@ -27,16 +27,19 @@ License #include "makeReactionThermo.H" #include "ArrheniusReactionRate.H" -#include "thirdBodyArrheniusReactionRate.H" -#include "FallOffReactionRate.H" -#include "ChemicallyActivatedReactionRate.H" -#include "LindemannFallOffFunction.H" -#include "TroeFallOffFunction.H" -#include "SRIFallOffFunction.H" +#include "infiniteReactionRate.H" #include "LandauTellerReactionRate.H" +#include "thirdBodyArrheniusReactionRate.H" + +#include "ChemicallyActivatedReactionRate.H" #include "JanevReactionRate.H" #include "powerSeriesReactionRate.H" +#include "FallOffReactionRate.H" +#include "LindemannFallOffFunction.H" +#include "SRIFallOffFunction.H" +#include "TroeFallOffFunction.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,8 +56,10 @@ defineTemplateRunTimeSelectionTable(gasReaction, dictionary); // * * * * * * * * * * * * * Make CHEMKIN reactions * * * * * * * * * * * * // makeIRNReactions(gasThermoPhysics, ArrheniusReactionRate) +makeIRNReactions(gasThermoPhysics, infiniteReactionRate) makeIRNReactions(gasThermoPhysics, LandauTellerReactionRate) makeIRNReactions(gasThermoPhysics, thirdBodyArrheniusReactionRate) + makeIRReactions(gasThermoPhysics, JanevReactionRate) makeIRReactions(gasThermoPhysics, powerSeriesReactionRate) diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C index d6f0e84dcd..9006dc2b15 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C +++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C @@ -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 @@ -27,16 +27,19 @@ License #include "makeReactionThermo.H" #include "ArrheniusReactionRate.H" -#include "thirdBodyArrheniusReactionRate.H" -#include "FallOffReactionRate.H" -#include "ChemicallyActivatedReactionRate.H" -#include "LindemannFallOffFunction.H" -#include "TroeFallOffFunction.H" -#include "SRIFallOffFunction.H" +#include "infiniteReactionRate.H" #include "LandauTellerReactionRate.H" +#include "thirdBodyArrheniusReactionRate.H" + +#include "ChemicallyActivatedReactionRate.H" #include "JanevReactionRate.H" #include "powerSeriesReactionRate.H" +#include "FallOffReactionRate.H" +#include "LindemannFallOffFunction.H" +#include "SRIFallOffFunction.H" +#include "TroeFallOffFunction.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,8 +56,10 @@ defineTemplateRunTimeSelectionTable(icoPoly8Reaction, dictionary); // * * * * * * * * * * * * * Make CHEMKIN reactions * * * * * * * * * * * * // makeIRNReactions(icoPoly8ThermoPhysics, ArrheniusReactionRate) +makeIRNReactions(icoPoly8ThermoPhysics, infiniteReactionRate) makeIRNReactions(icoPoly8ThermoPhysics, LandauTellerReactionRate) makeIRNReactions(icoPoly8ThermoPhysics, thirdBodyArrheniusReactionRate) + makeIRReactions(icoPoly8ThermoPhysics, JanevReactionRate) makeIRReactions(icoPoly8ThermoPhysics, powerSeriesReactionRate) From 1cbf680a0096af0f6b0725e8ae287e2ac82b952a Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 17 Mar 2011 17:17:26 +0000 Subject: [PATCH 2/3] ENH: lagrangian tutorial updates --- .../constant/coalCloud1Properties | 8 ++++---- .../constant/limestoneCloud1Properties | 4 ++-- .../filter/constant/reactingCloud1Properties | 18 +++++------------- .../constant/reactingCloud1Properties | 8 ++++---- .../parcelInBox/system/fvSolution | 2 +- .../constant/reactingCloud1Properties | 8 ++++---- .../constant/reactingCloud1Properties | 8 ++++---- .../rhoPisoTwinParcelFoam/Make/options | 4 +++- .../constant/kinematicCloud1Properties | 2 +- .../constant/thermoCloud1Properties | 4 ++-- 10 files changed, 30 insertions(+), 36 deletions(-) diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 8b4ca414ad..ff84a8b26c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 7676293a75..a70e2ed0b9 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -26,8 +26,8 @@ solution { schemes { - U explicit; - hs explicit; + U explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index c1025505b5..60ed5924df 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } @@ -125,15 +125,7 @@ subModels { patches ( - walls - { - type rebound; - } - cycLeft_half0 - { - type rebound; - } - cycLeft_half1 + "(walls|cyc.*)" { type rebound; } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index db94abd0f8..2e886ead21 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution index 4d968d60c5..5151a8d8f9 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution @@ -34,7 +34,7 @@ solvers agglomerator faceAreaPair; mergeLevels 1; - maxIter 100; + maxIter 20; }; pFinal { diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 4d8a02f0bb..31418b6c0d 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index f49cbb914f..a249360ee3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options index bb5791463c..e9e6907d81 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options @@ -14,7 +14,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/surfaceFilmModels/lnInclude + -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ + -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude EXE_LIBS = \ -llagrangian \ @@ -29,4 +30,5 @@ EXE_LIBS = \ -lradiationModels \ -lcompressibleRASModels \ -lcompressibleLESModels \ + -lregionModels \ -lsurfaceFilmModels diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index f5de50c4ca..85d0ee01d2 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -26,7 +26,7 @@ solution { schemes { - U explicit; + U explicit 1; } } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 01cc6bd7b0..d7d6897c26 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -26,8 +26,8 @@ solution { schemes { - U explicit; - hs explicit; + U explicit 1; + hs explicit 1; } } From 8a219cb26d97597a8d70f508606b7fa7ee039749 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 17 Mar 2011 17:18:49 +0000 Subject: [PATCH 3/3] BUG: corrected 'patches' lookup for local particle interaction model --- .../PatchInteractionModel/LocalInteraction/LocalInteraction.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C index 20d8997b22..457517b0cd 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C @@ -130,7 +130,7 @@ Foam::LocalInteraction::LocalInteraction ) : PatchInteractionModel(dict, cloud, typeName), - patchData_(cloud.mesh(), this->coeffDict().lookup("patches")), + patchData_(cloud.mesh(), this->coeffDict()), patchIDs_(patchData_.size()), nEscape0_(patchData_.size(), 0), massEscape0_(patchData_.size(), 0.0),