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

Resolve various unimportant warning messages from Gcc, Clang and Icpc

Browse Source
This commit is contained in:
Henry Weller 2015-07-19 11:31:49 +01:00
parent 6555f605f0
commit 91e04d69c1
129 changed files with 409 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
applications/solvers/basic/potentialFoam/createControls.H Normal file
View File

@ -0,0 +1,9 @@
const dictionary& potentialFlow
(
mesh.solutionDict().subDict("potentialFlow")
);
const int nNonOrthCorr
(
potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
);

5
applications/solvers/basic/potentialFoam/readControls.H
View File

@ -1,5 +0,0 @@
const dictionary& potentialFlow =
mesh.solutionDict().subDict("potentialFlow");
const int nNonOrthCorr =
potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);

4
applications/solvers/combustion/PDRFoam/PDRFoam.C
View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
#include "createFields.H"
#include "createMRF.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
@ -106,7 +106,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"

4
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
View File

@ -83,7 +83,7 @@ int main(int argc, char *argv[])
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
@ -97,7 +97,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"

4
applications/solvers/combustion/XiFoam/XiFoam.C
View File

@ -75,7 +75,7 @@ int main(int argc, char *argv[])
#include "createMRF.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
@ -85,7 +85,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"

1
applications/solvers/combustion/chemFoam/chemFoam.C
View File

@ -54,6 +54,7 @@ int main(int argc, char *argv[])
#include "createSingleCellMesh.H"
#include "createFields.H"
#include "readInitialConditions.H"
#include "createControls.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
applications/solvers/combustion/chemFoam/createControls.H Normal file
View File

@ -0,0 +1,8 @@
if (runTime.controlDict().lookupOrDefault("suppressSolverInfo", false))
{
lduMatrix::debug = 0;
}
Switch adjustTimeStep(runTime.controlDict().lookup("adjustTimeStep"));
scalar maxDeltaT(readScalar(runTime.controlDict().lookup("maxDeltaT")));

9
applications/solvers/combustion/chemFoam/readControls.H
View File

@ -1,8 +1,3 @@
if (runTime.controlDict().lookupOrDefault("suppressSolverInfo", false))
{
lduMatrix::debug = 0;
}
runTime.controlDict().lookup("adjustTimeStep") >> adjustTimeStep;
Switch adjustTimeStep(runTime.controlDict().lookup("adjustTimeStep"));
scalar maxDeltaT(readScalar(runTime.controlDict().lookup("maxDeltaT")));
maxDeltaT = readScalar(runTime.controlDict().lookup("maxDeltaT"));

2
applications/solvers/combustion/engineFoam/readEngineTimeControls.H
View File

@ -1,3 +1,3 @@
#include "readTimeControls.H"
#include "createTimeControls.H"
maxDeltaT = runTime.userTimeToTime(maxDeltaT);

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

@ -62,7 +62,7 @@ int main(int argc, char *argv[])
#include "createPyrolysisModel.H"
#include "createRadiationModel.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
#include "readPyrolysisTimeControls.H"
@ -73,7 +73,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "solidRegionDiffusionNo.H"
#include "setMultiRegionDeltaT.H"

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

@ -48,6 +48,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "readGravitationalAcceleration.H"
@ -57,7 +58,6 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

2
applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
View File

@ -50,6 +50,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
@ -58,7 +59,6 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

2
applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
View File

@ -49,6 +49,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "readGravitationalAcceleration.H"
@ -58,7 +59,6 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

1
applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
View File

@ -47,6 +47,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "createFields.H"
#include "createTimeControls.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
View File

@ -48,6 +48,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
#include "createTimeControls.H"
#include "createRDeltaT.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/createControls.H Normal file
View File

@ -0,0 +1,11 @@
#include "createTimeControls.H"
bool correctPhi
(
pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
);
bool checkMeshCourantNo
(
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
);

9
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/readControls.H
View File

@ -1,7 +1,6 @@
#include "readTimeControls.H"
#include "readTimeControls.H"
bool correctPhi =
pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
bool checkMeshCourantNo =
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
checkMeshCourantNo =
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);

