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

applications/solvers/heatTransfer/buoyantBaffleSimpleFoam/Make/options

@@ -16,4 +16,5 @@ EXE_LIBS = \
     -lcompressibleRASModels \
     -lfiniteVolume \
     -lmeshTools \
-    -lthermoBaffleModels
+    -lthermoBaffleModels \
+    -lregionModels

applications/utilities/miscellaneous/foamDebugSwitches/Make/options

@@ -43,10 +43,10 @@ EXE_LIBS = \
     -lmeshTools \
     -lmolecularMeasurements \
     -lmolecule \
-    -lmultiphaseInterFoam \
+/*    -lmultiphaseInterFoam  */ \
     -lODE \
     -lOpenFOAM \
-    -lphaseModel \
+/*    -lphaseModel  */ \
     -lpotential \
     -lradiationModels \
     -lrandomProcesses \

src/finiteVolume/Make/files

@@ -29,7 +29,6 @@ derivedFvPatches = $(fvPatches)/derived
 $(derivedFvPatches)/wall/wallFvPatch.C
 $(derivedFvPatches)/directMapped/directMappedFvPatch.C
 $(derivedFvPatches)/directMapped/directMappedWallFvPatch.C
-$(derivedFvPatches)/directMapped/directMappedVariableThicknessWallFvPatch.C
 
 wallDist = fvMesh/wallDist
 $(wallDist)/wallPointYPlus/wallPointYPlus.C

src/finiteVolume/Make/options

 EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -lOpenFOAM \
     -ltriSurface \
-    -lmeshTools \
-    -lregionModels
+    -lmeshTools

src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C

@@ -44,13 +44,10 @@ void Foam::cyclicFvPatch::makeWeights(scalarField& w) const
 {
     const cyclicFvPatch& nbrPatch = neighbFvPatch();
 
-    const scalarField& magFa = magSf();
-    const scalarField& nbrMagFa = nbrPatch.magSf();
-
     const scalarField deltas(nf() & fvPatch::delta());
     const scalarField nbrDeltas(nbrPatch.nf() & nbrPatch.fvPatch::delta());
 
-    forAll(magFa, facei)
+    forAll(deltas, facei)
     {
         scalar di = deltas[facei];
         scalar dni = nbrDeltas[facei];

src/regionModels/regionModel/Make/files

@@ -3,5 +3,7 @@ regionModel/regionModel.C
 singleLayerRegion/singleLayerRegion.C
 regionModel1D/regionModel1D.C
 
+/* Boundary conditions */
+derivedFvPatches/directMappedVariableThicknessWall/directMappedVariableThicknessWallFvPatch.C
 
 LIB = $(FOAM_LIBBIN)/libregionModels

src/regionModels/thermoBaffleModels/noThermo/noThermo.C

@@ -64,13 +64,12 @@ noThermo::~noThermo()
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void noThermo::preEvolveRegion()
-{
-}
+{}
 
 
 void noThermo::evolveRegion()
-{
-}
+{}
+
 
 const tmp<volScalarField> noThermo::Cp() const
 {
@@ -103,6 +102,7 @@ const volScalarField& noThermo::kappa() const
     return volScalarField::null();
 }
 
+
 const volScalarField& noThermo::rho() const
 {
     FatalErrorIn("const volScalarField& noThermo::rho() const")
@@ -110,6 +110,7 @@ const volScalarField& noThermo::rho() const
     return volScalarField::null();
 }
 
+
 const volScalarField& noThermo::K() const
 {
    FatalErrorIn("const volScalarField& noThermo::K() const")
@@ -117,6 +118,7 @@ const volScalarField& noThermo::K() const
     return volScalarField::null();
 }
 
+
 const volScalarField& noThermo::T() const
 {
     FatalErrorIn("const volScalarField& noThermo::T() const")

src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C

@@ -131,7 +131,6 @@ void thermoBaffle2D::solveEnergy()
     TEqn.solve();
 
     thermo_->correct();
-
 }
 
 
@@ -217,8 +216,7 @@ thermoBaffle2D::~thermoBaffle2D()
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void thermoBaffle2D::preEvolveRegion()
-{
-}
+{}
 
 
 void thermoBaffle2D::evolveRegion()
@@ -229,31 +227,37 @@ void thermoBaffle2D::evolveRegion()
     }
 }
 
+
 const tmp<volScalarField> thermoBaffle2D::Cp() const
 {
     return thermo_->Cp();
 }
 
