diff --git a/.gitignore b/.gitignore index 8de178a605..f567511db3 100644 --- a/.gitignore +++ b/.gitignore @@ -51,7 +51,9 @@ doc/[Dd]oxygen/latex doc/[Dd]oxygen/man # generated files in the main directory (e.g. ReleaseNotes-?.?.html) +# and in the doc directory /*.html +/doc/*.html # source packages - anywhere *.tar.bz2 diff --git a/README b/README index 7b092d0d72..df56c9c9a4 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ # #+TITLE: OpenFOAM README for version 1.6 #+AUTHOR: OpenCFD Ltd. -#+DATE: July 2009 +#+DATE: November 2009 #+LINK: http://www.opencfd.co.uk #+OPTIONS: author:nil ^:{} @@ -168,9 +168,9 @@ + rm -rf paraview-3.6.1/platforms + ./makeParaView - The PV3FoamReader module is an OpenFOAM utility that can be compiled in the - usual manner as follows: - + cd $FOAM_UTILITIES/postProcessing/graphics/PV3FoamReader + The PV3blockMeshReader and the PV3FoamReader ParaView plugins are compiled + as usual for OpenFOAM utilities: + + cd $FOAM_UTILITIES/postProcessing/graphics/PV3Readers/ + ./Allwclean + ./Allwmake @@ -187,7 +187,8 @@ newly built qmake as an argument: + ./makeParaView -qmake - The user must then recompile the PV3FoamReader module as normal (see above). + The user must then recompile the PV3blockMeshReader and the + PV3FoamReader plugins as usual (see above). * Documentation http://www.OpenFOAM.org/doc diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index 49188fcf00..a9c5d67211 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -38,11 +38,9 @@ Description int main(int argc, char *argv[]) { - - argList::validOptions.insert("writep", ""); + argList::addBoolOption("writep", "write the final pressure field"); # include "setRootCase.H" - # include "createTime.H" # include "createMesh.H" # include "createFields.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index 5e919efcc4..5cd98cd9d6 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -124,11 +124,6 @@ public: // Member Functions - tmp mut() const - { - return mut_; - } - //- Return the effective diffusivity for k tmp DkEff() const { @@ -147,41 +142,44 @@ public: ); } - //- Return the effective turbulent thermal diffusivity - tmp alphaEff() const + //- Return the turbulence viscosity + virtual tmp mut() const { - return tmp - ( - new volScalarField("alphaEff", alphat_ + alpha()) - ); + return mut_; + } + + //- Return the turbulence thermal diffusivity + virtual tmp alphat() const + { + return alphat_; } //- Return the turbulence kinetic energy - tmp k() const + virtual tmp k() const { return k_; } //- Return the turbulence kinetic energy dissipation rate - tmp epsilon() const + virtual tmp epsilon() const { return epsilon_; } //- Return the Reynolds stress tensor - tmp R() const; + virtual tmp R() const; //- Return the effective stress tensor including the laminar stress - tmp devRhoReff() const; + virtual tmp devRhoReff() const; //- Return the source term for the momentum equation - tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevRhoReff(volVectorField& U) const; //- Solve the turbulence equations and correct the turbulence viscosity - void correct(); + virtual void correct(); //- Read turbulenceProperties dictionary - bool read(); + virtual bool read(); }; diff --git a/applications/solvers/combustion/PDRFoam/XiEqns b/applications/solvers/combustion/PDRFoam/XiEqns index bd5ca3066a..8de3bffe4b 100644 --- a/applications/solvers/combustion/PDRFoam/XiEqns +++ b/applications/solvers/combustion/PDRFoam/XiEqns @@ -22,7 +22,7 @@ volScalarField GEta = GEtaCoef/tauEta; volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta; - volScalarField R = + volScalarField R = GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999); volScalarField XiEqStar = R/(R - GEta - GIn); @@ -42,7 +42,7 @@ volScalarField GEta = GEtaCoef/tauEta; volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta; - volScalarField R = + volScalarField R = GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999); volScalarField XiEqStar = R/(R - GEta - GIn); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C index 59fc746507..3ab7587431 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C @@ -91,7 +91,7 @@ bool Foam::XiModels::algebraic::read(const dictionary& XiProperties) XiModel::read(XiProperties); XiModelCoeffs_.lookup("XiShapeCoef") >> XiShapeCoef; - + return true; } diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 9f42a4cc97..e98ff38adc 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -117,7 +117,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::polyPhi { scalar x = phi - 1.0; - return + return a[0] *( scalar(1) diff --git a/applications/solvers/combustion/PDRFoam/setDeltaT.H b/applications/solvers/combustion/PDRFoam/setDeltaT.H index c40bc4a1d7..4a4cc4e6bf 100644 --- a/applications/solvers/combustion/PDRFoam/setDeltaT.H +++ b/applications/solvers/combustion/PDRFoam/setDeltaT.H @@ -45,7 +45,7 @@ if (adjustTimeStep) maxDeltaT ) ); - + Info<< "deltaT = " << runTime.deltaTValue() << endl; } diff --git a/applications/solvers/combustion/dieselEngineFoam/createFields.H b/applications/solvers/combustion/dieselEngineFoam/createFields.H index 6987608006..a75c6a7d07 100644 --- a/applications/solvers/combustion/dieselEngineFoam/createFields.H +++ b/applications/solvers/combustion/dieselEngineFoam/createFields.H @@ -88,7 +88,7 @@ volScalarField DpDt = multivariateSurfaceInterpolationScheme::fieldTable fields; -forAll (Y, i) +forAll(Y, i) { fields.add(Y[i]); } diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C index ce80690224..6507c117a0 100644 --- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C +++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) dieselSpray.evolve(); - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C index 42d9534654..4769a00c77 100644 --- a/applications/solvers/combustion/dieselFoam/dieselFoam.C +++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { @@ -72,11 +72,11 @@ int main(int argc, char *argv[]) runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - Info << "Evolving Spray" << endl; + Info<< "Evolving Spray" << endl; dieselSpray.evolve(); - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C index dd584d03e2..5895c82b92 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/engineFoam/engineFoam.C @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { diff --git a/applications/solvers/combustion/reactingFoam/chemistry.H b/applications/solvers/combustion/reactingFoam/chemistry.H index 691b6dcb92..a1a978210d 100644 --- a/applications/solvers/combustion/reactingFoam/chemistry.H +++ b/applications/solvers/combustion/reactingFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index d92766db54..0b2238031c 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -77,7 +77,7 @@ volScalarField DpDt = multivariateSurfaceInterpolationScheme::fieldTable fields; -forAll (Y, i) +forAll(Y, i) { fields.add(Y[i]); } diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index 875191eea4..2d4ae7589a 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { diff --git a/applications/solvers/combustion/rhoReactingFoam/chemistry.H b/applications/solvers/combustion/rhoReactingFoam/chemistry.H index 691b6dcb92..a1a978210d 100644 --- a/applications/solvers/combustion/rhoReactingFoam/chemistry.H +++ b/applications/solvers/combustion/rhoReactingFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/rhoReactingFoam/createFields.H b/applications/solvers/combustion/rhoReactingFoam/createFields.H index d44b4b9171..d2f6f5e4d4 100644 --- a/applications/solvers/combustion/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/rhoReactingFoam/createFields.H @@ -77,7 +77,7 @@ volScalarField DpDt = multivariateSurfaceInterpolationScheme::fieldTable fields; -forAll (Y, i) +forAll(Y, i) { fields.add(Y[i]); } diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C index 777718b3ea..cc37dd09c1 100644 --- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake index 698558da0b..5f01d96a75 100755 --- a/applications/solvers/compressible/rhoCentralFoam/Allwmake +++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso BCs +wmake libso BCs wmake # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options index d4fb23181c..87f38a6a03 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options @@ -6,5 +6,5 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lbasicThermophysicalModels \ - -lspecie + -lspecie diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index ec8f777542..9f1ea906c1 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Description - \*---------------------------------------------------------------------------*/ #include "maxwellSlipUFvPatchVectorField.H" @@ -155,7 +153,7 @@ void maxwellSlipUFvPatchVectorField::updateCoeffs() refValue() = Uwall_; - if(thermalCreep_) + if (thermalCreep_) { const volScalarField& vsfT = this->db().objectRegistry::lookupObject("T"); @@ -167,7 +165,7 @@ void maxwellSlipUFvPatchVectorField::updateCoeffs() refValue() -= 3.0*pnu/(4.0*pT)*transform(I - n*n, gradpT); } - if(curvature_) + if (curvature_) { const fvPatchTensorField& ptauMC = patch().lookupPatchField("tauMC"); diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchFields.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchFields.C index ac3d40b00e..23386a197f 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchFields.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchFields.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Description - \*---------------------------------------------------------------------------*/ #include "mixedFixedValueSlipFvPatchFields.H" diff --git a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C index f06b13e5de..0375185a88 100644 --- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C +++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) ( fvm::ddt(rhoU) + fvm::div(phiv, rhoU) - == + == - fvc::grad(p) ); diff --git a/applications/solvers/compressible/rhopSonicFoam/Allwmake b/applications/solvers/compressible/rhopSonicFoam/Allwmake index 698558da0b..5f01d96a75 100755 --- a/applications/solvers/compressible/rhopSonicFoam/Allwmake +++ b/applications/solvers/compressible/rhopSonicFoam/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso BCs +wmake libso BCs wmake # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C b/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C index 27fa4db29a..6acbe1b0ca 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C @@ -131,7 +131,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs() const fvPatchField& rhoUp = patch().lookupPatchField("rhoU"); - const fvsPatchField& phip = + const fvsPatchField& phip = patch().lookupPatchField("phi"); const fvsPatchField& rAp = @@ -147,7 +147,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs() void inviscidWallPFvPatchScalarField::write(Ostream& os) const { fixedGradientFvPatchScalarField::write(os); - os.writeKeyword("fluxFraction") + os.writeKeyword("fluxFraction") << fluxFraction_ << token::END_STATEMENT << nl; writeEntry("value", os); } diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C index 8f63d984f5..b334d39c3a 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C @@ -145,7 +145,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs() const volScalarField& T = db().lookupObject("T"); const label patchi = patch().index(); - fvPatchScalarField& Tp = + fvPatchScalarField& Tp = const_cast(T.boundaryField()[patchi]); Tp.evaluate(); @@ -164,7 +164,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs() refGrad() = rhop*Cv.value()*Tp.snGrad() + ( - refValue() + refValue() - (0.5*rhop.patchInternalField()* magSqr(rhoUp.patchInternalField()/rhop.patchInternalField())) )*patch().deltaCoeffs(); diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H index 091f9b6d58..1f3665b760 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H @@ -66,7 +66,7 @@ public: const dictionary& ); - //- Construct by mapping given fixedRhoUFvPatchVectorField + //- Construct by mapping given fixedRhoUFvPatchVectorField // onto a new patch fixedRhoUFvPatchVectorField ( diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C index 66619cfc67..8869f52a27 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C @@ -50,14 +50,14 @@ int main(int argc, char *argv[]) label nAveragingSteps = 0; - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.loop()) { nAveragingSteps++; - Info << "Time = " << runTime.timeName() << endl; + Info<< "Time = " << runTime.timeName() << endl; molecules.evolve(); @@ -74,12 +74,12 @@ int main(int argc, char *argv[]) nAveragingSteps = 0; } - Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C index 4f2eea1ccc..0bd07d0330 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C @@ -48,14 +48,14 @@ int main(int argc, char *argv[]) label nAveragingSteps = 0; - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.loop()) { nAveragingSteps++; - Info << "Time = " << runTime.timeName() << endl; + Info<< "Time = " << runTime.timeName() << endl; molecules.evolve(); @@ -70,12 +70,12 @@ int main(int argc, char *argv[]) nAveragingSteps = 0; } - Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/electromagnetics/electrostaticFoam/Make/files b/applications/solvers/electromagnetics/electrostaticFoam/Make/files index 073ad4cd76..d5cb4f1395 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/Make/files +++ b/applications/solvers/electromagnetics/electrostaticFoam/Make/files @@ -1,3 +1,3 @@ -electrostaticFoam.C +electrostaticFoam.C EXE = $(FOAM_APPBIN)/electrostaticFoam diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 54e1c8cb18..5a56c2709f 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/incompressible/channelFoam/createGradP.H b/applications/solvers/incompressible/channelFoam/createGradP.H index 9bb9bb0ba2..643509c46f 100644 --- a/applications/solvers/incompressible/channelFoam/createGradP.H +++ b/applications/solvers/incompressible/channelFoam/createGradP.H @@ -11,7 +11,7 @@ runTime.path()/runTime.timeName()/"uniform"/"gradP.raw" ); - if(gradPFile.good()) + if (gradPFile.good()) { gradPFile >> gradP; Info<< "Reading average pressure gradient" <::fieldTable fields; - forAll (Y, i) + forAll(Y, i) { fields.add(Y[i]); } diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H index 3a8a5c20f1..5489dfefba 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H index 3d6c5500ea..68c0f8aee8 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H @@ -84,7 +84,7 @@ Info<< "Creating multi-variate interpolation scheme\n" << endl; multivariateSurfaceInterpolationScheme::fieldTable fields; - forAll (Y, i) + forAll(Y, i) { fields.add(Y[i]); } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H index 3a8a5c20f1..5489dfefba 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 359599a61f..e825c2cffb 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -90,7 +90,7 @@ multivariateSurfaceInterpolationScheme::fieldTable fields; - forAll (Y, i) + forAll(Y, i) { fields.add(Y[i]); } diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H index 78b0e8b552..5b5767ef3e 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H @@ -47,8 +47,10 @@ ) ); - word kinematicCloudName("kinematicCloud"); - args.optionReadIfPresent("cloudName", kinematicCloudName); + const word kinematicCloudName + ( + args.optionLookupOrDefault("cloudName", "kinematicCloud") + ); Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; basicKinematicCloud kinematicCloud diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C index 625a306466..ee0088c397 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C @@ -42,7 +42,7 @@ Description int main(int argc, char *argv[]) { - argList::validOptions.insert("cloudName", "cloud name"); + argList::addOption("cloudName", "cloud name"); #include "setRootCase.H" #include "createTime.H" diff --git a/applications/solvers/multiphase/bubbleFoam/UEqns.H b/applications/solvers/multiphase/bubbleFoam/UEqns.H index e692f9f5fe..64cc5db462 100644 --- a/applications/solvers/multiphase/bubbleFoam/UEqns.H +++ b/applications/solvers/multiphase/bubbleFoam/UEqns.H @@ -41,7 +41,7 @@ fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime); - fvc::interpolate(nuEffb) *mesh.magSf()*fvc::snGrad(beta)/fvc::interpolate(beta + scalar(0.001)); - UbEqn = + UbEqn = ( (scalar(1) + Cvm*rhob*alpha/rhob)* ( diff --git a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H index 576e3253ab..84dadd7acb 100644 --- a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H +++ b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H @@ -1,4 +1,4 @@ -if(turbulence) +if (turbulence) { if (mesh.changing()) { diff --git a/applications/solvers/multiphase/bubbleFoam/pEqn.H b/applications/solvers/multiphase/bubbleFoam/pEqn.H index 35813dd935..3e550efc65 100644 --- a/applications/solvers/multiphase/bubbleFoam/pEqn.H +++ b/applications/solvers/multiphase/bubbleFoam/pEqn.H @@ -34,7 +34,7 @@ surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pEqn ( diff --git a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H index a9d43535ec..8e9e9cb00c 100644 --- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H +++ b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H @@ -36,7 +36,7 @@ scalar acousticCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = + surfaceScalarField SfUfbyDelta = mesh.surfaceInterpolation::deltaCoeffs()*mag(phiv); CoNum = max(SfUfbyDelta/mesh.magSf()) diff --git a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H index 6f1622510f..c5e93c7efb 100644 --- a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H +++ b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H @@ -3,12 +3,12 @@ dimensionedScalar totalMass = fvc::domainIntegrate(rho); - scalar sumLocalContErr = + scalar sumLocalContErr = ( fvc::domainIntegrate(mag(rho - thermoRho))/totalMass ).value(); - scalar globalContErr = + scalar globalContErr = ( fvc::domainIntegrate(rho - thermoRho)/totalMass ).value(); diff --git a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H index dd8f23464a..26f0b43108 100644 --- a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H +++ b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H @@ -47,7 +47,7 @@ if (adjustTimeStep) maxDeltaT ) ); - + Info<< "deltaT = " << runTime.deltaTValue() << endl; } diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H index f681ba6594..e4bef5a60f 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H @@ -42,7 +42,7 @@ adjustPhi(phi, U, pcorr); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pcorrEqn ( diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H index 9d2dc23916..e6ff713429 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H @@ -30,7 +30,7 @@ + fvc::interpolate(rho)*(g & mesh.Sf()) )*rUAf; - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pEqnIncomp ( diff --git a/applications/solvers/multiphase/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interDyMFoam/correctPhi.H index 43b13c2b89..72550e621c 100644 --- a/applications/solvers/multiphase/interDyMFoam/correctPhi.H +++ b/applications/solvers/multiphase/interDyMFoam/correctPhi.H @@ -42,7 +42,7 @@ adjustPhi(phi, U, pcorr); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pcorrEqn ( diff --git a/applications/solvers/multiphase/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interDyMFoam/pEqn.H index 2af289a76f..afefb0a5f0 100644 --- a/applications/solvers/multiphase/interDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/interDyMFoam/pEqn.H @@ -18,7 +18,7 @@ + fvc::interpolate(rho)*(g & mesh.Sf()) )*rAUf; - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pEqn ( diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H index 0274b7e9ed..a41332ce9b 100644 --- a/applications/solvers/multiphase/interFoam/correctPhi.H +++ b/applications/solvers/multiphase/interFoam/correctPhi.H @@ -34,7 +34,7 @@ adjustPhi(phi, U, pcorr); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pcorrEqn ( diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H index 7aa172b858..7473848c62 100644 --- a/applications/solvers/multiphase/interFoam/pEqn.H +++ b/applications/solvers/multiphase/interFoam/pEqn.H @@ -19,7 +19,7 @@ + fvc::interpolate(rho)*(g & mesh.Sf()) )*rUAf; - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pEqn ( diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H index 17377302f0..2547dac966 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H @@ -34,7 +34,7 @@ adjustPhi(phi, U, pcorr); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pcorrEqn ( diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H index 3c164cc574..519a0b9f65 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H @@ -23,7 +23,7 @@ const volScalarField& vDotcP = vDotP[0](); const volScalarField& vDotvP = vDotP[1](); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pEqn ( diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index c948063408..d975577dbc 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C @@ -63,7 +63,7 @@ Ostream& operator<< ) { os << tp.theta0_ << token::SPACE - << tp.uTheta_ << token::SPACE + << tp.uTheta_ << token::SPACE << tp.thetaA_ << token::SPACE << tp.thetaR_; diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index 6d32abd9c7..0e1252bea7 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -125,7 +125,7 @@ Foam::tmp Foam::multiphaseMixture::rho() const tmp trho = iter()*iter().rho(); - for(++iter; iter != phases_.end(); ++iter) + for (++iter; iter != phases_.end(); ++iter) { trho() += iter()*iter().rho(); } @@ -140,7 +140,7 @@ Foam::tmp Foam::multiphaseMixture::mu() const tmp tmu = iter()*iter().rho()*iter().nu(); - for(++iter; iter != phases_.end(); ++iter) + for (++iter; iter != phases_.end(); ++iter) { tmu() += iter()*iter().rho()*iter().nu(); } @@ -156,7 +156,7 @@ Foam::tmp Foam::multiphaseMixture::muf() const tmp tmuf = fvc::interpolate(iter())*iter().rho()*fvc::interpolate(iter().nu()); - for(++iter; iter != phases_.end(); ++iter) + for (++iter; iter != phases_.end(); ++iter) { tmuf() += fvc::interpolate(iter())*iter().rho()*fvc::interpolate(iter().nu()); @@ -210,7 +210,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const PtrDictionary::const_iterator iter2 = iter1; ++iter2; - for(; iter2 != phases_.end(); ++iter2) + for (; iter2 != phases_.end(); ++iter2) { const phase& alpha2 = iter2(); @@ -489,7 +489,7 @@ void Foam::multiphaseMixture::solveAlphas if (cycleAlpha) { PtrDictionary::iterator refPhaseIter = phases_.begin(); - for(label i=0; i Foam::GidaspowErgunWenYu::K forAll(Re, celli) { - if(Re[celli] > 1000.0) + if (Re[celli] > 1000.0) { Cds[celli] = 0.44; } } - + // Wen and Yu (1966) tmp tKWenYu = 0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d(); volScalarField& KWenYu = tKWenYu(); // Ergun - forAll (beta, cellj) + forAll(beta, cellj) { if (beta[cellj] <= 0.8) { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index 256d0861c0..1be08abd3a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C @@ -77,7 +77,7 @@ Foam::tmp Foam::GidaspowSchillerNaumann::K forAll(Re, celli) { - if(Re[celli] > 1000.0) + if (Re[celli] > 1000.0) { Cds[celli] = 0.44; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C index 707c269c24..59e7bed10e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C @@ -74,7 +74,7 @@ Foam::tmp Foam::SchillerNaumann::K forAll(Re, celli) { - if(Re[celli] > 1000.0) + if (Re[celli] > 1000.0) { Cds[celli] = 0.44; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C index 52d847c854..497612462d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C @@ -73,7 +73,7 @@ Foam::tmp Foam::SyamlalOBrien::K volScalarField A = pow(beta, 4.14); volScalarField B = 0.8*pow(beta, 1.28); - forAll (beta, celli) + forAll(beta, celli) { if (beta[celli] > 0.85) { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C index 7646506933..febe1d11f0 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C @@ -77,7 +77,7 @@ Foam::tmp Foam::WenYu::K forAll(Re, celli) { - if(Re[celli] > 1000.0) + if (Re[celli] > 1000.0) { Cds[celli] = 0.44; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 582fa4cdd3..8fb79ad403 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::dragModel::New interfaceDict.lookup("dragModel" + phasea.name()) ); - Info << "Selecting dragModel for phase " + Info<< "Selecting dragModel for phase " << phasea.name() << ": " << dragModelType << endl; @@ -57,7 +57,7 @@ Foam::autoPtr Foam::dragModel::New << dragModelType << ", constructor not in hash table" << endl << endl << " Valid dragModel types are : " << endl; - Info << dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return cstrIter()(interfaceDict, alpha, phasea, phaseb); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C index e5d27350b3..999dc887d8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::conductivityModel::New { word conductivityModelType(dict.lookup("conductivityModel")); - Info<< "Selecting conductivityModel " + Info<< "Selecting conductivityModel " << conductivityModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(conductivityModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index a7c65bc13f..174ff70a50 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -73,7 +73,7 @@ frictionalPressure ) const { - return + return Fr*pow(max(alpha - alphaMinFriction, scalar(0)), eta) /pow(max(alphaMax - alpha, scalar(5.0e-2)), p); } @@ -104,9 +104,9 @@ Foam::tmp Foam::JohnsonJacksonFrictionalStress::muf const dimensionedScalar& alphaMax, const volScalarField& pf, const volTensorField& D, - const dimensionedScalar& phi + const dimensionedScalar& phi ) const -{ +{ return dimensionedScalar("0.5", dimTime, 0.5)*pf*sin(phi); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 3abba4d80b..3c992a4cbe 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -125,7 +125,7 @@ Foam::tmp Foam::SchaefferFrictionalStress::muf volScalarField& muff = tmuf(); - forAll (D, celli) + forAll(D, celli) { if (alpha[celli] > alphaMax.value()-5e-2) { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C index fed001e0c0..7e542fc978 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::frictionalStressModel::New { word frictionalStressModelType(dict.lookup("frictionalStressModel")); - Info<< "Selecting frictionalStressModel " + Info<< "Selecting frictionalStressModel " << frictionalStressModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(frictionalStressModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C index cda9814b46..e673544a9b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::granularPressureModel::New { word granularPressureModelType(dict.lookup("granularPressureModel")); - Info<< "Selecting granularPressureModel " + Info<< "Selecting granularPressureModel " << granularPressureModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(granularPressureModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index e2114f9baf..f7651d2279 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C @@ -65,7 +65,7 @@ Foam::tmp Foam::CarnahanStarlingRadial::g0 ) const { - return + return 1.0/(1.0 - alpha) + 3.0*alpha/(2.0*sqr(1.0 - alpha)) + sqr(alpha)/(2.0*pow(1.0 - alpha, 3)); @@ -78,8 +78,8 @@ Foam::tmp Foam::CarnahanStarlingRadial::g0prime const dimensionedScalar& alphaMax ) const { - return - - alpha/sqr(1.0 - alpha) + return + - alpha/sqr(1.0 - alpha) + (3.0*(1.0 - alpha) + 6.0*sqr(alpha))/(2.0*(1.0 - alpha)) + (2.0*alpha*(1.0 - alpha) + 3.0*pow(alpha, 3)) /(2.0*pow(1.0 - alpha, 4)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C index d62a9c1c65..9ef25b9340 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C @@ -74,7 +74,7 @@ Foam::tmp Foam::GidaspowRadial::g0prime const dimensionedScalar& alphaMax ) const { - return + return (-1.0/5.0)*pow(alpha/alphaMax, -2.0/3.0) /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index a600b350a8..f9f4a68c09 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C @@ -74,7 +74,7 @@ Foam::tmp Foam::SinclairJacksonRadial::g0prime const dimensionedScalar& alphaMax ) const { - return + return (-1.0/3.0)*pow(alpha/alphaMax, -2.0/3.0) /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C index fc6b2ed5d9..72d7a1193d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::radialModel::New { word radialModelType(dict.lookup("radialModel")); - Info<< "Selecting radialModel " + Info<< "Selecting radialModel " << radialModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(radialModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H index ad48745519..7645aeb204 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H @@ -42,12 +42,12 @@ phib = (fvc::interpolate(Ub) & mesh.Sf()) + fvc::ddtPhiCorr(rUbA, Ub, phib) + phiDragb; - + phi = alphaf*phia + betaf*phib; surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pEqn ( diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H index 457e476b28..60c3bc8fa0 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H @@ -7,20 +7,20 @@ labelListList neighbour = mesh.cellCells(); scalarField cellVolumes = mesh.cellVolumes(); - forAll (alphaEx, celli) + forAll(alphaEx, celli) { // Finding the labels of the neighbouring cells labelList neighbourCell = neighbour[celli]; // Initializing neighbouring cells contribution scalar neighboursEx = 0.0; - - forAll (neighbourCell, cellj) + + forAll(neighbourCell, cellj) { labelList neighboursNeighbour = neighbour[neighbourCell[cellj]]; scalar neighboursNeighbourCellVolumes = 0.0; - - forAll (neighboursNeighbour, cellk) + + forAll(neighboursNeighbour, cellk) { neighboursNeighbourCellVolumes += cellVolumes[neighboursNeighbour[cellk]]; diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C index 515e638be4..92039de085 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C @@ -177,7 +177,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs() gradient() = ( (traction_ + pressure_*n)/rho.value() - + twoMuLambda*fvPatchField::snGrad() - (n & sigmaD) + + twoMuLambda*fvPatchField::snGrad() - (n & sigmaD) )/twoMuLambda; Switch thermalStress(thermalProperties.lookup("thermalStress")); @@ -187,7 +187,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs() dimensionedScalar alpha(thermalProperties.lookup("alpha")); dimensionedScalar threeKalpha = threeK*alpha; - const fvPatchField& T = + const fvPatchField& T = patch().lookupPatchField("T"); gradient() += n*threeKalpha.value()*T/twoMuLambda; diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C index 4c14b00cc6..70b8b76d39 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) { volTensorField gradDcorr = fvc::grad(Dcorr); - sigmaExp = + sigmaExp = (lambda - mu)*gradDcorr + mu*gradDcorr.T() + (lambda*I)*tr(gradDcorr); diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C index d071ff7c78..3cec9205f5 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C @@ -171,7 +171,7 @@ void tractionDisplacementCorrectionFvPatchVectorField::updateCoeffs() const fvPatchField& sigmaD = patch().lookupPatchField("sigmaD"); - const fvPatchField& sigmaExp = + const fvPatchField& sigmaExp = patch().lookupPatchField("sigmaExp"); gradient() = diff --git a/applications/test/BSpline/Make/files b/applications/test/BSpline/Make/files deleted file mode 100644 index be66810067..0000000000 --- a/applications/test/BSpline/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -BSplineTest.C - -EXE = $(FOAM_USER_APPBIN)/BSplineTest diff --git a/applications/test/BSpline/test-splines b/applications/test/BSpline/test-splines deleted file mode 100644 index f5c3a46ae4..0000000000 --- a/applications/test/BSpline/test-splines +++ /dev/null @@ -1,69 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -( - // Upper body longitudinal splines. - ( - (-0.22685 -0.01125166 0) // 7 - (-0.21685 -0.01340204 0) - (-0.20685 -0.01529684 0) - (-0.19685 -0.01694748 0) - (-0.18685 -0.01836538 0) - (-0.17685 -0.01956197 0) - (-0.16685 -0.02054868 0) - (-0.15685 -0.02133693 0) - (-0.14685 -0.02193816 0) - (-0.13685 -0.02236377 0) - (-0.12685 -0.02262521 0) - (-0.11685 -0.02273389 0) // 2 - ) - - ( - (-0.22685 0 0.01125166) // 8 - (-0.21685 0 0.01340204) - (-0.20685 0 0.01529684) - (-0.19685 0 0.01694748) - (-0.18685 0 0.01836538) - (-0.17685 0 0.01956197) - (-0.16685 0 0.02054868) - (-0.15685 0 0.02133693) - (-0.14685 0 0.02193816) - (-0.13685 0 0.02236377) - (-0.12685 0 0.02262521) - (-0.11685 0 0.02273389) // 3 - ) - - ( - (-0.22685 0.01125166 0) // 9 - (-0.21685 0.01340204 0) - (-0.20685 0.01529684 0) - (-0.19685 0.01694748 0) - (-0.18685 0.01836538 0) - (-0.17685 0.01956197 0) - (-0.16685 0.02054868 0) - (-0.15685 0.02133693 0) - (-0.14685 0.02193816 0) - (-0.13685 0.02236377 0) - (-0.12685 0.02262521 0) - (-0.11685 0.02273389 0) // 4 - ) - - ( - (-0.22685 0 -0.01125166) // 6 - (-0.21685 0 -0.01340204) - (-0.20685 0 -0.01529684) - (-0.19685 0 -0.01694748) - (-0.18685 0 -0.01836538) - (-0.17685 0 -0.01956197) - (-0.16685 0 -0.02054868) - (-0.15685 0 -0.02133693) - (-0.14685 0 -0.02193816) - (-0.13685 0 -0.02236377) - (-0.12685 0 -0.02262521) - (-0.11685 0 -0.02273389) // 1 - ) -); diff --git a/applications/test/Dictionary/DictionaryTest.C b/applications/test/Dictionary/DictionaryTest.C index 0af4dab661..0f09f4f4a6 100644 --- a/applications/test/Dictionary/DictionaryTest.C +++ b/applications/test/Dictionary/DictionaryTest.C @@ -84,7 +84,7 @@ public: ~Scalar() { - Info <<"delete Scalar: " << data_ << endl; + Info<<"delete Scalar: " << data_ << endl; } friend Ostream& operator<<(Ostream& os, const Scalar& val) @@ -169,7 +169,7 @@ int main(int argc, char *argv[]) { Info<< " = " << iter() << endl; } - + PtrDictionary scalarDict2; for (int i = 8; i<15; i++) { @@ -186,22 +186,22 @@ int main(int argc, char *argv[]) { Info<< "elem = " << *iter << endl; } - + scalarDict.transfer(scalarDict2); - + Scalar* p = scalarDict.lookupPtr("ent8"); - + // This does not (yet) work // Scalar* q = scalarDict.remove("ent10"); if (p) { - Info << "found: " << *p << endl; + Info<< "found: " << *p << endl; } else { - Info << "no p: " << endl; + Info<< "no p: " << endl; } scalarDict.clear(); diff --git a/applications/test/HashSet/hashSetTest.C b/applications/test/HashSet/hashSetTest.C index 21e1276604..fd40e34999 100644 --- a/applications/test/HashSet/hashSetTest.C +++ b/applications/test/HashSet/hashSetTest.C @@ -92,6 +92,8 @@ int main(int argc, char *argv[]) labelHashSet setD(1); setD.insert(11); setD.insert(100); + setD.insert(49); + setD.insert(36); setD.insert(2008); Info<< "setD : " << setD << endl; @@ -138,6 +140,17 @@ int main(int argc, char *argv[]) // this doesn't work (yet?) // setD[12] = true; + List