2
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
View File

@ -64,10 +64,10 @@ int main(int argc, char *argv[])
#include "createFvOptions.H"
#include "createRhoUf.H"
#include "CourantNo.H"
#include "createControls.H"
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

2
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
View File

@ -52,6 +52,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
@ -60,7 +61,6 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

2
applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "readControls.H"
#include "createControls.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"

3
applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,7 +56,6 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readTimeControls.H"
#include "compressibleCourantNo.H"
solve(fvm::ddt(rho) + fvc::div(phi));

4
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
View File

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
#include "createMRF.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
@ -80,7 +80,7 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "setDeltaT.H"

4
applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
View File

@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "createFvOptions.H"
#include "createRadiationModel.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
@ -67,7 +67,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"

5
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
View File

@ -63,7 +63,7 @@ int main(int argc, char *argv[])
#include "createSolidFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "readSolidTimeControls.H"
@ -73,7 +73,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "readSolidTimeControls.H"
#include "readPIMPLEControls.H"
@ -89,7 +89,6 @@ int main(int argc, char *argv[])
{
forAll(fluidRegions, i)
{
#include "setRegionFluidFields.H"
#include "storeOldFluidFields.H"
}
}

7
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
View File

@ -1,5 +1,4 @@
const dictionary& simple = solidRegions[i].solutionDict().subDict("SIMPLE");
const int nNonOrthCorr =
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
const dictionary& simple = mesh.solutionDict().subDict("SIMPLE");
const int nNonOrthCorr =
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);

4
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
View File

@ -5,8 +5,8 @@
(
(
thermo.isotropic()
? -fvm::laplacian(betav*thermo.alpha(), h, "laplacian(alpha,h)")
: -fvm::laplacian(betav*taniAlpha(), h, "laplacian(alpha,h)")
? -fvm::laplacian(betav*thermo.alpha(), h, "laplacian(alpha,h)")
: -fvm::laplacian(betav*taniAlpha(), h, "laplacian(alpha,h)")
)
==
fvOptions(rho, h)

4
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/storeOldFluidFields.H
View File

@ -1,2 +1,2 @@
p_rgh.storePrevIter();
rho.storePrevIter();
p_rghFluid[i].storePrevIter();
rhoFluid[i].storePrevIter();

6
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H
View File

@ -1,4 +1,4 @@
const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
int nNonOrthCorr =
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
int nNonOrthCorr =
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);

47
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
View File

@ -1,33 +1,32 @@
fvMesh& mesh = solidRegions[i];
solidThermo& thermo = thermos[i];
const radiation::radiationModel& radiation = radiations[i];
fvMesh& mesh = solidRegions[i];
solidThermo& thermo = thermos[i];
tmp<volScalarField> trho = thermo.rho();
const volScalarField& rho = trho();
tmp<volScalarField> trho = thermo.rho();
const volScalarField& rho = trho();
tmp<volScalarField> tcp = thermo.Cp();
const volScalarField& cp = tcp();
tmp<volScalarField> tcp = thermo.Cp();
const volScalarField& cp = tcp();
tmp<volSymmTensorField> taniAlpha;
if (!thermo.isotropic())
{
volSymmTensorField& aniAlpha = aniAlphas[i];
tmp<volVectorField> tkappaByCp = thermo.Kappa()/cp;
const coordinateSystem& coodSys = coordinates[i];
tmp<volSymmTensorField> taniAlpha;
if (!thermo.isotropic())
{
volSymmTensorField& aniAlpha = aniAlphas[i];
tmp<volVectorField> tkappaByCp = thermo.Kappa()/cp;
const coordinateSystem& coodSys = coordinates[i];
aniAlpha.internalField() =
coodSys.R().transformVector(tkappaByCp());
aniAlpha.correctBoundaryConditions();
aniAlpha.internalField() =
coodSys.R().transformVector(tkappaByCp());
aniAlpha.correctBoundaryConditions();
taniAlpha = tmp<volSymmTensorField>
(
new volSymmTensorField(aniAlpha)
);
}
taniAlpha = tmp<volSymmTensorField>
(
new volSymmTensorField(aniAlpha)
);
}
volScalarField& h = thermo.he();
volScalarField& h = thermo.he();
const volScalarField& betav = betavSolid[i];
const volScalarField& betav = betavSolid[i];
fv::IOoptionList& fvOptions = solidHeatSources[i];
fv::IOoptionList& fvOptions = solidHeatSources[i];

