diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
index fd314151728acac8d6955bbc66331acdf0ad5ac7..c07e51462f343eba652557fe86b12b346a704fb1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
@@ -47,11 +47,22 @@ Foam::liquidMixtureProperties::liquidMixtureProperties
forAll(components_, i)
{
- properties_.set
- (
- i,
- liquidProperties::New(dict.subDict(components_[i]))
- );
+ if (dict.isDict(components_[i]))
+ {
+ properties_.set
+ (
+ i,
+ liquidProperties::New(dict.subDict(components_[i]))
+ );
+ }
+ else
+ {
+ properties_.set
+ (
+ i,
+ liquidProperties::New(components_[i])
+ );
+ }
}
}
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index e8731cd47f1115ad306740f5e43a1afb957df60a..49c88103b519656783c0460a66c18a3a77592830 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -85,6 +85,32 @@ Foam::liquidProperties::liquidProperties(const dictionary& dict)
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
+(
+ const word& name
+)
+{
+ if (debug)
+ {
+ InfoInFunction << "Constructing liquidProperties" << endl;
+ }
+
+ ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+
+ if (cstrIter == ConstructorTablePtr_->end())
+ {
+ FatalErrorInFunction
+ << "Unknown liquidProperties type "
+ << name << nl << nl
+ << "Valid liquidProperties types are:" << nl
+ << ConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
+ }
+
+ return autoPtr<liquidProperties>(cstrIter()());
+}
+
+
Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
(
const dictionary& dict
@@ -101,24 +127,9 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
{
// Backward-compatibility
- const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
-
- if (defaultCoeffs)
+ if (Switch(dict.lookup("defaultCoeffs")))
{
- ConstructorTable::iterator cstrIter =
- ConstructorTablePtr_->find(liquidPropertiesTypeName);
-
- if (cstrIter == ConstructorTablePtr_->end())
- {
- FatalErrorInFunction
- << "Unknown liquidProperties type "
- << liquidPropertiesTypeName << nl << nl
- << "Valid liquidProperties types are:" << nl
- << ConstructorTablePtr_->sortedToc()
- << abort(FatalError);
- }
-
- return autoPtr<liquidProperties>(cstrIter()());
+ return New(liquidPropertiesTypeName);
}
else
{
@@ -132,7 +143,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
<< liquidPropertiesTypeName << nl << nl
<< "Valid liquidProperties types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ << exit(FatalError);
}
return autoPtr<liquidProperties>
@@ -153,7 +164,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
<< liquidPropertiesTypeName << nl << nl
<< "Valid liquidProperties types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ << exit(FatalError);
}
return autoPtr<liquidProperties>(cstrIter()(dict));
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
index 987f81a30e015bae5e41aebd01ea61da21980e51..2f035a1f876e03c76d8b9d3cb078dc1b00fadeab 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
@@ -145,6 +145,9 @@ public:
// Selectors
+ //- Return a pointer to a new liquidProperties created from name
+ static autoPtr<liquidProperties> New(const word& name);
+
//- Return a pointer to a new liquidProperties created from dictionary
static autoPtr<liquidProperties> New(const dictionary& dict);
@@ -300,22 +303,14 @@ public:
//- Read and set the function coefficients
// if present it the given dictionary
template<class Liquid>
- inline void readIfPresent
- (
- Liquid& l,
- const dictionary& dict
- );
+ inline void readIfPresent(Liquid& l, const dictionary& dict);
//- Write the function coefficients
virtual void writeData(Ostream& os) const;
//- Write the data for each of the property functions
template<class Liquid>
- inline void writeData
- (
- const Liquid& l,
- Ostream& os
- ) const;
+ inline void writeData(const Liquid& l, Ostream& os) const;
//- Ostream Operator
friend Ostream& operator<<(Ostream& os, const liquidProperties& l);
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C
index 35474685702d9ca8773666f0089df5afc2120956..ec7cbc0591abd6afd3215ec735e66723a36ac737 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.C
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.C
@@ -50,16 +50,12 @@ Foam::C::C()
}
-Foam::C::C(const solidProperties& s)
-:
- solidProperties(s)
-{}
-
-
Foam::C::C(const dictionary& dict)
:
- solidProperties(dict)
-{}
+ C()
+{
+ readIfPresent(dict);
+}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.H b/src/thermophysicalModels/properties/solidProperties/C/C.H
index 7086df5324c12e1e14e380878b67b481c19ed5ba..7937e75ae9d0ead70596b7b19d8baf143b2ad1b3 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.H
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.H
@@ -42,15 +42,6 @@ SourceFiles
namespace Foam
{
-class C;
-
-Ostream& operator<<
-(
- Ostream&,
- const C&
-);
-
-
/*---------------------------------------------------------------------------*\
Class C Declaration
\*---------------------------------------------------------------------------*/
@@ -59,6 +50,7 @@ class C
:
public solidProperties
{
+
public:
//- Runtime type information
@@ -70,9 +62,6 @@ public:
//- Construct null
C();
- //- Construct from solidProperties
- C(const solidProperties& s);
-
//- Construct from dictionary
C(const dictionary& dict);
@@ -88,12 +77,14 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const;
-
- //- Ostream Operator
- friend Ostream& operator<<(Ostream& os, const C& s);
+ //- Ostream Operator
+ friend Ostream& operator<<(Ostream& os, const C& s);
};
+Ostream& operator<<(Ostream& os, const C& s);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
index 2bcfee1b6dbb2ffac5058022b15ed84ebb8f0896..77a1f057ca73aa9008a614cdc1206860de06ad96 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
@@ -50,16 +50,12 @@ Foam::CaCO3::CaCO3()
}
-Foam::CaCO3::CaCO3(const solidProperties& s)
-:
- solidProperties(s)
-{}
-
-
Foam::CaCO3::CaCO3(const dictionary& dict)
:
- solidProperties(dict)
-{}
+ CaCO3()
+{
+ readIfPresent(dict);
+}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
index 92bcdead4b43635f10593dda908c8c2a154c5e2c..1ffb1f6b195518f401f32ec73675dcc40a51e752 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
@@ -42,15 +42,6 @@ SourceFiles
namespace Foam
{
-class CaCO3;
-
-Ostream& operator<<
-(
- Ostream&,
- const CaCO3&
-);
-
-
/*---------------------------------------------------------------------------*\
Class CaCO3 Declaration
\*---------------------------------------------------------------------------*/
@@ -71,9 +62,6 @@ public:
//- Construct null
CaCO3();
- //- Construct from solidProperties
- CaCO3(const solidProperties& s);
-
//- Construct from dictionary
CaCO3(const dictionary& dict);
@@ -89,13 +77,14 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const;
-
- // Ostream Operator
-
+ //- Ostream Operator
friend Ostream& operator<<(Ostream& os, const CaCO3& s);
};
+Ostream& operator<<(Ostream& os, const CaCO3& s);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
index 4ab67b5cdf69c79484cd0ca3a49512599f413354..f91fd494f4a4b19af6499b942bf460bfaf28c75f 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.C
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
@@ -50,16 +50,12 @@ Foam::ash::ash()
}
-Foam::ash::ash(const solidProperties& s)
-:
- solidProperties(s)
-{}
-
-
Foam::ash::ash(const dictionary& dict)
:
- solidProperties(dict)
-{}
+ ash()
+{
+ readIfPresent(dict);
+}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.H b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
index 5f6e2135b793c1af81e7ed4b24516a6b3260ac7a..b80c0385a15956cf91b314b48fa2a70400ce0e7e 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.H
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
@@ -42,15 +42,6 @@ SourceFiles
namespace Foam
{
-class ash;
-
-Ostream& operator<<
-(
- Ostream&,
- const ash&
-);
-
-
/*---------------------------------------------------------------------------*\
Class ash Declaration
\*---------------------------------------------------------------------------*/
@@ -71,9 +62,6 @@ public:
//- Construct null
ash();
- //- Construct from solidProperties
- ash(const solidProperties& s);
-
//- Construct from dictionary
ash(const dictionary& dict);
@@ -89,13 +77,14 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const;
-
- // Ostream Operator
-
+ //- Ostream Operator
friend Ostream& operator<<(Ostream& os, const ash& s);
};
+Ostream& operator<<(Ostream& os, const ash& s);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
index ea6c0efbc70743154e90d121faae876f65d4da42..df9a4c1f0c4fd5535a372dedebad58c752e335bf 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
@@ -34,9 +34,25 @@ Foam::solidMixtureProperties::solidMixtureProperties(const dictionary& dict)
{
components_ = dict.toc();
properties_.setSize(components_.size());
+
forAll(components_, i)
{
- properties_.set(i, solidProperties::New(dict.subDict(components_[i])));
+ if (dict.isDict(components_[i]))
+ {
+ properties_.set
+ (
+ i,
+ solidProperties::New(dict.subDict(components_[i]))
+ );
+ }
+ else
+ {
+ properties_.set
+ (
+ i,
+ solidProperties::New(components_[i])
+ );
+ }
}
}
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
index cca139220309da58532eef12d1e24003a1004572..1d9eb8fe65a4bae8df7b0c42d7f898673058ca70 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
@@ -40,14 +40,14 @@ Foam::solidProperties::solidProperties
(
scalar rho,
scalar Cp,
- scalar K,
+ scalar kappa,
scalar Hf,
scalar emissivity
)
:
rho_(rho),
Cp_(Cp),
- kappa_(K),
+ kappa_(kappa),
Hf_(Hf),
emissivity_(emissivity)
{}
@@ -57,7 +57,12 @@ Foam::solidProperties::solidProperties(const dictionary& dict)
:
rho_(readScalar(dict.lookup("rho"))),
Cp_(readScalar(dict.lookup("Cp"))),
- kappa_(readScalar(dict.lookup("K"))),
+ kappa_
+ (
+ dict.found("K")
+ ? readScalar(dict.lookup("K"))
+ : readScalar(dict.lookup("kappa"))
+ ),
Hf_(readScalar(dict.lookup("Hf"))),
emissivity_(readScalar(dict.lookup("emissivity")))
{}
@@ -65,6 +70,17 @@ Foam::solidProperties::solidProperties(const dictionary& dict)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+void Foam::solidProperties::readIfPresent(const dictionary& dict)
+{
+ dict.readIfPresent("rho", rho_);
+ dict.readIfPresent("Cp", Cp_);
+ dict.readIfPresent("K", kappa_);
+ dict.readIfPresent("kappa", kappa_);
+ dict.readIfPresent("Hf_", Hf_);
+ dict.readIfPresent("emissivity", emissivity_);
+}
+
+
void Foam::solidProperties::writeData(Ostream& os) const
{
os << rho_ << token::SPACE
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
index f42e84be646efb0023b604b2139dd5cd86b3f3e1..652c81d8fd711fc94703b5c91ced63857d62a451 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
@@ -45,22 +45,12 @@ SourceFiles
namespace Foam
{
-class solidProperties;
-
-Ostream& operator<<
-(
- Ostream&,
- const solidProperties&
-);
-
-
/*---------------------------------------------------------------------------*\
Class solidProperties Declaration
\*---------------------------------------------------------------------------*/
class solidProperties
{
-
// Private data
//- Density [kg/m3]
@@ -113,7 +103,7 @@ public:
(
scalar rho,
scalar Cp,
- scalar K,
+ scalar kappa,
scalar Hf,
scalar emissivity
);
@@ -130,6 +120,9 @@ public:
// Selectors
+ //- Return a pointer to a new solidProperties created from name
+ static autoPtr<solidProperties> New(const word& name);
+
//- Return a pointer to a new solidProperties created from dictionary
static autoPtr<solidProperties> New(const dictionary& dict);
@@ -162,18 +155,22 @@ public:
inline scalar emissivity() const;
- // I-O
-
- //- Write the solidProperties properties
- virtual void writeData(Ostream& os) const;
+ // I-O
+ //- Read and set the properties present it the given dictionary
+ void readIfPresent(const dictionary& dict);
- // Ostream Operator
+ //- Write the solidProperties properties
+ virtual void writeData(Ostream& os) const;
+ //- Ostream Operator
friend Ostream& operator<<(Ostream& os, const solidProperties& s);
};
+Ostream& operator<<(Ostream&, const solidProperties&);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
index 66f6d8f96ec520b9f24cee98d9f2782cc07a286f..75463513e1e1cab4014f7b90582d805cb11672f1 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -28,6 +28,32 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
+(
+ const word& name
+)
+{
+ if (debug)
+ {
+ InfoInFunction << "Constructing solidProperties" << endl;
+ }
+
+ ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+
+ if (cstrIter == ConstructorTablePtr_->end())
+ {
+ FatalErrorInFunction
+ << "Unknown solidProperties type "
+ << name << nl << nl
+ << "Valid solidProperties types are:" << nl
+ << ConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
+ }
+
+ return autoPtr<solidProperties>(cstrIter()());
+}
+
+
Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
(
const dictionary& dict
@@ -40,31 +66,38 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
const word solidType(dict.dictName());
- if (!dict.found("defaultCoeffs") || Switch(dict.lookup("defaultCoeffs")))
+ if (dict.found("defaultCoeffs"))
{
- ConstructorTable::iterator cstrIter =
- ConstructorTablePtr_->find(solidType);
+ // Backward-compatibility
- if (cstrIter == ConstructorTablePtr_->end())
+ if (Switch(dict.lookup("defaultCoeffs")))
{
- FatalErrorInFunction
- << "Unknown solidProperties type " << solidType << nl << nl
- << "Valid solidProperties types are :" << endl
- << ConstructorTablePtr_->sortedToc()
- << exit(FatalError);
+ return New(solidType);
+ }
+ else
+ {
+ return autoPtr<solidProperties>
+ (
+ new solidProperties(dict.subDict(solidType + "Coeffs"))
+ );
}
-
- return autoPtr<solidProperties>(cstrIter()());
}
else
{
- return autoPtr<solidProperties>
- (
- new solidProperties
- (
- dict.subDict(solidType + "Coeffs")
- )
- );
+ dictionaryConstructorTable::iterator cstrIter =
+ dictionaryConstructorTablePtr_->find(solidType);
+
+ if (cstrIter == dictionaryConstructorTablePtr_->end())
+ {
+ FatalErrorInFunction
+ << "Unknown solidProperties type "
+ << solidType << nl << nl
+ << "Valid solidProperties types are:" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
+ }
+
+ return autoPtr<solidProperties>(cstrIter()(dict));
}
}
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 5b7081583d46e921ad04ef791c235aea5dcad072..6fcb7f95c5f6678acdb82fd4a5a3c55a012da41f 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -36,26 +36,21 @@ inertSpecie N2;
liquids
{
- H2O {}
+ H2O;
}
solids
{
C
{
- defaultCoeffs no;
-
- CCoeffs
- {
- rho 2010;
- Cp 710;
- K 0.04;
- Hf 0;
- emissivity 1.0;
- }
+ rho 2010;
+ Cp 710;
+ kappa 0.04;
+ Hf 0;
+ emissivity 1.0;
}
- ash {}
+ ash;
}
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
index 4f5a09da7187c70384e50124c5eaa24e886cc000..b005f75a2c9bdd6e6966bb15dd71ec257cf9bd7c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie N2;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
index 4f5a09da7187c70384e50124c5eaa24e886cc000..b005f75a2c9bdd6e6966bb15dd71ec257cf9bd7c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie N2;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
index 4f5a09da7187c70384e50124c5eaa24e886cc000..b005f75a2c9bdd6e6966bb15dd71ec257cf9bd7c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie N2;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
index 4f5a09da7187c70384e50124c5eaa24e886cc000..b005f75a2c9bdd6e6966bb15dd71ec257cf9bd7c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie N2;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index 4d387a46f6169e6beaa782d524c0a0c038673fe6..d90945b4e9916849f03eaebd2c12b38b87db11ea 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index ee162cff25b597c17459cb801e09b35677ac9fb7..1bc265d1736fe384cfd41b4f3651e673126c3243 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -38,7 +38,7 @@ inertSpecie air;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index ee162cff25b597c17459cb801e09b35677ac9fb7..1bc265d1736fe384cfd41b4f3651e673126c3243 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -38,7 +38,7 @@ inertSpecie air;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
index 76f240e5ca35a92f619c0ed9fc50d9929dfb58c4..5cb7a892a9c20592650012ac663858d94fb75831 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie air;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 9eb1bc72334d7a9cfe73fc36e848af024586a89c..b9d9f6647bd6730ccd41a84a593b544b56f23974 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie air;
liquids
{
- H2O {}
+ H2O;
}
solids
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index 4456333c912e59af8a502cbc8dfb5799fdc710a8..e7eac502800fd31b1b56bbef4641fc125bf63b7b 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie N2;
liquids
{
- C7H16 {}
+ C7H16;
}
solids