songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: refactoring to resolve compiler warnings - see #886

Browse Source
This commit is contained in:
Andrew Heather 2018-06-20 10:56:04 +01:00
parent b6b2f430a3
commit 12e2142db8
15 changed files with 66 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
applications/solvers/DNS/dnsFoam/dnsFoam.C
View File

@ -55,6 +55,13 @@ int main(int argc, char *argv[])
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
label ntot = 1;
forAll(K.nn(), idim)
{
ntot *= K.nn()[idim];
}
const scalar recRootN = 1.0/Foam::sqrt(scalar(ntot));
Info<< nl << "Starting time loop" << endl;
while (runTime.loop())

6
applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
View File

@ -20,9 +20,3 @@
Kmesh K(mesh);
UOprocess forceGen(K, runTime.deltaTValue(), turbulenceProperties);
label ntot = 1;
forAll(K.nn(), idim)
{
ntot *= K.nn()[idim];
}
const scalar recRootN = 1.0/Foam::sqrt(scalar(ntot));

22
applications/solvers/combustion/fireFoam/createFields.H
View File

@ -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

23
applications/solvers/combustion/fireFoam/createRegionControls.H Normal file
View File

@ -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();

2
applications/solvers/combustion/fireFoam/fireFoam.C
View File

@ -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();

34
applications/solvers/combustion/fireFoam/readPyrolysisTimeControls.H
View File

@ -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();
// ************************************************************************* //

1
applications/solvers/incompressible/simpleFoam/overSimpleFoam/createFields.H
View File

@ -44,4 +44,3 @@ autoPtr<incompressible::turbulenceModel> turbulence
#include "createMRF.H"
#include "createOversetFields.H"

1
applications/solvers/incompressible/simpleFoam/overSimpleFoam/overSimpleFoam.C
View File

@ -87,6 +87,7 @@ int main(int argc, char *argv[])
#include "createUpdatedDynamicFvMesh.H"
#include "createControl.H"
#include "createFields.H"
#include "createOversetFields.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"

18
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/createPorousZones.H
View File

@ -1,20 +1,2 @@
IOporosityModelList pZones(mesh);
bool pressureImplicitPorosity(false);
// nUCorrectors used for pressureImplicitPorosity
int nUCorr = 0;
if (pZones.active())
{
// nUCorrectors for pressureImplicitPorosity
nUCorr = simple.dict().lookupOrDefault<int>("nUCorrectors", 0);
if (nUCorr > 0)
{
pressureImplicitPorosity = true;
Info<< "Using pressure implicit porosity" << endl;
}
else
{
Info<< "Using pressure explicit porosity" << endl;
}
}

1
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
View File

@ -55,6 +55,7 @@ int main(int argc, char *argv[])
#include "createControl.H"
#include "createFields.H"
#include "createPorousZones.H"
#include "setPorosityTreatment.H"
#include "initContinuityErrs.H"
turbulence->validate();

19
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/setPorosityTreatment.H Normal file
View File

@ -0,0 +1,19 @@
bool pressureImplicitPorosity(false);
// nUCorrectors used for pressureImplicitPorosity
int nUCorr = 0;
if (pZones.active())
{
// nUCorrectors for pressureImplicitPorosity
nUCorr = simple.dict().lookupOrDefault<int>("nUCorrectors", 0);
if (nUCorr > 0)
{
pressureImplicitPorosity = true;
Info<< "Using pressure implicit porosity" << endl;
}
else
{
Info<< "Using pressure explicit porosity" << endl;
}
}

5
applications/solvers/lagrangian/reactingParcelFoam/createFields.H
View File

@ -103,11 +103,6 @@ forAll(Y, i)
}
fields.add(thermo.he());
bool solvePrimaryRegion
(
pimple.dict().lookupOrDefault("solvePrimaryRegion", true)
);
volScalarField Qdot
(
IOobject

5
applications/solvers/lagrangian/reactingParcelFoam/createRegionControls.H Normal file
View File

@ -0,0 +1,5 @@
bool solvePrimaryRegion
(
pimple.dict().lookupOrDefault("solvePrimaryRegion", true)
);

1
applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
View File

@ -61,6 +61,7 @@ int main(int argc, char *argv[])
#include "createTimeControls.H"
#include "createFields.H"
#include "createFieldRefs.H"
#include "createRegionControls.H"
#include "initContinuityErrs.H"
turbulence->validate();

10
applications/solvers/multiphase/MPPICInterFoam/alphaEqn.H
View File

@ -65,8 +65,14 @@
phic += (mixture.cAlpha()*icAlpha)*fvc::interpolate(mag(U));
}
surfaceScalarField::Boundary& phicBf =
phic.boundaryFieldRef();
// Add the optional shear compression contribution
if (scAlpha > 0)
{
phic +=
scAlpha*mag(mesh.delta() & fvc::interpolate(symm(fvc::grad(U))));
}
surfaceScalarField::Boundary& phicBf = phic.boundaryFieldRef();
// Do not compress interface at non-coupled boundary faces
// (inlets, outlets etc.)