+
 const volScalarField& thermoBaffle2D::kappa() const
 {
     return thermo_->kappa();
 }
 
+
 const volScalarField& thermoBaffle2D::rho() const
 {
     return thermo_->rho();
 }
 
+
 const volScalarField& thermoBaffle2D::K() const
 {
     return thermo_->K();
 }
 
+
 const volScalarField& thermoBaffle2D::T() const
 {
     return T_;
 }
 
+
 void thermoBaffle2D::info() const
 {
     Info<< indent << "min/max(T) = " << min(T_).value() << ", "
@@ -275,6 +279,7 @@ void thermoBaffle2D::info() const
     }
 }
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // end namespace thermoBaffleModels

src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H

@@ -80,6 +80,7 @@ protected:
             //- Number of non orthogonal correctors
             label nNonOrthCorr_;
 
+
         // Thermo properties
 
             //- Solid thermo
@@ -88,6 +89,7 @@ protected:
             //- Temperature / [K]
             volScalarField& T_;
 
+
         // Source term fields
 
             //- Surface energy source  / [J/m2/s]

src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2DI.H

@@ -50,7 +50,7 @@ inline tmp<scalarField> thermoBaffle2D::hs
     const label patchI
 ) const
 {
-    const scalarField& Cp = thermo_->Cp()().boundaryField()[patchI];
+    const scalarField Cp(thermo_->Cp(patchI));
     return Cp*(T - 298.15);
 }
 

src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C

@@ -74,7 +74,7 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
     {
         const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
 
-        // Check if region mesh in oneD
+        // Check if region mesh in 1-D
         label nTotalEdges = 0;
         const label patchi = intCoupledPatchIDs_[0];
         nTotalEdges = 2*nLayers_*rbm[patchi].nInternalEdges();
@@ -113,10 +113,10 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
                 FatalErrorIn
                 (
                     "thermoBaffleModel::thermoBaffleModel"
-                    "(\n"
-                    "   const word& modelType,"
-                    "   const fvMesh& mesh"
-                    ")\n"
+                    "("
+                    "   const word&,"
+                    "   const fvMesh&"
+                    ")"
                 )   << "\n    patch type '" << pp.type()
                     << "' not type '"
                     << directMappedVariableThicknessWallPolyPatch::typeName
@@ -129,10 +129,10 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
                 FatalErrorIn
                 (
                     "thermoBaffleModel::thermoBaffleModel"
-                    "(\n"
-                    "   const word& modelType,"
-                    "   const fvMesh& mesh"
-                    ")\n"
+                    "("
+                    "   const word&,"
+                    "   const fvMesh&"
+                    ")"
                 )   << "\n    patch type '" << pp.type()
                     << "' not type '"
                     << directMappedWallPolyPatch::typeName
@@ -161,8 +161,8 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
                 (
                     "thermoBaffleModel::thermoBaffleModel"
                     "("
-                    "   const word& modelType,"
-                    "   const fvMesh& mesh"
+                    "   const word&,"
+                    "   const fvMesh&"
                     ")"
                 )   << " coupled patches in thermoBaffle are " << nl
                     << " different sizes from list thickness" << nl
@@ -188,7 +188,6 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
                 }
             }
         }
-
     }
 }
 
@@ -202,8 +201,7 @@ thermoBaffleModel::~thermoBaffleModel()
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void thermoBaffleModel::preEvolveRegion()
-{
-}
+{}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H

@@ -173,7 +173,6 @@ public:
 
             //- Pre-evolve region
             virtual void preEvolveRegion();
-
 };
 
 

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/H2O

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      H2O;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    sides
+    {
+        type            zeroGradient;
+    }
+    region0_to_wallFilmRegion_wallFilmFaces
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/N2

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      N2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.79;
+
+boundaryField
+{
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    sides
+    {
+        type            zeroGradient;
+    }
+    region0_to_wallFilmRegion_wallFilmFaces
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/O2

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      O2;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.21;
+
+boundaryField
+{
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    sides
+    {
+        type            zeroGradient;
+    }
+    region0_to_wallFilmRegion_wallFilmFaces
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/T

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    location    "0";
+    class       volScalarField;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+    sides
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+    region0_to_wallFilmRegion_wallFilmFaces
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+}
+
+// ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+    sides
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+    region0_to_wallFilmRegion_wallFilmFaces
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    sides
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    region0_to_wallFilmRegion_wallFilmFaces
+    {
+        type            calculated;
+        value           $internalField;
+    }
+}
+
+// ************************************************************************* //