Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -229,8 +229,24 @@ curvatureSeparation::curvatureSeparation
     deltaByR1Min_(coeffs().lookupOrDefault<scalar>("deltaByR1Min", 0.0)),
     definedPatchRadii_(),
     magG_(mag(owner.g().value())),
-    gHat_(owner.g().value()/magG_)
+    gHat_(vector::zero)
 {
+    if (magG_ < ROOTVSMALL)
+    {
+        FatalErrorIn
+        (
+            "curvatureSeparation::curvatureSeparation"
+            "("
+                "const surfaceFilmModel&, "
+                "const dictionary&"
+            ")"
+        )
+            << "Acceleration due to gravity must be non-zero"
+            << exit(FatalError);
+    }
+
+    gHat_ = owner.g().value()/magG_;
+
     List<Tuple2<word, scalar> > prIn(coeffs().lookup("definedPatchRadii"));
     const wordList& allPatchNames = owner.regionMesh().boundaryMesh().names();
 

src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H

@@ -57,8 +57,7 @@ namespace Foam
     (                                                                         \
         SS##Comp##SThermo##GThermo,                                           \
         (word(SS::typeName_()) + "<"#Comp"," + SThermo::typeName() + "," +    \
-        GThermo::typeName() +                                                 \
-        ">").c_str(),                                                         \
+        GThermo::typeName() + ">").c_str(),                                   \
         0                                                                     \
     );
 

src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H

@@ -52,8 +52,8 @@ namespace Foam
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
         SS##Schem##Comp##SThermo##GThermo,                                    \
-        (#SS"<"#Schem"<"#Comp"," + SThermo::typeName() + ","                  \
-      + GThermo::typeName() + ">>").c_str(),                                  \
+        (#SS"<" + word(Schem::typeName_()) + "<"#Comp"," + SThermo::typeName()\
+      + ","  + GThermo::typeName() + ">>").c_str(),                           \
         0                                                                     \
     );                                                                        \
                                                                               \
@@ -76,7 +76,6 @@ namespace Foam
         GThermo                                                               \
     );                                                                        \
                                                                               \
-                                                                              \
     makeSolidChemistrySolverType                                              \
     (                                                                         \
         ode,                                                                  \

tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes

@@ -33,6 +33,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(thermo:alpha,h) Gauss linear uncorrected;
+    laplacian(kappa,T) Gauss harmonic uncorrected;
 }
 
 interpolationSchemes