diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 20d8997b22774b985d08b3f96235667778aa2156..457517b0cdab042f17e81e983d3f3565c97e0af0 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<CloudType>::LocalInteraction
)
:
PatchInteractionModel<CloudType>(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),
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 0000000000000000000000000000000000000000..c31e750de224bb4ecd866bbb8eabb41c8b07d774
--- /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 0000000000000000000000000000000000000000..bfb09b32bf4d3f32aa0f663f0b5d7f3eed8dd62c
--- /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 f8cac0a27190838ec589957ded03c715bfa8d497..450eaf2371013e5e0d56b14d160cb919adf212db 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 "infiniteReactionRate.H"
+#include "LandauTellerReactionRate.H"
#include "thirdBodyArrheniusReactionRate.H"
-#include "FallOffReactionRate.H"
+
#include "ChemicallyActivatedReactionRate.H"
-#include "LindemannFallOffFunction.H"
-#include "TroeFallOffFunction.H"
-#include "SRIFallOffFunction.H"
-#include "LandauTellerReactionRate.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 d6f0e84dcdb581687e39c89e69e97a8f1c43d715..9006dc2b15ed2199418b9fee920fe1f51b7e4e77 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 "infiniteReactionRate.H"
+#include "LandauTellerReactionRate.H"
#include "thirdBodyArrheniusReactionRate.H"
-#include "FallOffReactionRate.H"
+
#include "ChemicallyActivatedReactionRate.H"
-#include "LindemannFallOffFunction.H"
-#include "TroeFallOffFunction.H"
-#include "SRIFallOffFunction.H"
-#include "LandauTellerReactionRate.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)
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 8b4ca414ad9d1e1af27ab0c99832907a5217c7ab..ff84a8b26cb94b6bdcc5d2b67cbe908d646a766c 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 7676293a7538f163a797f4354a7207fccaa913a7..a70e2ed0b92777e4640c50616a0152b83b2bec39 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 c1025505b5359614840f228155d46fcb22f61181..60ed5924dff9fe89667c41a8b39cce7f496402f6 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 db94abd0f832b7dc907dc9e2d8158f893c0fd397..2e886ead21a43f556d796c2bd6b39596ce2bfda2 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 4d968d60c59bf6ef8579fe910b489e2a45a497e5..5151a8d8f9bbb47eb59907b58ff65167f85f2e6f 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 4d8a02f0bb2b882dd5e86a710c219508f2b5d9b8..31418b6c0d172f07bbe8ddb497020825c485d06a 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 f49cbb914f303ecb5999cab12517e567ef307bdd..a249360ee3a3b108d855337c30c5873f313fd6d8 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 bb5791463cbc9145de63da409ea861038e242ff8..e9e6907d810b423505d5164acee0b1caeea8d408 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 f5de50c4ca95ed079e322cfff590d0c2e0104dfe..85d0ee01d2117aeea0b0fdbf29763329ea188ddb 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 01cc6bd7b0b4be50f868601b8d6e9f9e669f8c78..d7d6897c269c73faa1c3199652d70009e04807b4 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;
}
}