COMP: refactoring to resolve compiler warnings - see #886

applications/solvers/combustion/fireFoam/createFields.H

@@ -102,28 +102,6 @@ forAll(Y, i)
 }
 fields.add(thermo.he());
 
-IOdictionary additionalControlsDict
-(
-    IOobject
-    (
-        "additionalControls",
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ_IF_MODIFIED,
-        IOobject::NO_WRITE
-    )
-);
-
-bool solvePrimaryRegion
-(
-    additionalControlsDict.lookupOrDefault("solvePrimaryRegion", true)
-);
-
-bool solvePyrolysisRegion
-(
-    additionalControlsDict.lookupOrDefault("solvePyrolysisRegion", true)
-);
-
 volScalarField Qdot
 (
     IOobject

applications/solvers/combustion/fireFoam/createRegionControls.H

@@ -0,0 +1,23 @@
+IOdictionary additionalControlsDict
+(
+    IOobject
+    (
+        "additionalControls",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    )
+);
+
+bool solvePrimaryRegion
+(
+    additionalControlsDict.lookupOrDefault("solvePrimaryRegion", true)
+);
+
+bool solvePyrolysisRegion
+(
+    additionalControlsDict.lookupOrDefault("solvePyrolysisRegion", true)
+);
+
+scalar maxDi = pyrolysis.maxDiff();

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
-    #include "readPyrolysisTimeControls.H"
+    #include "createRegionControls.H"
 
     turbulence->validate();
 

applications/solvers/combustion/fireFoam/readPyrolysisTimeControls.H

@@ -1,34 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    readPyrolysisTimeControls
-
-Description
-
-
-\*---------------------------------------------------------------------------*/
-
-scalar maxDi = pyrolysis.maxDiff();
-
-// ************************************************************************* //