From f8468a0686ae384126a1c9f1015a47abf71ae7da Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 18 Jan 2012 10:23:45 +0000 Subject: [PATCH 01/12] BUG: Corrected -dict option for extrudeToRegionMesh utility --- .../generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C index 4ba6d43b4e..b32c249e7c 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C @@ -1637,6 +1637,7 @@ int main(int argc, char *argv[]) #include "addRegionOption.H" #include "addOverwriteOption.H" + argList::addOption("dict", "name", "specify alternative dictionary"); #include "setRootCase.H" #include "createTime.H" From f2e98ffb26d23d2b4ce503764bbd1d144c9f4c84 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 18 Jan 2012 11:53:41 +0000 Subject: [PATCH 02/12] BUG: Corrections to AMI patch output when projecting to intermediate surface --- .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 8 ++++---- .../mappedPolyPatch/mappedPatchBase.C | 15 +++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C index 821ef00dec..67414fa432 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C +++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C @@ -366,7 +366,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch AMIPtr_(NULL), AMIReverse_(false), surfPtr_(NULL), - surfDict_(dictionary::null) + surfDict_(fileName("surface")) { // Neighbour patch might not be valid yet so no transformation // calculation possible @@ -474,7 +474,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch AMIPtr_(NULL), AMIReverse_(pp.AMIReverse_), surfPtr_(NULL), - surfDict_(dictionary::null) + surfDict_(pp.surfDict_) { // Neighbour patch might not be valid yet so no transformation // calculation possible @@ -501,7 +501,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch AMIPtr_(NULL), AMIReverse_(pp.AMIReverse_), surfPtr_(NULL), - surfDict_(dictionary::null) + surfDict_(pp.surfDict_) { if (nbrPatchName_ == name()) { @@ -825,7 +825,7 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const << token::END_STATEMENT << nl; } - if (surfDict_ != dictionary::null) + if (!surfDict_.empty()) { os.writeKeyword(surfDict_.dictName()); os << surfDict_; diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C index ec3d7c7471..9ccaf089c0 100644 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C +++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C @@ -798,7 +798,7 @@ Foam::mappedPatchBase::mappedPatchBase AMIPtr_(NULL), AMIReverse_(false), surfPtr_(NULL), - surfDict_(dictionary::null) + surfDict_(fileName("surface")) {} @@ -824,7 +824,7 @@ Foam::mappedPatchBase::mappedPatchBase AMIPtr_(NULL), AMIReverse_(false), surfPtr_(NULL), - surfDict_(dictionary::null) + surfDict_(fileName("surface")) {} @@ -850,7 +850,7 @@ Foam::mappedPatchBase::mappedPatchBase AMIPtr_(NULL), AMIReverse_(false), surfPtr_(NULL), - surfDict_(dictionary::null) + surfDict_(fileName("surface")) {} @@ -876,7 +876,7 @@ Foam::mappedPatchBase::mappedPatchBase AMIPtr_(NULL), AMIReverse_(false), surfPtr_(NULL), - surfDict_(dictionary::null) + surfDict_(fileName("surface")) {} @@ -1216,8 +1216,11 @@ void Foam::mappedPatchBase::write(Ostream& os) const << token::END_STATEMENT << nl; } - os.writeKeyword(surfDict_.dictName()); - os << surfDict_; + if (!surfDict_.empty()) + { + os.writeKeyword(surfDict_.dictName()); + os << surfDict_; + } } } From 486da88fb9133af615b691cc205c1119b808bca5 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 19 Jan 2012 14:19:36 +0000 Subject: [PATCH 03/12] BUG: Corrected mesh movement in sprayEngineFoam solver --- .../Make/files | 0 .../Make/options | 0 .../createClouds.H | 0 .../logSummary.H | 0 .../sprayFoam/sprayEngineFoam/pEqn.H | 73 +++++++++++++++++++ .../readEngineTimeControls.H | 0 .../sprayEngineFoam.C | 2 + .../startSummary.H | 0 8 files changed, 75 insertions(+) rename applications/solvers/lagrangian/sprayFoam/{sprayEnginFoam => sprayEngineFoam}/Make/files (100%) rename applications/solvers/lagrangian/sprayFoam/{sprayEnginFoam => sprayEngineFoam}/Make/options (100%) rename applications/solvers/lagrangian/sprayFoam/{sprayEnginFoam => sprayEngineFoam}/createClouds.H (100%) rename applications/solvers/lagrangian/sprayFoam/{sprayEnginFoam => sprayEngineFoam}/logSummary.H (100%) create mode 100644 applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H rename applications/solvers/lagrangian/sprayFoam/{sprayEnginFoam => sprayEngineFoam}/readEngineTimeControls.H (100%) rename applications/solvers/lagrangian/sprayFoam/{sprayEnginFoam => sprayEngineFoam}/sprayEngineFoam.C (99%) rename applications/solvers/lagrangian/sprayFoam/{sprayEnginFoam => sprayEngineFoam}/startSummary.H (100%) diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/files b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/files rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/options rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/createClouds.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/createClouds.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/createClouds.H rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/createClouds.H diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/logSummary.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/logSummary.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/logSummary.H rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/logSummary.H diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H new file mode 100644 index 0000000000..5109788ea1 --- /dev/null +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H @@ -0,0 +1,73 @@ +rho = thermo.rho(); + +volScalarField rAU(1.0/UEqn.A()); +U = rAU*UEqn.H(); + +if (pimple.transonic()) +{ + surfaceScalarField phid + ( + "phid", + fvc::interpolate(psi) + *( + ((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)) + + fvc::ddtPhiCorr(rAU, rho, U, phi) + ) + ); + + while (pimple.correctNonOrthogonal()) + { + fvScalarMatrix pEqn + ( + fvm::ddt(psi, p) + + fvm::div(phid, p) + - fvm::laplacian(rho*rAU, p) + == + parcels.Srho() + ); + + pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + + if (pimple.finalNonOrthogonalIter()) + { + phi == pEqn.flux(); + } + } +} +else +{ + phi = + fvc::interpolate(rho) + *( + ((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)) + + fvc::ddtPhiCorr(rAU, rho, U, phi) + ); + + while (pimple.correctNonOrthogonal()) + { + fvScalarMatrix pEqn + ( + fvm::ddt(psi, p) + + fvc::div(phi) + - fvm::laplacian(rho*rAU, p) + == + parcels.Srho() + ); + + pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + + if (pimple.finalNonOrthogonalIter()) + { + phi += pEqn.flux(); + } + } +} + +#include "rhoEqn.H" +#include "compressibleContinuityErrs.H" + +U -= rAU*fvc::grad(p); +U.correctBoundaryConditions(); +K = 0.5*magSqr(U); + +dpdt = fvc::ddt(p); diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/readEngineTimeControls.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/readEngineTimeControls.H rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C similarity index 99% rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C index 7014cc1af3..a4ae147f51 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C @@ -74,6 +74,8 @@ int main(int argc, char *argv[]) Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl; + mesh.move(); + parcels.evolve(); #include "rhoEqn.H" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/startSummary.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/startSummary.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/startSummary.H rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/startSummary.H From 0b1bcbb753490b02e8306cfd1cc2705d642afe9f Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 19 Jan 2012 16:27:23 +0000 Subject: [PATCH 04/12] Remove non-ASCII characters --- .../dragModels/dragModel/dragModel.H | 4 ++-- .../heatTransferModel/heatTransferModel.H | 4 ++-- .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.H | 4 ++-- .../dragModels/dragModel/dragModel.H | 4 ++-- .../heatTransferModel/heatTransferModel.H | 4 ++-- .../dragModels/dragModel/dragModel.H | 4 ++-- .../molecule/reducedUnits/reducedUnits.H | 8 ++++---- .../old/reducedUnits/reducedUnits.H | 8 ++++---- .../tetOverlapVolume/tetOverlapVolume.H | 12 ++++++------ .../RAS/SpalartAllmaras/SpalartAllmaras.H | 2 +- .../RAS/SpalartAllmaras/SpalartAllmaras.H | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index 6d2add98f9..97c9d455f1 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -114,11 +114,11 @@ public: //- the dragfunction K used in the momentum eq. // ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub) // ddt(beta*rhob*Ub) + ... = ... alpha*beta*K*(Ub-Ua) - // **********************************NB ! ***************************** + // ********************************** NB! ***************************** // for numerical reasons alpha and beta has been // extracted from the dragFunction K, // so you MUST divide K by alpha*beta when implemnting the drag function - // **********************************NB ! ***************************** + // ********************************** NB! ***************************** virtual tmp K(const volScalarField& Ur) const = 0; }; diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index e4871f2c51..f83a03804b 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -114,12 +114,12 @@ public: //- the heat-transfer function K used in the enthalpy eq. // ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb) // ddt(beta*rhob*hb) + ... = ... alpha*beta*K*(Tb - Ta) - // **********************************NB ! ***************************** + // ********************************** NB!***************************** // for numerical reasons alpha and beta has been // extracted from the heat-transfer function K, // so you MUST divide K by alpha*beta when implementing the // heat-transfer function - // **********************************NB ! ***************************** + // ********************************** NB!***************************** virtual tmp K(const volScalarField& Ur) const = 0; }; diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H index 31ea8164df..74f8f2b931 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H @@ -35,8 +35,8 @@ Description \verbatim Kunz, R.F., Boger, D.A., Stinebring, D.R., Chyczewski, Lindau. J.W., Gibeling, H.J., Venkateswaran, S., Govindan, T.R., - “A Preconditioned Implicit Method for Two-Phase Flows with Application - to Cavitation Prediction,” + "A Preconditioned Implicit Method for Two-Phase Flows with Application + to Cavitation Prediction," Computers and Fluids, 29(8):849-875, 2000. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index a775d91e45..3a9536c881 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -131,11 +131,11 @@ public: //- the dragfunction K used in the momentum eq. // ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub) // ddt(beta*rhob*Ub) + ... = ... alpha*beta*K*(Ub-Ua) - // **********************************NB ! ***************************** + // ********************************** NB! ***************************** // for numerical reasons alpha and beta has been // extracted from the dragFunction K, // so you MUST divide K by alpha*beta when implemnting the drag function - // **********************************NB ! ***************************** + // ********************************** NB! ***************************** virtual tmp K(const volScalarField& Ur) const = 0; }; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index e4871f2c51..5541795bfd 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -114,12 +114,12 @@ public: //- the heat-transfer function K used in the enthalpy eq. // ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb) // ddt(beta*rhob*hb) + ... = ... alpha*beta*K*(Tb - Ta) - // **********************************NB ! ***************************** + // ********************************** NB! ***************************** // for numerical reasons alpha and beta has been // extracted from the heat-transfer function K, // so you MUST divide K by alpha*beta when implementing the // heat-transfer function - // **********************************NB ! ***************************** + // ********************************** NB! ***************************** virtual tmp K(const volScalarField& Ur) const = 0; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index 237c7cfb64..0831f158b6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -114,11 +114,11 @@ public: //- the dragfunction K used in the momentum eq. // ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub) // ddt(beta*rhob*Ub) + ... = ... alpha*beta*K*(Ub-Ua) - // **********************************NB ! ***************************** + // ********************************** NB ! ***************************** // for numerical reasons alpha and beta has been // extracted from the dragFunction K, // so you MUST divide K by alpha*beta when implemnting the drag function - // **********************************NB ! ***************************** + // ********************************** NB ! ***************************** virtual tmp K(const volScalarField& Ur) const = 0; }; diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H index 632e5d37ad..8319bf50bc 100644 --- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H +++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H @@ -76,7 +76,7 @@ class reducedUnits scalar refPressure_; - scalar refMassDensity_; + scalar refMassDensity_; scalar refNumberDensity_; @@ -103,9 +103,9 @@ public: // Constructors //- Construct with no argument, uses default values: - // length = 1nm - // mass = 1.660538782e−27kg (unified atomic mass unit) - // temperature = 1K (therefore, energy = 1*kb) + // length = 1nm + // mass = 1.660538782e-27kg (unified atomic mass unit) + // temperature = 1K (therefore, energy = 1*kb) reducedUnits(); //- Construct from components diff --git a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H index 632e5d37ad..8319bf50bc 100644 --- a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H +++ b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H @@ -76,7 +76,7 @@ class reducedUnits scalar refPressure_; - scalar refMassDensity_; + scalar refMassDensity_; scalar refNumberDensity_; @@ -103,9 +103,9 @@ public: // Constructors //- Construct with no argument, uses default values: - // length = 1nm - // mass = 1.660538782e−27kg (unified atomic mass unit) - // temperature = 1K (therefore, energy = 1*kb) + // length = 1nm + // mass = 1.660538782e-27kg (unified atomic mass unit) + // temperature = 1K (therefore, energy = 1*kb) reducedUnits(); //- Construct from components diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H index d0891c14d1..a003e7bbc7 100644 --- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H +++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H @@ -77,10 +77,10 @@ class tetOverlapVolume ); - //- Helping cľasses + //- Helper classes class dummyTetOp { - public: + public: inline void operator()(const tetPoints&){} }; @@ -88,7 +88,8 @@ class tetOverlapVolume class sumTetVolOp { - public: + public: + scalar vol_; inline sumTetVolOp() @@ -108,7 +109,7 @@ class tetOverlapVolume FixedList& tets_; label& nTets_; - public: + public: inline storeTetOp(FixedList& tets, label& nTets) : @@ -178,7 +179,7 @@ public: //- Destructor - virtual ~tetOverlapVolume(); + virtual ~tetOverlapVolume(); // Public members @@ -210,7 +211,6 @@ public: } // End namespace Foam - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #endif diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H index 9faed1215c..f3b83a1148 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -33,7 +33,7 @@ Description "A One-Equation Turbulence Model for Aerodynamic Flows" P.R. Spalart, S.R. Allmaras, - La Recherche A´rospatiale, No. 1, 1994, pp. 5–21. + La Recherche Aerospatiale, No. 1, 1994, pp. 5-21. Extended according to: diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H index f3104787ab..fbd1248181 100644 --- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -33,7 +33,7 @@ Description "A One-Equation Turbulence Model for Aerodynamic Flows" P.R. Spalart, S.R. Allmaras, - La Recherche A´rospatiale, No. 1, 1994, pp. 5–21. + La Recherche Aerospatiale, No. 1, 1994, pp. 5-21. Extended according to: From eecd71f380a3ce9703aaa9ba86abbbe9caa76781 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 19 Jan 2012 16:28:01 +0000 Subject: [PATCH 05/12] pisoFoam motorBike tutorial: correct relaxation factors --- .../incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution index b974671521..c8105e447d 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution @@ -105,8 +105,8 @@ PIMPLE relaxationFactors { - U 1; - nuTilda 1; + "U.*" 1; + "nuTilda.*" 1; } From 91c062e79456c8dee90dc30189fd0b611ff59f67 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 19 Jan 2012 16:29:03 +0000 Subject: [PATCH 06/12] Upgrade OpenMPI to 1.5.4 --- etc/config/settings.csh | 2 +- etc/config/settings.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/config/settings.csh b/etc/config/settings.csh index 2566cd6a9a..5eaed0c13c 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -372,7 +372,7 @@ unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN switch ("$WM_MPLIB") case OPENMPI: - setenv FOAM_MPI openmpi-1.5.3 + setenv FOAM_MPI openmpi-1.5.4 # optional configuration tweaks: _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh` diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 55810e6e9f..13939070cd 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -114,6 +114,16 @@ Linux) export WM_LDFLAGS='-mabi=64 -G0' ;; + armv7l) + WM_ARCH=linuxARM7 + export WM_COMPILER_LIB_ARCH=32 + export WM_CC='gcc' + export WM_CXX='g++' + export WM_CFLAGS='-fPIC' + export WM_CXXFLAGS='-fPIC' + export WM_LDFLAGS= + ;; + ppc64) WM_ARCH=linuxPPC64 export WM_COMPILER_LIB_ARCH=64 @@ -393,7 +403,7 @@ unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN case "$WM_MPLIB" in OPENMPI) - export FOAM_MPI=openmpi-1.5.3 + export FOAM_MPI=openmpi-1.5.4 # optional configuration tweaks: _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh` From 417a6539c9d299e2c0c226a389117ceba4185911 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 19 Jan 2012 16:29:31 +0000 Subject: [PATCH 07/12] Add initial support for ARM --- wmake/rules/linuxARM7/c | 16 ++++++++++++++++ wmake/rules/linuxARM7/c++ | 21 +++++++++++++++++++++ wmake/rules/linuxARM7/c++Debug | 2 ++ wmake/rules/linuxARM7/c++Opt | 2 ++ wmake/rules/linuxARM7/c++Prof | 2 ++ wmake/rules/linuxARM7/cDebug | 2 ++ wmake/rules/linuxARM7/cOpt | 2 ++ wmake/rules/linuxARM7/cProf | 2 ++ wmake/rules/linuxARM7/general | 9 +++++++++ 9 files changed, 58 insertions(+) create mode 100644 wmake/rules/linuxARM7/c create mode 100644 wmake/rules/linuxARM7/c++ create mode 100644 wmake/rules/linuxARM7/c++Debug create mode 100644 wmake/rules/linuxARM7/c++Opt create mode 100644 wmake/rules/linuxARM7/c++Prof create mode 100644 wmake/rules/linuxARM7/cDebug create mode 100644 wmake/rules/linuxARM7/cOpt create mode 100644 wmake/rules/linuxARM7/cProf create mode 100644 wmake/rules/linuxARM7/general diff --git a/wmake/rules/linuxARM7/c b/wmake/rules/linuxARM7/c new file mode 100644 index 0000000000..5be3206f84 --- /dev/null +++ b/wmake/rules/linuxARM7/c @@ -0,0 +1,16 @@ +.SUFFIXES: .c .h + +cWARN = -Wall + +cc = gcc + +include $(RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxARM7/c++ b/wmake/rules/linuxARM7/c++ new file mode 100644 index 0000000000..10d6b9cb33 --- /dev/null +++ b/wmake/rules/linuxARM7/c++ @@ -0,0 +1,21 @@ +.SUFFIXES: .C .cxx .cc .cpp + +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast + +CC = g++ + +include $(RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-100 + +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/linuxARM7/c++Debug b/wmake/rules/linuxARM7/c++Debug new file mode 100644 index 0000000000..19bdb9c334 --- /dev/null +++ b/wmake/rules/linuxARM7/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -ggdb3 -DFULLDEBUG +c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxARM7/c++Opt b/wmake/rules/linuxARM7/c++Opt new file mode 100644 index 0000000000..8f52814824 --- /dev/null +++ b/wmake/rules/linuxARM7/c++Opt @@ -0,0 +1,2 @@ +c++DBUG = +c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard diff --git a/wmake/rules/linuxARM7/c++Prof b/wmake/rules/linuxARM7/c++Prof new file mode 100644 index 0000000000..3bda4dad55 --- /dev/null +++ b/wmake/rules/linuxARM7/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/linuxARM7/cDebug b/wmake/rules/linuxARM7/cDebug new file mode 100644 index 0000000000..72b638f458 --- /dev/null +++ b/wmake/rules/linuxARM7/cDebug @@ -0,0 +1,2 @@ +cDBUG = -ggdb -DFULLDEBUG +cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxARM7/cOpt b/wmake/rules/linuxARM7/cOpt new file mode 100644 index 0000000000..1e61a7a81c --- /dev/null +++ b/wmake/rules/linuxARM7/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard diff --git a/wmake/rules/linuxARM7/cProf b/wmake/rules/linuxARM7/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/linuxARM7/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/linuxARM7/general b/wmake/rules/linuxARM7/general new file mode 100644 index 0000000000..fa1eb5b925 --- /dev/null +++ b/wmake/rules/linuxARM7/general @@ -0,0 +1,9 @@ +CPP = cpp -traditional-cpp $(GFLAGS) +LD = ld -melf_i386 + +PROJECT_LIBS = -l$(WM_PROJECT) -ldl + +include $(GENERAL_RULES)/standard + +include $(RULES)/c +include $(RULES)/c++ From 24084582b4faae4bac0a9174245ec278a77c0e4f Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 20 Jan 2012 13:04:44 +0000 Subject: [PATCH 08/12] ENH: Adding updates to Ensight converter (Mark Olesen) --- .../foamToEnsightParts/foamToEnsightParts.C | 37 +++++++++- src/conversion/ensight/file/ensightFile.C | 68 +++++++++++++------ src/conversion/ensight/file/ensightFile.H | 19 +++++- 3 files changed, 100 insertions(+), 24 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C index a96179e970..cb7f5705aa 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C @@ -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-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,6 +35,9 @@ Usage \param -ascii \n Write Ensight data in ASCII format instead of "C Binary" + \parm -name \\n + define sub-directory name to use for Ensight data (default: "Ensight") + \param -noZero \n Exclude the often incomplete initial conditions. @@ -46,6 +49,9 @@ Usage Suppress writing the geometry. Can be useful for converting partial results for a static geometry. + \param -width \\n + width of Ensight data subdir + Note - no parallel data. - writes to \a Ensight directory to avoid collisions with foamToEnsight. @@ -96,6 +102,19 @@ int main(int argc, char *argv[]) "suppress writing the geometry. " "Can be useful for converting partial results for a static geometry" ); + argList::addOption + ( + "name", + "subdir", + "define sub-directory name to use for Ensight data " + "(default: \"Ensight\")" + ); + argList::addOption + ( + "width", + "n", + "width of Ensight data subdir" + ); // the volume field types that we handle wordHashSet volFieldTypes; @@ -133,7 +152,21 @@ int main(int argc, char *argv[]) // always write the geometry, unless the -noMesh option is specified bool optNoMesh = args.optionFound("noMesh"); - fileName ensightDir = args.rootPath()/args.globalCaseName()/"Ensight"; + // adjust output width + if (args.optionFound("width")) + { + ensightFile::subDirWidth(args.optionRead