1
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
View File

@ -49,6 +49,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createFields.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"

11
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H Normal file
View File

@ -0,0 +1,11 @@
#include "createTimeControls.H"
bool correctPhi
(
pimple.dict().lookupOrDefault("correctPhi", false)
);
bool checkMeshCourantNo
(
pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
);

2
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
View File

@ -56,7 +56,7 @@ int main(int argc, char *argv[])
#include "createUf.H"
#include "createMRF.H"
#include "createFvOptions.H"
#include "readTimeControls.H"
#include "createControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"

8
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H
View File

@ -1,7 +1,5 @@
#include "readTimeControls.H"
#include "readTimeControls.H"
const bool correctPhi =
pimple.dict().lookupOrDefault("correctPhi", false);
correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
const bool checkMeshCourantNo =
pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);

1
applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
View File

@ -51,6 +51,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"

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

@ -60,6 +60,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"

2
applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
View File

@ -58,6 +58,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "readGravitationalAcceleration.H"
@ -69,7 +70,6 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

4
applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
View File

@ -59,7 +59,7 @@ int main(int argc, char *argv[])
#include "createRadiationModel.H"
#include "createSurfaceFilmModel.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
@ -69,7 +69,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setMultiRegionDeltaT.H"
#include "setDeltaT.H"

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

@ -54,6 +54,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
@ -64,7 +65,6 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

7
applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C
View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "readTimeControls.H"
#include "createControls.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createRhoUf.H"
@ -104,6 +104,11 @@ int main(int argc, char *argv[])
}
}
if (mesh.changing() && checkMeshCourantNo)
{
#include "meshCourantNo.H"
}
parcels.evolve();
#include "rhoEqn.H"

2
applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H
View File

@ -1,3 +1,3 @@
#include "readTimeControls.H"
#include "createTimeControls.H"
maxDeltaT = runTime.userTimeToTime(maxDeltaT);

4
applications/solvers/lagrangian/sprayFoam/sprayFoam.C
View File

@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "createClouds.H"
#include "createRadiationModel.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
@ -67,7 +67,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"

3
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
View File

@ -48,12 +48,11 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "initContinuityErrs.H"
pimpleControl pimple(mesh);
#include "readThermodynamicProperties.H"
#include "readControls.H"
#include "createControls.H"
#include "createFields.H"
#include "createUf.H"
#include "createPcorrTypes.H"

11
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H Normal file
View File

@ -0,0 +1,11 @@
#include "createTimeControls.H"
scalar maxAcousticCo
(
readScalar(runTime.controlDict().lookup("maxAcousticCo"))
);
bool correctPhi
(
pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
);

9
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H
View File

@ -1,9 +1,4 @@
#include "readTimeControls.H"
scalar maxAcousticCo
(
readScalar(runTime.controlDict().lookup("maxAcousticCo"))
);
bool correctPhi =
pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));
correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);

3
applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
View File

@ -50,9 +50,8 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "readThermodynamicProperties.H"
#include "readControls.H"
#include "createControls.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"

6
applications/solvers/multiphase/cavitatingFoam/createControls.H Normal file
View File

@ -0,0 +1,6 @@
#include "createTimeControls.H"
scalar maxAcousticCo
(
readScalar(runTime.controlDict().lookup("maxAcousticCo"))
);

5
applications/solvers/multiphase/cavitatingFoam/readControls.H
View File

@ -1,6 +1,3 @@
#include "readTimeControls.H"
scalar maxAcousticCo
(
readScalar(runTime.controlDict().lookup("maxAcousticCo"))
);
maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));

