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

src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C

@@ -124,11 +124,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
     const DimensionedField<Type, GeoMesh>& df
 )
 :
-#   ifdef ConstructFromTmp
     regIOobject(df),
-#   else
-    regIOobject(df, true),
-#   endif
     Field<Type>(df),
     mesh_(df.mesh_),
     dimensions_(df.dimensions_)
@@ -142,7 +138,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
     bool reUse
 )
 :
-    regIOobject(df, true),
+    regIOobject(df, reUse),
     Field<Type>(df, reUse),
     mesh_(df.mesh_),
     dimensions_(df.dimensions_)
@@ -169,7 +165,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
     const tmp<DimensionedField<Type, GeoMesh> >& tdf
 )
 :
-    regIOobject(tdf(), true),
+    regIOobject(tdf(), tdf.isTmp()),
     Field<Type>
     (
         const_cast<DimensionedField<Type, GeoMesh>&>(tdf()),

src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C

@@ -46,7 +46,7 @@ waveDisplacementPointPatchVectorField
     fixedValuePointPatchField<vector>(p, iF),
     amplitude_(vector::zero),
     omega_(0.0),
-    waveLength_(vector::zero)
+    waveNumber_(vector::zero)
 {}
 
 
@@ -61,7 +61,7 @@ waveDisplacementPointPatchVectorField
     fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
     omega_(readScalar(dict.lookup("omega"))),
-    waveLength_(dict.lookupOrDefault<vector>("waveLength", vector::zero))
+    waveNumber_(dict.lookupOrDefault<vector>("waveLength", vector::zero))
 {
     if (!dict.found("value"))
     {
@@ -82,7 +82,7 @@ waveDisplacementPointPatchVectorField
     fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
     amplitude_(ptf.amplitude_),
     omega_(ptf.omega_),
-    waveLength_(ptf.waveLength_)
+    waveNumber_(ptf.waveNumber_)
 {}
 
 
@@ -96,7 +96,7 @@ waveDisplacementPointPatchVectorField
     fixedValuePointPatchField<vector>(ptf, iF),
     amplitude_(ptf.amplitude_),
     omega_(ptf.omega_),
-    waveLength_(ptf.waveLength_)
+    waveNumber_(ptf.waveNumber_)
 {}
 
 
@@ -112,7 +112,7 @@ void waveDisplacementPointPatchVectorField::updateCoeffs()
     const polyMesh& mesh = this->dimensionedInternalField().mesh()();
     const Time& t = mesh.time();
 
-    const scalarField points( waveLength_ & patch().localPoints());
+    const scalarField points( waveNumber_ & patch().localPoints());
 
     Field<vector>::operator=
     (
@@ -130,8 +130,8 @@ void waveDisplacementPointPatchVectorField::write(Ostream& os) const
         << amplitude_ << token::END_STATEMENT << nl;
     os.writeKeyword("omega")
         << omega_ << token::END_STATEMENT << nl;
-    os.writeKeyword("waveLength")
-        << waveLength_ << token::END_STATEMENT << nl;
+    os.writeKeyword("waveNumber")
+        << waveNumber_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
 

src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H

@@ -54,7 +54,7 @@ class waveDisplacementPointPatchVectorField
 
         vector amplitude_;
         scalar omega_;
-        vector waveLength_;
+        vector waveNumber_;
 
 
 public:

src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C

@@ -26,6 +26,16 @@ License
 #include "pyrolysisModelCollection.H"
 #include "volFields.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTemplateTypeNameAndDebug
+(
+    Foam::IOPtrList<Foam::regionModels::pyrolysisModels::pyrolysisModel>,
+    0
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace regionModels
@@ -33,11 +43,6 @@ namespace regionModels
 namespace pyrolysisModels
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTemplateTypeNameAndDebug(IOPtrList<pyrolysisModel>, 0);
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 pyrolysisModelCollection::pyrolysisModelCollection