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

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

@@ -4,6 +4,6 @@ singleLayerRegion/singleLayerRegion.C
 regionModel1D/regionModel1D.C
 
 /* Boundary conditions */
-derivedFvPatchFields/directMappedVariableThicknessWallFvPatch.C
+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 word&,"
-                    "   const fvMesh& mesh"
+                    "   const fvMesh&"
-                    ")\n"
+                    ")"
                 )   << "\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 word&,"
-                    "   const fvMesh& mesh"
+                    "   const fvMesh&"
-                    ")\n"
+                    ")"
                 )   << "\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 word&,"
-                    "   const fvMesh& mesh"
+                    "   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();
-
 };
 
 

src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H

@@ -38,8 +38,6 @@ SourceFiles
 #include "ODEChemistryModel.H"
 #include "IOdictionary.H"
 #include "scalarField.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,21 +67,6 @@ public:
         TypeName("chemistrySolver");
 
 
-        // Declare runtime constructor selection table
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            chemistrySolver,
-            dictionary,
-            (
-                const fvMesh& mesh,
-                const word& ODEModelName,
-                const word& thermoType
-            ),
-            (mesh, ODEModelName, thermoType)
-        );
-
-
     // Constructors
 
         //- Construct from components

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun

@@ -9,10 +9,16 @@ rm -rf constant/polyMesh/sets
 
 runApplication blockMesh
 runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/bottomAir.stl bottomAir
+mv log.surfaceFeatureExtract log.surfaceFeatureExtract.bottom
 runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/heater.stl heater
+mv log.surfaceFeatureExtract log.surfaceFeatureExtract.heater
 runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/leftSolid.stl leftSolid
+mv log.surfaceFeatureExtract log.surfaceFeatureExtract.leftSolid
 runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/rightSolid.stl rightSolid
+mv log.surfaceFeatureExtract log.surfaceFeatureExtract.rightSolid
 runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/topAir.stl topAir
+mv log.surfaceFeatureExtract log.surfaceFeatureExtract.topAir
+
 runApplication snappyHexMesh -overwrite
 runApplication splitMeshRegions -cellZones -overwrite
 

tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict

@@ -299,7 +299,7 @@ meshQualityControls
     //     <0 = inside out tet,
     //      0 = flat tet
     //      1 = regular tet
-    minTetQuality 1e-9;
+    minTetQuality 1e-30;
 
     //- Minimum face area. Set to <0 to disable.
     minArea -1;

tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict

@@ -292,7 +292,7 @@ meshQualityControls
     //     <0 = inside out tet,
     //      0 = flat tet
     //      1 = regular tet
-    minTetQuality 1e-9;
+    minTetQuality 1e-30;
 
     //- Minimum face area. Set to <0 to disable.
     minArea -1;

tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict

@@ -320,7 +320,7 @@ meshQualityControls
     //     <0 = inside out tet,
     //      0 = flat tet
     //      1 = regular tet
-    minTetQuality 1e-9;
+    minTetQuality 1e-30;
 
     //- Minimum face area. Set to <0 to disable.
     minArea -1;