5
applications/solvers/multiphase/compressibleInterFoam/alphaControls.H Normal file
View File

@ -0,0 +1,5 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));

2
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
View File

@ -62,7 +62,7 @@ int main(int argc, char *argv[])
#include "createFields.H"
#include "createUf.H"
#include "readControls.H"
#include "createControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"

11
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H Normal file
View File

@ -0,0 +1,11 @@
#include "createTimeControls.H"
bool correctPhi
(
pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
);
bool checkMeshCourantNo
(
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
);

9
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
View File

@ -1,7 +1,6 @@
#include "readTimeControls.H"
#include "readTimeControls.H"
bool correctPhi =
pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
bool checkMeshCourantNo =
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
checkMeshCourantNo =
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);

5
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
View File

@ -56,8 +56,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "readTimeControls.H"
#include "initContinuityErrs.H"
#include "createTimeControls.H"
#include "createFields.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
@ -68,7 +67,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "setDeltaT.H"

5
applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
View File

@ -51,8 +51,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "readTimeControls.H"
#include "initContinuityErrs.H"
#include "createTimeControls.H"
#include "createFields.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
@ -63,7 +62,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "alphaCourantNo.H"
#include "setDeltaT.H"

15
applications/solvers/multiphase/driftFluxFoam/alphaControls.H Normal file
View File

@ -0,0 +1,15 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
// Apply the compression correction from the previous iteration
// Improves efficiency for steady-simulations but can only be applied
// once the alpha field is reasonably steady, i.e. fully developed
bool alphaApplyPrevCorr
(
alphaControls.lookupOrDefault<Switch>("alphaApplyPrevCorr", false)
);

1
applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
View File

@ -57,6 +57,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"

16
applications/solvers/multiphase/interFoam/interDyMFoam/createControls.H Normal file
View File

@ -0,0 +1,16 @@
#include "createTimeControls.H"
bool correctPhi
(
pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
);
bool checkMeshCourantNo
(
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
);
bool moveMeshOuterCorrectors
(
pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
);

2
applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
View File

@ -59,6 +59,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createControls.H"
#include "createRDeltaT.H"
#include "createFields.H"
#include "createMRF.H"
@ -83,7 +84,6 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

17
applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H
View File

@ -1,16 +1,9 @@
#include "readTimeControls.H"
bool correctPhi
(
pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
);
correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
bool checkMeshCourantNo
(
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
);
checkMeshCourantNo =
pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
bool moveMeshOuterCorrectors
(
pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
);
moveMeshOuterCorrectors =
pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false);

1
applications/solvers/multiphase/interFoam/interFoam.C
View File

@ -62,6 +62,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"

5
applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H Normal file
View File

@ -0,0 +1,5 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));

1
applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
View File

@ -52,6 +52,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"

21
applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H Normal file
View File

@ -0,0 +1,21 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
// Apply the compression correction from the previous iteration
// Improves efficiency for steady-simulations but can only be applied
// once the alpha field is reasonably steady, i.e. fully developed
//bool alphaApplyPrevCorr
//(
// alphaControls.lookupOrDefault<Switch>("alphaApplyPrevCorr", false)
//);
// Isotropic compression coefficient
scalar icAlpha
(
alphaControls.lookupOrDefault<scalar>("icAlpha", 0)
);

11
applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
View File

