Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

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),

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
+
+// ************************************************************************* //

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;
+}
+
+
+// ************************************************************************* //

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 "infiniteReactionRate.H"
-#include "FallOffReactionRate.H"
-#include "ChemicallyActivatedReactionRate.H"
-#include "LindemannFallOffFunction.H"
-#include "TroeFallOffFunction.H"
-#include "SRIFallOffFunction.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)
 

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 "infiniteReactionRate.H"
-#include "FallOffReactionRate.H"
-#include "ChemicallyActivatedReactionRate.H"
-#include "LindemannFallOffFunction.H"
-#include "TroeFallOffFunction.H"
-#include "SRIFallOffFunction.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)
 

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties

@@ -26,10 +26,10 @@ solution
     {
         schemes
         {
-            rho             explicit;
+            rho             explicit 1;
-            U               explicit;
+            U               explicit 1;
-            Yi              explicit;
+            Yi              explicit 1;
-            hs              explicit;
+            hs              explicit 1;
         }
     }
 

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties

@@ -26,8 +26,8 @@ solution
     {
         schemes
         {
-            U               explicit;
+            U               explicit 1;
-            hs              explicit;
+            hs              explicit 1;
         }
     }
 

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties

@@ -26,10 +26,10 @@ solution
     {
         schemes
         {
-            rho             explicit;
+            rho             explicit 1;
-            U               explicit;
+            U               explicit 1;
-            Yi              explicit;
+            Yi              explicit 1;
-            hs              explicit;
+            hs              explicit 1;
         }
     }
 
@@ -125,15 +125,7 @@ subModels
     {
         patches
         (
-            walls
+            "(walls|cyc.*)"
-            {
-                type        rebound;
-            }
-            cycLeft_half0
-            {
-                type        rebound;
-            }
-            cycLeft_half1
             {
                 type        rebound;
             }

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties

@@ -26,10 +26,10 @@ solution
     {
         schemes
         {
-            rho             explicit;
+            rho             explicit 1;
-            U               explicit;
+            U               explicit 1;
-            Yi              explicit;
+            Yi              explicit 1;
-            hs              explicit;
+            hs              explicit 1;
         }
     }
 

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution

@@ -34,7 +34,7 @@ solvers
         agglomerator     faceAreaPair;
         mergeLevels      1;
 
-        maxIter          100;
+        maxIter          20;
     };
     pFinal
     {

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties

@@ -26,10 +26,10 @@ solution
     {
         schemes
         {
-            rho             explicit;
+            rho             explicit 1;
-            U               explicit;
+            U               explicit 1;
-            Yi              explicit;
+            Yi              explicit 1;
-            hs              explicit;
+            hs              explicit 1;
         }
     }
 

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties

@@ -26,10 +26,10 @@ solution
     {
         schemes
         {
-            rho             explicit;
+            rho             explicit 1;
-            U               explicit;
+            U               explicit 1;
-            Yi              explicit;
+            Yi              explicit 1;
-            hs              explicit;
+            hs              explicit 1;
         }
     }
 

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

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties

@@ -26,7 +26,7 @@ solution
     {
         schemes
         {
-            U               explicit;
+            U               explicit 1;
         }
     }
 

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties

@@ -26,8 +26,8 @@ solution
     {
         schemes
         {
-            U               explicit;
+            U               explicit 1;
-            hs              explicit;
+            hs              explicit 1;
         }
     }