diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 27376b14d5e6259e063658e276077cb13dc5a006..0d8011404cf67ce1ae5d2d6c7f10fa78e33a713e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/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();
diff --git a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
index 7f24af81d6babfc994afde1d05a90ac7192d4137..f55698b4359f43d6dcd5a2d4a4feea6252847909 100644
--- a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
+++ b/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 \
);
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
index 447020e2f7ded4490ab5b6b82d2f45d7846063eb..6eb8e9b81b5b9c5ff3a1226aeae8fe412b507981 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
+++ b/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, \
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes
index afb9f402f103f655e60bcebdde33457f94302ce8..7ba1c2cc9d3e61f12a630003a6a8c55beaa363b2 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes
+++ b/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