@ -1,6 +1,13 @@
{
surfaceScalarField phic(mag(phi/mesh.magSf()));
phic = min(interface.cAlpha()*phic, max(phic));
// Standard face-flux compression coefficient
surfaceScalarField phic(interface.cAlpha()*mag(phi/mesh.magSf()));
// Add the optional isotropic compression contribution
if (icAlpha > 0)
{
phic *= (1.0 - icAlpha);
phic += (interface.cAlpha()*icAlpha)*fvc::interpolate(mag(U));
}
volScalarField divU(fvc::div(phi));

2
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
View File

@ -63,10 +63,10 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "../interFoam/interDyMFoam/createControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFvOptions.H"
#include "readTimeControls.H"
volScalarField rAU
(

5
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
View File

@ -60,10 +60,9 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFvOptions.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
@ -73,7 +72,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "setDeltaT.H"

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
View File

@ -56,7 +56,7 @@ int main(int argc, char *argv[])
#include "createFields.H"
#include "createMRFZones.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "correctPhi.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
@ -67,7 +67,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "setDeltaT.H"

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
View File

@ -52,10 +52,10 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createControls.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"
#include "readTimeControls.H"
volScalarField rAU
(

4
applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
View File

@ -54,7 +54,7 @@ int main(int argc, char *argv[])
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "correctPhi.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
@ -65,7 +65,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "alphaCourantNo.H"
#include "setDeltaT.H"

1
applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
View File

@ -57,6 +57,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createControls.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"

1
applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
View File

@ -52,6 +52,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"

3
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
View File

@ -52,13 +52,12 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "createFields.H"
#include "initContinuityErrs.H"
if (!LTS)
{
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
}

3
applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H Normal file
View File

@ -0,0 +1,3 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));

4
applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
View File

@ -51,7 +51,7 @@ int main(int argc, char *argv[])
#include "initContinuityErrs.H"
#include "createFields.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
@ -61,7 +61,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNo.H"
#include "alphaCourantNo.H"
#include "setDeltaT.H"

5
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
View File

@ -52,8 +52,7 @@ int main(int argc, char *argv[])
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNos.H"
#include "setInitialDeltaT.H"
@ -79,7 +78,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
#include "createTimeControls.H"
#include "CourantNos.H"
#include "setDeltaT.H"

6
applications/solvers/stressAnalysis/solidDisplacementFoam/createSolidDisplacementFoamControls.H Normal file
View File

@ -0,0 +1,6 @@
const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
scalar convergenceTolerance(readScalar(stressControl.lookup("D")));
Switch compactNormalStress(stressControl.lookup("compactNormalStress"));

9
applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
View File

@ -1,6 +1,3 @@
const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
const int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
scalar convergenceTolerance(readScalar(stressControl.lookup("D")));
Switch compactNormalStress(stressControl.lookup("compactNormalStress"));
nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
convergenceTolerance = readScalar(stressControl.lookup("D"));
stressControl.lookup("compactNormalStress") >> compactNormalStress;

4
applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -48,7 +48,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readMechanicalProperties.H"
#include "readThermalProperties.H"
#include "readSolidDisplacementFoamControls.H"
#include "createSolidDisplacementFoamControls.H"
#include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
View File

@ -12,7 +12,7 @@ EXE_INC = \
${CGAL_EXACT} \
${CGAL_INEXACT} \
${CGAL_INC} \
${c++CGALWARN} \
${c++LESSWARN} \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \

2
applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
View File

@ -12,7 +12,7 @@ EXE_INC = \
${CGAL_EXACT} \
${CGAL_INEXACT} \
${CGAL_INC} \
${c++CGALWARN} \
${c++LESSWARN} \
-I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \

2
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
View File

@ -7,7 +7,7 @@ EXE_INC = \
${ROUNDING_MATH} \
${EXE_NDEBUG} \
${CGAL_INC} \
${c++CGALWARN} \
${c++LESSWARN} \
-I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
-I../conformalVoronoi2DMesh/lnInclude \
-I../conformalVoronoiMesh/lnInclude \

15
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -51,7 +51,6 @@ Description
#include "zoltanRenumber.H"
#endif
using namespace Foam;
@ -635,14 +634,12 @@ int main(int argc, char *argv[])
"calculate the rms of the frontwidth"
);
// Force linker to include zoltan symbols. This section is only needed since
// Zoltan is a static library
#ifdef FOAM_USE_ZOLTAN
// Force linker to include zoltan symbols. This section is only needed since
// Zoltan is a static library
#ifdef FOAM_USE_ZOLTAN
Info<< "renumberMesh built with zoltan support." << nl << endl;
(void)zoltanRenumber::typeName;
#endif
#endif
#include "setRootCase.H"
#include "createTime.H"
@ -651,7 +648,7 @@ int main(int argc, char *argv[])
// Get times list
instantList Times = runTime.times();
// set startTime and endTime depending on -time and -latestTime options
// Set startTime and endTime depending on -time and -latestTime options
#include "checkTimeOptions.H"
runTime.setTime(Times[startTime], startTime);
@ -686,7 +683,7 @@ int main(int argc, char *argv[])
sumSqrIntersect,
sumOp<scalar>()
)
/ mesh.globalData().nTotalCells()
/mesh.globalData().nTotalCells()
);
Info<< "Mesh size: " << mesh.globalData().nTotalCells() << nl

18
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
View File

@ -18,9 +18,9 @@ int USERD_get_part_coords
for (label indx=0; indx<nPoints; indx++)
{
coord_array[0][indx+1] = (float)points[indx].x();
coord_array[1][indx+1] = (float)points[indx].y();
coord_array[2][indx+1] = (float)points[indx].z();
coord_array[0][indx+1] = float(points[indx].x());
coord_array[1][indx+1] = float(points[indx].y());
coord_array[2][indx+1] = float(points[indx].z());
}
}
else if (part_number < nPatches+2)
@ -32,9 +32,9 @@ int USERD_get_part_coords
for (label indx=0; indx<nPoints; indx++)
{
coord_array[0][indx+1] = (float)points[indx].x();
coord_array[1][indx+1] = (float)points[indx].y();
coord_array[2][indx+1] = (float)points[indx].z();
coord_array[0][indx+1] = float(points[indx].x());
coord_array[1][indx+1] = float(points[indx].y());
coord_array[2][indx+1] = float(points[indx].z());
}
}
@ -44,9 +44,9 @@ int USERD_get_part_coords
forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
{
coord_array[0][indx] = (float)iter().position().x();
coord_array[1][indx] = (float)iter().position().y();
coord_array[2][indx] = (float)iter().position().z();
coord_array[0][indx] = float(iter().position().x());
coord_array[1][indx] = float(iter().position().y());
coord_array[2][indx] = float(iter().position().z());
indx++;
}

6
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
View File

@ -28,7 +28,7 @@ int USERD_set_filenames
// remove the last '/' from rootDir
if (the_path[lRoot-1] == '/')
{
the_path[lRoot-1] = (char)NULL;
the_path[lRoot-1] = char(NULL);
}
else
{
@ -182,9 +182,9 @@ int USERD_set_filenames
IOobjectList objects(*meshPtr, runTime.timeName(), cloud::prefix);
lagrangianScalarNames =
(const wordList&)objects.names(sprayScalarFieldName);
objects.names(sprayScalarFieldName);
lagrangianVectorNames =
(const wordList&)objects.names(sprayVectorFieldName);
objects.names(sprayVectorFieldName);
isSpray[fieldNames.size()] = true;

2
etc/config/settings.csh
View File

@ -426,7 +426,7 @@ case SYSTEMMPI:
echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " MPI_ARCH_INC is not set. Example:"
echo
echo ' setenv MPI_ARCH_INC "-I$MPI_ROOT/include"'
echo ' setenv MPI_ARCH_INC "-isystem $MPI_ROOT/include"'
echo
endif

2
etc/config/settings.sh
View File

@ -453,7 +453,7 @@ SYSTEMMPI)
echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
echo " MPI_ARCH_INC is not set. Example:" 1>&2
echo 1>&2
echo " export MPI_ARCH_INC=\"-I\$MPI_ROOT/include\"" 1>&2
echo " export MPI_ARCH_INC=\"-isystem \$MPI_ROOT/include\"" 1>&2
echo 1>&2
fi

21
src/OpenFOAM/include/checkTimeOption.H
View File

@ -1,17 +1,16 @@
//
// checkTimeOption.H
// ~~~~~~~~~~~~~~~~~
// check -time and -latestTime options
// Check -time and -latestTime options
if (args.optionFound("time"))
{
Foam::scalar timeValue = args.optionRead<scalar>("time");
if (args.optionFound("time"))
{
Foam::scalar timeValue = args.optionRead<scalar>("time");
startTime = Foam::Time::findClosestTimeIndex(Times, timeValue);
endTime = startTime + 1;
}
startTime = Foam::Time::findClosestTimeIndex(Times, timeValue);
}
if (args.optionFound("latestTime"))
{
startTime = Times.size() - 1;
}
if (args.optionFound("latestTime"))
{
startTime = Times.size() - 1;
}

5
src/OpenFOAM/include/checkTimeOptions.H
View File

@ -3,10 +3,9 @@
// ~~~~~~~~~~~~~~~~~~
Foam::label startTime = 0;
Foam::label endTime = Times.size();
// unless -constant is present, skip startTime if it is "constant"
// Unless -constant is present, skip startTime if it is "constant"
#include "checkConstantOption.H"
// check -time and -latestTime options
// Check -time and -latestTime options
#include "checkTimeOption.H"

7
src/OpenFOAM/include/checkTimeOptionsNoConstant.H
View File

@ -2,8 +2,7 @@
// checkTimeOptionsNoConstant.H
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Foam::label startTime = 0;
Foam::label endTime = Times.size();
Foam::label startTime = 0;
// check -time and -latestTime options
# include "checkTimeOption.H"
// Check -time and -latestTime options
#include "checkTimeOption.H"

3
src/Pstream/Allwmake
View File

@ -34,9 +34,6 @@ wmake $targetType dummy
case "$WM_MPLIB" in
*MPI*)
set +x
echo
echo "Note: ignore spurious warnings about missing mpicxx.h headers"
echo
wmakeMpiLib mpi
;;
esac

41
src/finiteVolume/cfdTools/general/include/createTimeControls.H Normal file
View File

@ -0,0 +1,41 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 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
readTimeControls
Description
Read the control parameters used by setDeltaT
\*---------------------------------------------------------------------------*/
bool adjustTimeStep =
runTime.controlDict().lookupOrDefault("adjustTimeStep", false);
scalar maxCo =
runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
scalar maxDeltaT =
runTime.controlDict().lookupOrDefault<scalar>("maxDeltaT", GREAT);
// ************************************************************************* //

8
src/finiteVolume/cfdTools/general/include/readTimeControls.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,13 +29,13 @@ Description
\*---------------------------------------------------------------------------*/
const bool adjustTimeStep =
adjustTimeStep =
runTime.controlDict().lookupOrDefault("adjustTimeStep", false);
scalar maxCo =
maxCo =
runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
scalar maxDeltaT =
maxDeltaT =
runTime.controlDict().lookupOrDefault<scalar>("maxDeltaT", GREAT);
// ************************************************************************* //

4
src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -39,7 +39,7 @@ if (adjustTimeStep)
min
(
maxCo*runTime.deltaTValue()/CoNum,
runTime.deltaTValue()
min(runTime.deltaTValue(), maxDeltaT)
)
);
}

2
wmake/rules/General/flex++
View File

@ -1,3 +1,3 @@
SUFFIXES += .L
Ltoo = flex -+ -o$(@D)/$(<F).C -f $< ; $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
Ltoo = flex -+ -o$(@D)/$(<F).C -f $< ; $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@

2
wmake/rules/General/mplibMPICH
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

2
wmake/rules/General/mplibMPICH-GM
View File

@ -1,3 +1,3 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

2
wmake/rules/General/mplibOPENMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi

3
wmake/rules/General/mplibQSMPI
View File

@ -1,4 +1,3 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

2
wmake/rules/General/mplibSGIMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DSGIMPI -DMPI_NO_CPPBIND
PINC = -I$(MPI_ARCH_PATH)/include
PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

4
wmake/rules/linux64Clang/c++
View File

@ -2,8 +2,8 @@ SUFFIXES += .C
c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
# Suppress CGAL warnings
c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedefs
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare
CC = clang++ -m64

2
wmake/rules/linux64Clang/mplibHPMPI
View File

@ -1,3 +1,3 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
PINC = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi

Some files were not shown because too many files have changed in this diff Show More