From e35713279bf690b3230d3499ff22efaeb0e79b14 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 11:21:24 +0000 Subject: [PATCH 01/38] bugfix: alpha parameter was not being written --- .../derived/turbulentInlet/turbulentInletFvPatchField.C | 6 +++--- .../derived/turbulentInlet/turbulentInletFvPatchField.H | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C index 1846ada328..ff96264cd4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C @@ -175,9 +175,8 @@ void turbulentInletFvPatchField::updateCoeffs() ranGen_.randomise(randomField[facei]); } - // Correction-factor proposed by Yi Wang to compensate for the loss - // of RMS fluctuation due to the temporal correlation introduced by - // the alpha parameter. + // Correction-factor to compensate for the loss of RMS fluctuation + // due to the temporal correlation introduced by the alpha parameter. scalar rmsCorr = sqrt(12*(2*alpha_ - sqr(alpha_)))/alpha_; patchField = @@ -206,6 +205,7 @@ void turbulentInletFvPatchField::write(Ostream& os) const os.writeKeyword("fluctuationScale") << fluctuationScale_ << token::END_STATEMENT << nl; referenceField_.writeEntry("referenceField", os); + os.writeKeyword("alpha") << alpha_ << token::END_STATEMENT << nl; this->writeEntry("value", os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H index 518a0f689f..944c7f991d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H @@ -63,7 +63,6 @@ class turbulentInletFvPatchField : public fixedValueFvPatchField { - // Private data Random ranGen_; From dda4777ebe5a8694b38383a40c61059c4f223059 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 13:11:26 +0000 Subject: [PATCH 02/38] moved setInjectorCellAndPosition functionality to injection model --- .../Templates/KinematicCloud/KinematicCloud.C | 61 +------------------ .../Templates/KinematicCloud/KinematicCloud.H | 7 --- .../Templates/ReactingCloud/ReactingCloud.C | 2 +- .../InjectionModel/InjectionModel.C | 51 ++++++++++++++++ .../InjectionModel/InjectionModel.H | 8 +++ 5 files changed, 61 insertions(+), 68 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index dc32224a00..cf651a54e1 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -35,65 +35,6 @@ License // * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // -template -void Foam::KinematicCloud::setInjectorCellAndPosition -( - label& pCell, - vector& pPosition -) -{ - const vector originalPosition = pPosition; - - bool foundCell = false; - - pCell = mesh_.findCell(pPosition); - - if (pCell >= 0) - { - const vector& C = mesh_.C()[pCell]; - pPosition += 1.0e-6*(C - pPosition); - - foundCell = mesh_.pointInCell - ( - pPosition, - pCell - ); - } - reduce(foundCell, orOp()); - - // Last chance - find nearest cell and try that one - // - the point is probably on an edge - if (!foundCell) - { - pCell = mesh_.findNearestCell(pPosition); - - if (pCell >= 0) - { - const vector& C = mesh_.C()[pCell]; - pPosition += 1.0e-6*(C - pPosition); - - foundCell = mesh_.pointInCell - ( - pPosition, - pCell - ); - } - reduce(foundCell, orOp()); - } - - if (!foundCell) - { - FatalErrorIn - ( - "void KinematicCloud::findInjectorCell" - "(label&, vector&)" - )<< "Cannot find parcel injection cell. " - << "Parcel position = " << originalPosition << nl - << abort(FatalError); - } -} - - template Foam::scalar Foam::KinematicCloud::setNumberOfParticles ( @@ -419,7 +360,7 @@ void Foam::KinematicCloud::inject // Determine the injection cell label pCell = -1; - setInjectorCellAndPosition(pCell, pPosition); + this->injection().findInjectorCellAndPosition(pCell, pPosition); if (pCell >= 0) { diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index ebd298c44e..f282b3f99f 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -223,13 +223,6 @@ protected: // Protected member functions - //- Set parcel position and cell into which parcel is introduced - void setInjectorCellAndPosition - ( - label& pCell, - vector& pPosition - ); - //- Set the number of particles per parcel scalar setNumberOfParticles ( diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 1f358d6f6c..3a2d27df7b 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -269,7 +269,7 @@ void Foam::ReactingCloud::inject // Determine the injection cell label pCell = -1; - this->setInjectorCellAndPosition(pCell, pPosition); + this->injection().findInjectorCellAndPosition(pCell, pPosition); if (pCell >= 0) { diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index d6605d6f46..f23dc19c0a 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -159,6 +159,57 @@ void Foam::InjectionModel::prepareForNextTimeStep } +template +void Foam::InjectionModel::findInjectorCellAndPosition +( + label& cellI, + vector& position +) +{ + const vector p0 = position; + + bool foundCell = false; + + cellI = owner_.mesh().findCell(position); + + if (cellI >= 0) + { + const vector& C = owner_.mesh().C()[cellI]; + position += 1.0e-6*(C - position); + + foundCell = owner_.mesh().pointInCell(position, cellI); + } + reduce(foundCell, orOp()); + + // Last chance - find nearest cell and try that one + // - the point is probably on an edge + if (!foundCell) + { + cellI = owner_.mesh().findNearestCell(position); + + if (cellI >= 0) + { + const vector& C = owner_.mesh().C()[cellI]; + position += 1.0e-6*(C - position); + + foundCell = owner_.mesh().pointInCell(position, cellI); + } + reduce(foundCell, orOp()); + } + + if (!foundCell) + { + FatalErrorIn + ( + "InjectionModel::setInjectorCellAndPosition" + "(label&, vector&)" + )<< "Cannot find parcel injection cell. " + << "Parcel position = " << p0 << nl + << abort(FatalError); + } +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #include "NewInjectionModel.C" diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H index f19d59723f..0b00ebeda9 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H @@ -208,6 +208,14 @@ public: // Injection geometry + //- Find the cell that contains the injector position + // Will modify position slightly towards the owner cell centroid + virtual void findInjectorCellAndPosition + ( + label& cellI, + vector& position + ); + //- Return the injection position virtual vector position ( From 72066fd6458bde821b344e4424c9956e31391be3 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 13:24:32 +0000 Subject: [PATCH 03/38] minor clean-up --- .../clouds/Templates/KinematicCloud/KinematicCloud.C | 8 ++------ .../clouds/Templates/KinematicCloud/KinematicCloud.H | 6 +----- .../clouds/Templates/ReactingCloud/ReactingCloud.C | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index cf651a54e1..7b67515b07 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -382,7 +382,7 @@ void Foam::KinematicCloud::inject pPtr->stepFraction() = (this->db().time().deltaT().value() - dt) /this->time().deltaT().value(); - this->injectParcel(td, pPtr); + this->injectParcel(pPtr); } } @@ -397,11 +397,7 @@ void Foam::KinematicCloud::inject template template -void Foam::KinematicCloud::injectParcel -( - TrackingData& td, - ParcelType* p -) +void Foam::KinematicCloud::injectParcel(ParcelType* p) { addParticle(p); nParcelsAdded_++; diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index f282b3f99f..6b482d0bea 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -239,11 +239,7 @@ protected: //- Inject parcel if it is valid - delete otherwise template - void injectParcel - ( - TrackingData& td, - ParcelType* p - ); + void injectParcel(ParcelType* p); //- Post-injection checks void postInjectCheck(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 3a2d27df7b..2f81a702f9 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -295,7 +295,7 @@ void Foam::ReactingCloud::inject pPtr->stepFraction() = (this->db().time().deltaT().value() - dt) /this->db().time().deltaT().value(); - this->injectParcel(td, pPtr); + this->injectParcel(pPtr); } } From 532721b804ef15dce9baeb2f53d69cb37eef63f6 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 13:29:50 +0000 Subject: [PATCH 04/38] minor fix on trackData --- .../clouds/Templates/KinematicCloud/KinematicCloud.C | 1 - .../clouds/Templates/KinematicCloud/KinematicCloud.H | 1 - 2 files changed, 2 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index 7b67515b07..fed08dcd47 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -396,7 +396,6 @@ void Foam::KinematicCloud::inject template -template void Foam::KinematicCloud::injectParcel(ParcelType* p) { addParticle(p); diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index 6b482d0bea..f2e77b607e 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -238,7 +238,6 @@ protected: void inject(TrackingData& td); //- Inject parcel if it is valid - delete otherwise - template void injectParcel(ParcelType* p); //- Post-injection checks From 0421563db0d37dc5156410f9615e43a5533298a9 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 13:44:48 +0000 Subject: [PATCH 05/38] more tidying up: NOTE - inject() functionality should be moved to the injection sub-model --- .../Templates/KinematicCloud/KinematicCloud.C | 14 +++++--------- .../Templates/KinematicCloud/KinematicCloud.H | 3 +-- .../clouds/Templates/ReactingCloud/ReactingCloud.C | 14 +++++--------- .../clouds/Templates/ReactingCloud/ReactingCloud.H | 3 +-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index fed08dcd47..1a59476437 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -265,7 +265,7 @@ void Foam::KinematicCloud::evolve() g_.value() ); - inject(td); + inject(); if (coupled_) { @@ -277,15 +277,11 @@ void Foam::KinematicCloud::evolve() template -template -void Foam::KinematicCloud::inject -( - TrackingData& td -) +void Foam::KinematicCloud::inject() { scalar time = this->db().time().value(); - scalar pRho = td.constProps().rho0(); + scalar pRho = constProps_.rho0(); this->injection().prepareForNextTimeStep(time0_, time); @@ -367,14 +363,14 @@ void Foam::KinematicCloud::inject // construct the parcel that is to be injected ParcelType* pPtr = new ParcelType ( - td.cloud(), + *this, parcelTypeId_, pPosition, pCell, pDiameter, pU, pNumberOfParticles, - td.constProps() + constProps_ ); scalar dt = time - timeInj; diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index f2e77b607e..0d3781413c 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -234,8 +234,7 @@ protected: ); //- Inject more parcels - template - void inject(TrackingData& td); + void inject(); //- Inject parcel if it is valid - delete otherwise void injectParcel(ParcelType* p); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 2f81a702f9..4bad764272 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -174,7 +174,7 @@ void Foam::ReactingCloud::evolve() this->g().value() ); - inject(td); + inject(); if (this->coupled()) { @@ -186,15 +186,11 @@ void Foam::ReactingCloud::evolve() template -template -void Foam::ReactingCloud::inject -( - TrackingData& td -) +void Foam::ReactingCloud::inject() { scalar time = this->db().time().value(); - scalar pRho = td.constProps().rho0(); + scalar pRho = this->constProps().rho0(); this->injection().prepareForNextTimeStep(this->time0(), time); @@ -276,7 +272,7 @@ void Foam::ReactingCloud::inject // construct the parcel that is to be injected ParcelType* pPtr = new ParcelType ( - td.cloud(), + *this, this->parcelTypeId(), pPosition, pCell, @@ -287,7 +283,7 @@ void Foam::ReactingCloud::inject composition().YLiquid0(), composition().YSolid0(), composition().YMixture0(), - td.constProps() + this->constProps() ); scalar dt = time - timeInj; diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H index d1c60f5a97..9ce5c98b1a 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H @@ -117,8 +117,7 @@ class ReactingCloud protected: //- Inject more parcels - template - void inject(TrackingData& td); + void inject(); public: From dbe5e08213b45a8072f80a64bab05479e24d34ff Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 13:59:05 +0000 Subject: [PATCH 06/38] minor mods: - added pdFinal option - labelled muf - grad(muf) used, so can now manipulate in fvSolution etc - added absolute/relative around the calculation of divU --- .../compressibleInterDyMFoam/UEqn.H | 7 +++- .../alphaEqnsSubCycle.H | 2 + .../compressibleInterDyMFoam/pEqn.H | 40 ++++++++++++++----- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H index 90033f9826..53257cf369 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H @@ -1,6 +1,9 @@ - surfaceScalarField muf = + surfaceScalarField muf + ( + "muf", twoPhaseProperties.muf() - + fvc::interpolate(rho*turbulence->nut()); + + fvc::interpolate(rho*turbulence->nut()) + ); fvVectorMatrix UEqn ( diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H index e161a3cbe6..32a7163130 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H @@ -12,7 +12,9 @@ surfaceScalarField phic = mag(phi/mesh.magSf()); phic = min(interface.cAlpha()*phic, max(phic)); + fvc::makeAbsolute(phi, U); volScalarField divU = fvc::div(phi); + fvc::makeRelative(phi, U); if (nAlphaSubCycles > 1) { diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H index b0f3378408..7e4b37061f 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H @@ -30,7 +30,7 @@ - ghf*fvc::snGrad(rho) )*rUAf*mesh.magSf(); - for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { fvScalarMatrix pdEqnIncomp ( @@ -38,15 +38,36 @@ - fvm::laplacian(rUAf, pd) ); - solve + if ( + oCorr == nOuterCorr-1 + && corr == nCorr-1 + && nonOrth == nNonOrthCorr + ) + { + solve ( - max(alpha1, scalar(0))*(psi1/rho1) - + max(alpha2, scalar(0))*(psi2/rho2) - ) - *pdEqnComp() - + pdEqnIncomp - ); + ( + max(alpha1, scalar(0))*(psi1/rho1) + + max(alpha2, scalar(0))*(psi2/rho2) + ) + *pdEqnComp() + + pdEqnIncomp, + mesh.solver(pd.name() + "Final") + ); + } + else + { + solve + ( + ( + max(alpha1, scalar(0))*(psi1/rho1) + + max(alpha2, scalar(0))*(psi2/rho2) + ) + *pdEqnComp() + + pdEqnIncomp + ); + } if (nonOrth == nNonOrthCorr) { @@ -62,7 +83,8 @@ p = max ( - (pd + gh*(alpha1*rho10 + alpha2*rho20))/(1.0 - gh*(alpha1*psi1 + alpha2*psi2)), + (pd + gh*(alpha1*rho10 + alpha2*rho20)) + /(1.0 - gh*(alpha1*psi1 + alpha2*psi2)), pMin ); From 393e4d232e718d4ca82f996707e3255df921c9e5 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 14:01:00 +0000 Subject: [PATCH 07/38] added explicit call to UEqn.relax() --- applications/solvers/incompressible/pisoFoam/pisoFoam.C | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C index 1c8a534db2..b2722a466c 100644 --- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C +++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C @@ -70,6 +70,8 @@ int main(int argc, char *argv[]) + turbulence->divDevReff(U) ); + UEqn.relax(); + if (momentumPredictor) { solve(UEqn == -fvc::grad(p)); From 959667711988903abb620e3e3c477c9c831fd42e Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 14:03:49 +0000 Subject: [PATCH 08/38] labelled muf - grad(muf) used, so can now manipulate in fvSolution etc --- .../solvers/multiphase/interPhaseChangeFoam/UEqn.H | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H index f020863077..e4a44712c0 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H @@ -1,6 +1,9 @@ - surfaceScalarField muf = + surfaceScalarField muf + ( + "muf", twoPhaseProperties->muf() - + fvc::interpolate(rho*turbulence->nut()); + + fvc::interpolate(rho*turbulence->nut()) + ); fvVectorMatrix UEqn ( From c5c622e1ab6aafacdcabdbccad28eb6368293029 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 14:45:28 +0000 Subject: [PATCH 09/38] adding pFinal --- applications/solvers/multiphase/cavitatingFoam/pEqn.H | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H index c9382dfc0f..c22aa76479 100644 --- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H @@ -1,7 +1,7 @@ { if (nOuterCorr == 1) { - p = + p = ( rho - (1.0 - gamma)*rhol0 @@ -37,7 +37,14 @@ - fvm::laplacian(rUAf, p) ); - pEqn.solve(); + if (corr == nCorr-1 && nonOrth == nNonOrthCorr) + { + pEqn.solve(mesh.solver(p.name() + "Final")); + } + else + { + pEqn.solve(mesh.solver(p.name())); + } if (nonOrth == nNonOrthCorr) { From 468668d0be18d57bbac1613703b812ac87c82142 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 14:48:54 +0000 Subject: [PATCH 10/38] muf -> muEff for consistency --- .../solvers/multiphase/compressibleInterDyMFoam/UEqn.H | 8 ++++---- .../solvers/multiphase/interPhaseChangeFoam/UEqn.H | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H index 53257cf369..1576f6ba78 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H @@ -1,6 +1,6 @@ - surfaceScalarField muf + surfaceScalarField muEff ( - "muf", + "muEff", twoPhaseProperties.muf() + fvc::interpolate(rho*turbulence->nut()) ); @@ -9,8 +9,8 @@ ( fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - - fvm::laplacian(muf, U) - - (fvc::grad(U) & fvc::grad(muf)) + - fvm::laplacian(muEff, U) + - (fvc::grad(U) & fvc::grad(muEff)) //- fvc::div(muf*(mesh.Sf() & fvc::interpolate(fvc::grad(U)().T()))) ); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H index e4a44712c0..c59137c7b8 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H @@ -1,6 +1,6 @@ - surfaceScalarField muf + surfaceScalarField muEff ( - "muf", + "muEff", twoPhaseProperties->muf() + fvc::interpolate(rho*turbulence->nut()) ); @@ -10,9 +10,9 @@ fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - fvm::Sp(fvc::ddt(rho) + fvc::div(rhoPhi), U) - - fvm::laplacian(muf, U) - - (fvc::grad(U) & fvc::grad(muf)) - //- fvc::div(muf*(fvc::interpolate(dev2(fvc::grad(U))) & mesh.Sf())) + - fvm::laplacian(muEff, U) + - (fvc::grad(U) & fvc::grad(muEff)) + //- fvc::div(muEff*(fvc::interpolate(dev2(fvc::grad(U))) & mesh.Sf())) ); UEqn.relax(); From a49ddb5fe2ce685d59c5dc046fd90190bc7d4579 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 15:44:26 +0000 Subject: [PATCH 11/38] moving function objects to functionObjects sub-folder --- src/postProcessing/functionObjects/Allwmake | 10 ++++++++++ .../{ => functionObjects}/fieldAverage/Make/files | 0 .../{ => functionObjects}/fieldAverage/Make/options | 0 .../{ => functionObjects}/fieldAverage/controlDict | 0 .../fieldAverage/fieldAverage/IOFieldAverage.H | 0 .../fieldAverage/fieldAverage/fieldAverage.C | 0 .../fieldAverage/fieldAverage/fieldAverage.H | 0 .../fieldAverage/fieldAverage/fieldAverageTemplates.C | 0 .../fieldAverageFunctionObject.C | 0 .../fieldAverageFunctionObject.H | 0 .../fieldAverage/fieldAverageItem/fieldAverageItem.C | 0 .../fieldAverage/fieldAverageItem/fieldAverageItem.H | 0 .../fieldAverage/fieldAverageItem/fieldAverageItemIO.C | 0 .../{ => functionObjects}/forces/Make/files | 0 .../{ => functionObjects}/forces/Make/options | 0 .../forces/forceCoeffs/IOforceCoeffs.H | 0 .../forces/forceCoeffs/forceCoeffs.C | 0 .../forces/forceCoeffs/forceCoeffs.H | 0 .../forces/forceCoeffs/forceCoeffsFunctionObject.C | 0 .../forces/forceCoeffs/forceCoeffsFunctionObject.H | 0 .../{ => functionObjects}/forces/forces/IOforces.H | 0 .../{ => functionObjects}/forces/forces/forces.C | 0 .../{ => functionObjects}/forces/forces/forces.H | 0 .../forces/forces/forcesFunctionObject.C | 0 .../forces/forces/forcesFunctionObject.H | 0 .../minMaxFields/IOminMaxFields.H | 0 .../{ => functionObjects}/minMaxFields/Make/files | 0 .../{ => functionObjects}/minMaxFields/Make/options | 0 .../{ => functionObjects}/minMaxFields/minMaxFields.C | 0 .../{ => functionObjects}/minMaxFields/minMaxFields.H | 0 .../minMaxFields/minMaxFieldsFunctionObject.C | 0 .../minMaxFields/minMaxFieldsFunctionObject.H | 0 .../minMaxFields/minMaxFieldsTemplates.C | 0 .../{ => functionObjects}/systemCall/IOsystemCall.H | 0 .../{ => functionObjects}/systemCall/Make/files | 0 .../{ => functionObjects}/systemCall/Make/options | 0 .../{ => functionObjects}/systemCall/systemCall.C | 0 .../{ => functionObjects}/systemCall/systemCall.H | 0 .../systemCall/systemCallFunctionObject.C | 0 .../systemCall/systemCallFunctionObject.H | 0 40 files changed, 10 insertions(+) create mode 100755 src/postProcessing/functionObjects/Allwmake rename src/postProcessing/{ => functionObjects}/fieldAverage/Make/files (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/Make/options (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/controlDict (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/IOFieldAverage.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/fieldAverage.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/fieldAverage.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/fieldAverageTemplates.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageItem/fieldAverageItem.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageItem/fieldAverageItem.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageItem/fieldAverageItemIO.C (100%) rename src/postProcessing/{ => functionObjects}/forces/Make/files (100%) rename src/postProcessing/{ => functionObjects}/forces/Make/options (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/IOforceCoeffs.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffs.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffs.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffsFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffsFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/IOforces.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forces.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forces.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forcesFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forcesFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/IOminMaxFields.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/Make/files (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/Make/options (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFields.C (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFields.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFieldsFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFieldsFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFieldsTemplates.C (100%) rename src/postProcessing/{ => functionObjects}/systemCall/IOsystemCall.H (100%) rename src/postProcessing/{ => functionObjects}/systemCall/Make/files (100%) rename src/postProcessing/{ => functionObjects}/systemCall/Make/options (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCall.C (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCall.H (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCallFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCallFunctionObject.H (100%) diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake new file mode 100755 index 0000000000..48e5f4d856 --- /dev/null +++ b/src/postProcessing/functionObjects/Allwmake @@ -0,0 +1,10 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +set -x + +wmake libso fieldAverage +wmake libso forces +wmake libso minMaxFields +wmake libso systemCall + +# ----------------------------------------------------------------- end-of-file diff --git a/src/postProcessing/fieldAverage/Make/files b/src/postProcessing/functionObjects/fieldAverage/Make/files similarity index 100% rename from src/postProcessing/fieldAverage/Make/files rename to src/postProcessing/functionObjects/fieldAverage/Make/files diff --git a/src/postProcessing/fieldAverage/Make/options b/src/postProcessing/functionObjects/fieldAverage/Make/options similarity index 100% rename from src/postProcessing/fieldAverage/Make/options rename to src/postProcessing/functionObjects/fieldAverage/Make/options diff --git a/src/postProcessing/fieldAverage/controlDict b/src/postProcessing/functionObjects/fieldAverage/controlDict similarity index 100% rename from src/postProcessing/fieldAverage/controlDict rename to src/postProcessing/functionObjects/fieldAverage/controlDict diff --git a/src/postProcessing/fieldAverage/fieldAverage/IOFieldAverage.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/IOFieldAverage.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/IOFieldAverage.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/IOFieldAverage.H diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.C diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.H diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverageTemplates.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/fieldAverageTemplates.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverageTemplates.C diff --git a/src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C diff --git a/src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H diff --git a/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.C diff --git a/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.H diff --git a/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItemIO.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItemIO.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItemIO.C diff --git a/src/postProcessing/forces/Make/files b/src/postProcessing/functionObjects/forces/Make/files similarity index 100% rename from src/postProcessing/forces/Make/files rename to src/postProcessing/functionObjects/forces/Make/files diff --git a/src/postProcessing/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options similarity index 100% rename from src/postProcessing/forces/Make/options rename to src/postProcessing/functionObjects/forces/Make/options diff --git a/src/postProcessing/forces/forceCoeffs/IOforceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/IOforceCoeffs.H similarity index 100% rename from src/postProcessing/forces/forceCoeffs/IOforceCoeffs.H rename to src/postProcessing/functionObjects/forces/forceCoeffs/IOforceCoeffs.H diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffs.C rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffs.H rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.C similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.C rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.C diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.H similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.H rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.H diff --git a/src/postProcessing/forces/forces/IOforces.H b/src/postProcessing/functionObjects/forces/forces/IOforces.H similarity index 100% rename from src/postProcessing/forces/forces/IOforces.H rename to src/postProcessing/functionObjects/forces/forces/IOforces.H diff --git a/src/postProcessing/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C similarity index 100% rename from src/postProcessing/forces/forces/forces.C rename to src/postProcessing/functionObjects/forces/forces/forces.C diff --git a/src/postProcessing/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H similarity index 100% rename from src/postProcessing/forces/forces/forces.H rename to src/postProcessing/functionObjects/forces/forces/forces.H diff --git a/src/postProcessing/forces/forces/forcesFunctionObject.C b/src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.C similarity index 100% rename from src/postProcessing/forces/forces/forcesFunctionObject.C rename to src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.C diff --git a/src/postProcessing/forces/forces/forcesFunctionObject.H b/src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.H similarity index 100% rename from src/postProcessing/forces/forces/forcesFunctionObject.H rename to src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.H diff --git a/src/postProcessing/minMaxFields/IOminMaxFields.H b/src/postProcessing/functionObjects/minMaxFields/IOminMaxFields.H similarity index 100% rename from src/postProcessing/minMaxFields/IOminMaxFields.H rename to src/postProcessing/functionObjects/minMaxFields/IOminMaxFields.H diff --git a/src/postProcessing/minMaxFields/Make/files b/src/postProcessing/functionObjects/minMaxFields/Make/files similarity index 100% rename from src/postProcessing/minMaxFields/Make/files rename to src/postProcessing/functionObjects/minMaxFields/Make/files diff --git a/src/postProcessing/minMaxFields/Make/options b/src/postProcessing/functionObjects/minMaxFields/Make/options similarity index 100% rename from src/postProcessing/minMaxFields/Make/options rename to src/postProcessing/functionObjects/minMaxFields/Make/options diff --git a/src/postProcessing/minMaxFields/minMaxFields.C b/src/postProcessing/functionObjects/minMaxFields/minMaxFields.C similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFields.C rename to src/postProcessing/functionObjects/minMaxFields/minMaxFields.C diff --git a/src/postProcessing/minMaxFields/minMaxFields.H b/src/postProcessing/functionObjects/minMaxFields/minMaxFields.H similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFields.H rename to src/postProcessing/functionObjects/minMaxFields/minMaxFields.H diff --git a/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.C b/src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.C similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.C rename to src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.C diff --git a/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.H b/src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.H similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.H rename to src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.H diff --git a/src/postProcessing/minMaxFields/minMaxFieldsTemplates.C b/src/postProcessing/functionObjects/minMaxFields/minMaxFieldsTemplates.C similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFieldsTemplates.C rename to src/postProcessing/functionObjects/minMaxFields/minMaxFieldsTemplates.C diff --git a/src/postProcessing/systemCall/IOsystemCall.H b/src/postProcessing/functionObjects/systemCall/IOsystemCall.H similarity index 100% rename from src/postProcessing/systemCall/IOsystemCall.H rename to src/postProcessing/functionObjects/systemCall/IOsystemCall.H diff --git a/src/postProcessing/systemCall/Make/files b/src/postProcessing/functionObjects/systemCall/Make/files similarity index 100% rename from src/postProcessing/systemCall/Make/files rename to src/postProcessing/functionObjects/systemCall/Make/files diff --git a/src/postProcessing/systemCall/Make/options b/src/postProcessing/functionObjects/systemCall/Make/options similarity index 100% rename from src/postProcessing/systemCall/Make/options rename to src/postProcessing/functionObjects/systemCall/Make/options diff --git a/src/postProcessing/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C similarity index 100% rename from src/postProcessing/systemCall/systemCall.C rename to src/postProcessing/functionObjects/systemCall/systemCall.C diff --git a/src/postProcessing/systemCall/systemCall.H b/src/postProcessing/functionObjects/systemCall/systemCall.H similarity index 100% rename from src/postProcessing/systemCall/systemCall.H rename to src/postProcessing/functionObjects/systemCall/systemCall.H diff --git a/src/postProcessing/systemCall/systemCallFunctionObject.C b/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C similarity index 100% rename from src/postProcessing/systemCall/systemCallFunctionObject.C rename to src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C diff --git a/src/postProcessing/systemCall/systemCallFunctionObject.H b/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H similarity index 100% rename from src/postProcessing/systemCall/systemCallFunctionObject.H rename to src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H From 894f8f3b136a4bcaa26e803502d0512b11771ba8 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 15:44:26 +0000 Subject: [PATCH 12/38] moving function objects to functionObjects sub-folder --- src/postProcessing/Allwmake | 6 ++---- src/postProcessing/functionObjects/Allwmake | 10 ++++++++++ .../{ => functionObjects}/fieldAverage/Make/files | 0 .../{ => functionObjects}/fieldAverage/Make/options | 0 .../{ => functionObjects}/fieldAverage/controlDict | 0 .../fieldAverage/fieldAverage/IOFieldAverage.H | 0 .../fieldAverage/fieldAverage/fieldAverage.C | 0 .../fieldAverage/fieldAverage/fieldAverage.H | 0 .../fieldAverage/fieldAverage/fieldAverageTemplates.C | 0 .../fieldAverageFunctionObject.C | 0 .../fieldAverageFunctionObject.H | 0 .../fieldAverage/fieldAverageItem/fieldAverageItem.C | 0 .../fieldAverage/fieldAverageItem/fieldAverageItem.H | 0 .../fieldAverage/fieldAverageItem/fieldAverageItemIO.C | 0 .../{ => functionObjects}/forces/Make/files | 0 .../{ => functionObjects}/forces/Make/options | 0 .../forces/forceCoeffs/IOforceCoeffs.H | 0 .../forces/forceCoeffs/forceCoeffs.C | 0 .../forces/forceCoeffs/forceCoeffs.H | 0 .../forces/forceCoeffs/forceCoeffsFunctionObject.C | 0 .../forces/forceCoeffs/forceCoeffsFunctionObject.H | 0 .../{ => functionObjects}/forces/forces/IOforces.H | 0 .../{ => functionObjects}/forces/forces/forces.C | 0 .../{ => functionObjects}/forces/forces/forces.H | 0 .../forces/forces/forcesFunctionObject.C | 0 .../forces/forces/forcesFunctionObject.H | 0 .../minMaxFields/IOminMaxFields.H | 0 .../{ => functionObjects}/minMaxFields/Make/files | 0 .../{ => functionObjects}/minMaxFields/Make/options | 0 .../{ => functionObjects}/minMaxFields/minMaxFields.C | 0 .../{ => functionObjects}/minMaxFields/minMaxFields.H | 0 .../minMaxFields/minMaxFieldsFunctionObject.C | 0 .../minMaxFields/minMaxFieldsFunctionObject.H | 0 .../minMaxFields/minMaxFieldsTemplates.C | 0 .../{ => functionObjects}/systemCall/IOsystemCall.H | 0 .../{ => functionObjects}/systemCall/Make/files | 0 .../{ => functionObjects}/systemCall/Make/options | 0 .../{ => functionObjects}/systemCall/systemCall.C | 0 .../{ => functionObjects}/systemCall/systemCall.H | 0 .../systemCall/systemCallFunctionObject.C | 0 .../systemCall/systemCallFunctionObject.H | 0 41 files changed, 12 insertions(+), 4 deletions(-) create mode 100755 src/postProcessing/functionObjects/Allwmake rename src/postProcessing/{ => functionObjects}/fieldAverage/Make/files (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/Make/options (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/controlDict (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/IOFieldAverage.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/fieldAverage.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/fieldAverage.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverage/fieldAverageTemplates.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageItem/fieldAverageItem.C (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageItem/fieldAverageItem.H (100%) rename src/postProcessing/{ => functionObjects}/fieldAverage/fieldAverageItem/fieldAverageItemIO.C (100%) rename src/postProcessing/{ => functionObjects}/forces/Make/files (100%) rename src/postProcessing/{ => functionObjects}/forces/Make/options (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/IOforceCoeffs.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffs.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffs.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffsFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forceCoeffs/forceCoeffsFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/IOforces.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forces.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forces.H (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forcesFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/forces/forces/forcesFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/IOminMaxFields.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/Make/files (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/Make/options (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFields.C (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFields.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFieldsFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFieldsFunctionObject.H (100%) rename src/postProcessing/{ => functionObjects}/minMaxFields/minMaxFieldsTemplates.C (100%) rename src/postProcessing/{ => functionObjects}/systemCall/IOsystemCall.H (100%) rename src/postProcessing/{ => functionObjects}/systemCall/Make/files (100%) rename src/postProcessing/{ => functionObjects}/systemCall/Make/options (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCall.C (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCall.H (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCallFunctionObject.C (100%) rename src/postProcessing/{ => functionObjects}/systemCall/systemCallFunctionObject.H (100%) diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake index e1f7cc56d8..ab7328b651 100755 --- a/src/postProcessing/Allwmake +++ b/src/postProcessing/Allwmake @@ -3,10 +3,8 @@ cd ${0%/*} || exit 1 # run from this directory set -x wmake libo postCalc -wmake libso forces -wmake libso fieldAverage wmake libso foamCalcFunctions -wmake libso minMaxFields -wmake libso systemCall + +(cd functionObjects && ./Allwmake) # ----------------------------------------------------------------- end-of-file diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake new file mode 100755 index 0000000000..48e5f4d856 --- /dev/null +++ b/src/postProcessing/functionObjects/Allwmake @@ -0,0 +1,10 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +set -x + +wmake libso fieldAverage +wmake libso forces +wmake libso minMaxFields +wmake libso systemCall + +# ----------------------------------------------------------------- end-of-file diff --git a/src/postProcessing/fieldAverage/Make/files b/src/postProcessing/functionObjects/fieldAverage/Make/files similarity index 100% rename from src/postProcessing/fieldAverage/Make/files rename to src/postProcessing/functionObjects/fieldAverage/Make/files diff --git a/src/postProcessing/fieldAverage/Make/options b/src/postProcessing/functionObjects/fieldAverage/Make/options similarity index 100% rename from src/postProcessing/fieldAverage/Make/options rename to src/postProcessing/functionObjects/fieldAverage/Make/options diff --git a/src/postProcessing/fieldAverage/controlDict b/src/postProcessing/functionObjects/fieldAverage/controlDict similarity index 100% rename from src/postProcessing/fieldAverage/controlDict rename to src/postProcessing/functionObjects/fieldAverage/controlDict diff --git a/src/postProcessing/fieldAverage/fieldAverage/IOFieldAverage.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/IOFieldAverage.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/IOFieldAverage.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/IOFieldAverage.H diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/fieldAverage.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.C diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverage.H diff --git a/src/postProcessing/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverageTemplates.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverage/fieldAverageTemplates.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverage/fieldAverageTemplates.C diff --git a/src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C diff --git a/src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H diff --git a/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.C diff --git a/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.H similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItem.H rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItem.H diff --git a/src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItemIO.C similarity index 100% rename from src/postProcessing/fieldAverage/fieldAverageItem/fieldAverageItemIO.C rename to src/postProcessing/functionObjects/fieldAverage/fieldAverageItem/fieldAverageItemIO.C diff --git a/src/postProcessing/forces/Make/files b/src/postProcessing/functionObjects/forces/Make/files similarity index 100% rename from src/postProcessing/forces/Make/files rename to src/postProcessing/functionObjects/forces/Make/files diff --git a/src/postProcessing/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options similarity index 100% rename from src/postProcessing/forces/Make/options rename to src/postProcessing/functionObjects/forces/Make/options diff --git a/src/postProcessing/forces/forceCoeffs/IOforceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/IOforceCoeffs.H similarity index 100% rename from src/postProcessing/forces/forceCoeffs/IOforceCoeffs.H rename to src/postProcessing/functionObjects/forces/forceCoeffs/IOforceCoeffs.H diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffs.C rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffs.H rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.C similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.C rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.C diff --git a/src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.H similarity index 100% rename from src/postProcessing/forces/forceCoeffs/forceCoeffsFunctionObject.H rename to src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.H diff --git a/src/postProcessing/forces/forces/IOforces.H b/src/postProcessing/functionObjects/forces/forces/IOforces.H similarity index 100% rename from src/postProcessing/forces/forces/IOforces.H rename to src/postProcessing/functionObjects/forces/forces/IOforces.H diff --git a/src/postProcessing/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C similarity index 100% rename from src/postProcessing/forces/forces/forces.C rename to src/postProcessing/functionObjects/forces/forces/forces.C diff --git a/src/postProcessing/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H similarity index 100% rename from src/postProcessing/forces/forces/forces.H rename to src/postProcessing/functionObjects/forces/forces/forces.H diff --git a/src/postProcessing/forces/forces/forcesFunctionObject.C b/src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.C similarity index 100% rename from src/postProcessing/forces/forces/forcesFunctionObject.C rename to src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.C diff --git a/src/postProcessing/forces/forces/forcesFunctionObject.H b/src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.H similarity index 100% rename from src/postProcessing/forces/forces/forcesFunctionObject.H rename to src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.H diff --git a/src/postProcessing/minMaxFields/IOminMaxFields.H b/src/postProcessing/functionObjects/minMaxFields/IOminMaxFields.H similarity index 100% rename from src/postProcessing/minMaxFields/IOminMaxFields.H rename to src/postProcessing/functionObjects/minMaxFields/IOminMaxFields.H diff --git a/src/postProcessing/minMaxFields/Make/files b/src/postProcessing/functionObjects/minMaxFields/Make/files similarity index 100% rename from src/postProcessing/minMaxFields/Make/files rename to src/postProcessing/functionObjects/minMaxFields/Make/files diff --git a/src/postProcessing/minMaxFields/Make/options b/src/postProcessing/functionObjects/minMaxFields/Make/options similarity index 100% rename from src/postProcessing/minMaxFields/Make/options rename to src/postProcessing/functionObjects/minMaxFields/Make/options diff --git a/src/postProcessing/minMaxFields/minMaxFields.C b/src/postProcessing/functionObjects/minMaxFields/minMaxFields.C similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFields.C rename to src/postProcessing/functionObjects/minMaxFields/minMaxFields.C diff --git a/src/postProcessing/minMaxFields/minMaxFields.H b/src/postProcessing/functionObjects/minMaxFields/minMaxFields.H similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFields.H rename to src/postProcessing/functionObjects/minMaxFields/minMaxFields.H diff --git a/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.C b/src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.C similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.C rename to src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.C diff --git a/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.H b/src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.H similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.H rename to src/postProcessing/functionObjects/minMaxFields/minMaxFieldsFunctionObject.H diff --git a/src/postProcessing/minMaxFields/minMaxFieldsTemplates.C b/src/postProcessing/functionObjects/minMaxFields/minMaxFieldsTemplates.C similarity index 100% rename from src/postProcessing/minMaxFields/minMaxFieldsTemplates.C rename to src/postProcessing/functionObjects/minMaxFields/minMaxFieldsTemplates.C diff --git a/src/postProcessing/systemCall/IOsystemCall.H b/src/postProcessing/functionObjects/systemCall/IOsystemCall.H similarity index 100% rename from src/postProcessing/systemCall/IOsystemCall.H rename to src/postProcessing/functionObjects/systemCall/IOsystemCall.H diff --git a/src/postProcessing/systemCall/Make/files b/src/postProcessing/functionObjects/systemCall/Make/files similarity index 100% rename from src/postProcessing/systemCall/Make/files rename to src/postProcessing/functionObjects/systemCall/Make/files diff --git a/src/postProcessing/systemCall/Make/options b/src/postProcessing/functionObjects/systemCall/Make/options similarity index 100% rename from src/postProcessing/systemCall/Make/options rename to src/postProcessing/functionObjects/systemCall/Make/options diff --git a/src/postProcessing/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C similarity index 100% rename from src/postProcessing/systemCall/systemCall.C rename to src/postProcessing/functionObjects/systemCall/systemCall.C diff --git a/src/postProcessing/systemCall/systemCall.H b/src/postProcessing/functionObjects/systemCall/systemCall.H similarity index 100% rename from src/postProcessing/systemCall/systemCall.H rename to src/postProcessing/functionObjects/systemCall/systemCall.H diff --git a/src/postProcessing/systemCall/systemCallFunctionObject.C b/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C similarity index 100% rename from src/postProcessing/systemCall/systemCallFunctionObject.C rename to src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C diff --git a/src/postProcessing/systemCall/systemCallFunctionObject.H b/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H similarity index 100% rename from src/postProcessing/systemCall/systemCallFunctionObject.H rename to src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H From 14314fc1268a63b10d865d9be033646b2bdc523a Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 16:39:35 +0000 Subject: [PATCH 13/38] correcting script for refs/heads/master instead of HEAD - if local repo is up to date, HEAD and origin/HEAD are the same so id was returned twice --- wmake/wmakePrintBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmake/wmakePrintBuild b/wmake/wmakePrintBuild index 868357fe58..1eb59cf46c 100755 --- a/wmake/wmakePrintBuild +++ b/wmake/wmakePrintBuild @@ -94,7 +94,7 @@ then rc=0 else # building under git (get the head SHA1) - version=$(git show-ref --hash=12 --head HEAD 2>/dev/null) + version=$(git show-ref --hash=12 --head refs/heads/master 2>/dev/null) rc=$? # prefix with WM_PROJECT_VERSION From a62197f1ea7a74d78066f3707b4349b77bcb386b Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 17:47:10 +0000 Subject: [PATCH 14/38] bugfix/consistency update: turbulenceModel renamed simulationType --- .../compressible/turbulenceModel/turbulenceModel.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C index 6c9b91a407..d10505e6b2 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C @@ -88,7 +88,7 @@ autoPtr turbulenceModel::New ) ); - turbulencePropertiesDict.lookup("turbulenceModel") + turbulencePropertiesDict.lookup("simulationType") >> turbulenceModelTypeName; } From eaea0460cd065cf47aded3e05e4d627aa9d62de7 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 19 Dec 2008 17:59:54 +0000 Subject: [PATCH 15/38] general updates for new turbulence model structure --- .../hotRoom/constant/turbulenceProperties | 22 +++++++++++++++++++ .../depthCharge2D/0/U | 0 .../depthCharge2D/0/alpha1.org | 0 .../depthCharge2D/0/pd.org | 0 .../depthCharge2D/Allrun | 0 .../depthCharge2D/constant/LESProperties | 4 +++- .../constant/environmentalProperties | 0 .../constant/polyMesh/blockMeshDict | 0 .../depthCharge2D/constant/polyMesh/boundary | 7 +++--- .../constant/transportProperties | 0 .../constant/turbulenceProperties | 22 +++++++++++++++++++ .../depthCharge2D/system/controlDict | 0 .../depthCharge2D/system/fvSchemes | 0 .../depthCharge2D}/system/fvSolution | 2 +- .../depthCharge2D/system/setFieldsDict | 0 .../depthCharge3D/0/U | 0 .../depthCharge3D/0/alpha1.org | 0 .../depthCharge3D/0/pd.org | 0 .../depthCharge3D/Allclean | 0 .../depthCharge3D/Allrun | 0 .../depthCharge3D/constant/LESProperties | 4 +++- .../constant/environmentalProperties | 0 .../constant/polyMesh/blockMeshDict | 0 .../depthCharge3D/constant/polyMesh/boundary | 7 +++--- .../constant/transportProperties | 0 .../constant/turbulenceProperties | 22 +++++++++++++++++++ .../depthCharge3D/system/controlDict | 0 .../depthCharge3D/system/decomposeParDict | 0 .../depthCharge3D/system/fvSchemes | 0 .../depthCharge3D}/system/fvSolution | 2 +- .../depthCharge3D/system/machines | 0 .../depthCharge3D/system/setFieldsDict | 0 32 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/0/U (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/0/alpha1.org (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/0/pd.org (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/Allrun (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/LESProperties (98%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/environmentalProperties (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/polyMesh/blockMeshDict (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/polyMesh/boundary (78%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/transportProperties (100%) create mode 100644 tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/system/controlDict (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/system/fvSchemes (100%) rename tutorials/{compressibleLesInterFoam/depthCharge3D => compressibleInterFoam/depthCharge2D}/system/fvSolution (99%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/system/setFieldsDict (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/0/U (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/0/alpha1.org (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/0/pd.org (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/Allclean (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/Allrun (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/LESProperties (98%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/environmentalProperties (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/polyMesh/blockMeshDict (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/polyMesh/boundary (75%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/transportProperties (100%) create mode 100644 tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/controlDict (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/decomposeParDict (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/fvSchemes (100%) rename tutorials/{compressibleLesInterFoam/depthCharge2D => compressibleInterFoam/depthCharge3D}/system/fvSolution (99%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/machines (100%) rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/setFieldsDict (100%) diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties new file mode 100644 index 0000000000..321c08496a --- /dev/null +++ b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//simulationType laminar; +simulationType RASModel; +//simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/0/U b/tutorials/compressibleInterFoam/depthCharge2D/0/U similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/0/U rename to tutorials/compressibleInterFoam/depthCharge2D/0/U diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/0/alpha1.org b/tutorials/compressibleInterFoam/depthCharge2D/0/alpha1.org similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/0/alpha1.org rename to tutorials/compressibleInterFoam/depthCharge2D/0/alpha1.org diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/0/pd.org b/tutorials/compressibleInterFoam/depthCharge2D/0/pd.org similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/0/pd.org rename to tutorials/compressibleInterFoam/depthCharge2D/0/pd.org diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/Allrun b/tutorials/compressibleInterFoam/depthCharge2D/Allrun similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/Allrun rename to tutorials/compressibleInterFoam/depthCharge2D/Allrun diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/LESProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties similarity index 98% rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/LESProperties rename to tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties index 130d0947d9..bb84772ba5 100644 --- a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/LESProperties +++ b/tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties @@ -16,7 +16,9 @@ FoamFile LESModel laminar; -delta smooth; +turbulence off; + +delta cubeRootVol; laminarCoeffs { diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/environmentalProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/environmentalProperties similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/environmentalProperties rename to tutorials/compressibleInterFoam/depthCharge2D/constant/environmentalProperties diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict rename to tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/boundary b/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary similarity index 78% rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/boundary rename to tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary index e1e2119e32..a6a3281fd7 100644 --- a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/boundary +++ b/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary @@ -1,15 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | +| \\ / O peration | Version: dev-09ca1eb6b56f | +| \\ / A nd | | +| \\/ M anipulation | www.OpenFOAM.org | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/transportProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/transportProperties similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/transportProperties rename to tutorials/compressibleInterFoam/depthCharge2D/constant/transportProperties diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties new file mode 100644 index 0000000000..d3f32ecb06 --- /dev/null +++ b/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//simulationType laminar; +//simulationType RASModel; +simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/controlDict b/tutorials/compressibleInterFoam/depthCharge2D/system/controlDict similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/controlDict rename to tutorials/compressibleInterFoam/depthCharge2D/system/controlDict diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSchemes b/tutorials/compressibleInterFoam/depthCharge2D/system/fvSchemes similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSchemes rename to tutorials/compressibleInterFoam/depthCharge2D/system/fvSchemes diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSolution b/tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution similarity index 99% rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSolution rename to tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution index f97cf54032..8682524739 100644 --- a/tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSolution +++ b/tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution @@ -120,7 +120,7 @@ PISO nNonOrthogonalCorrectors 0; nAlphaCorr 1; nAlphaSubCycles 1; - cGamma 1; + cAlpha 1; } // ************************************************************************* // diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/setFieldsDict b/tutorials/compressibleInterFoam/depthCharge2D/system/setFieldsDict similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/setFieldsDict rename to tutorials/compressibleInterFoam/depthCharge2D/system/setFieldsDict diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/0/U b/tutorials/compressibleInterFoam/depthCharge3D/0/U similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/0/U rename to tutorials/compressibleInterFoam/depthCharge3D/0/U diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/0/alpha1.org b/tutorials/compressibleInterFoam/depthCharge3D/0/alpha1.org similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/0/alpha1.org rename to tutorials/compressibleInterFoam/depthCharge3D/0/alpha1.org diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/0/pd.org b/tutorials/compressibleInterFoam/depthCharge3D/0/pd.org similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/0/pd.org rename to tutorials/compressibleInterFoam/depthCharge3D/0/pd.org diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/Allclean b/tutorials/compressibleInterFoam/depthCharge3D/Allclean similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/Allclean rename to tutorials/compressibleInterFoam/depthCharge3D/Allclean diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/Allrun b/tutorials/compressibleInterFoam/depthCharge3D/Allrun similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/Allrun rename to tutorials/compressibleInterFoam/depthCharge3D/Allrun diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/LESProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties similarity index 98% rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/LESProperties rename to tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties index 130d0947d9..bb84772ba5 100644 --- a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/LESProperties +++ b/tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties @@ -16,7 +16,9 @@ FoamFile LESModel laminar; -delta smooth; +turbulence off; + +delta cubeRootVol; laminarCoeffs { diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/environmentalProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/environmentalProperties similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/environmentalProperties rename to tutorials/compressibleInterFoam/depthCharge3D/constant/environmentalProperties diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict rename to tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/boundary b/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary similarity index 75% rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/boundary rename to tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary index 178b2ace00..3517ca55be 100644 --- a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/boundary +++ b/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary @@ -1,15 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | +| \\ / O peration | Version: dev-09ca1eb6b56f | +| \\ / A nd | | +| \\/ M anipulation | www.OpenFOAM.org | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/transportProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/transportProperties similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/transportProperties rename to tutorials/compressibleInterFoam/depthCharge3D/constant/transportProperties diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties new file mode 100644 index 0000000000..fe67e8feca --- /dev/null +++ b/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//simulationType laminar; +//simulationType RASModel; +simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/controlDict b/tutorials/compressibleInterFoam/depthCharge3D/system/controlDict similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/controlDict rename to tutorials/compressibleInterFoam/depthCharge3D/system/controlDict diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/decomposeParDict b/tutorials/compressibleInterFoam/depthCharge3D/system/decomposeParDict similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/decomposeParDict rename to tutorials/compressibleInterFoam/depthCharge3D/system/decomposeParDict diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSchemes b/tutorials/compressibleInterFoam/depthCharge3D/system/fvSchemes similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSchemes rename to tutorials/compressibleInterFoam/depthCharge3D/system/fvSchemes diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSolution b/tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution similarity index 99% rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSolution rename to tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution index f97cf54032..8682524739 100644 --- a/tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSolution +++ b/tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution @@ -120,7 +120,7 @@ PISO nNonOrthogonalCorrectors 0; nAlphaCorr 1; nAlphaSubCycles 1; - cGamma 1; + cAlpha 1; } // ************************************************************************* // diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/machines b/tutorials/compressibleInterFoam/depthCharge3D/system/machines similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/machines rename to tutorials/compressibleInterFoam/depthCharge3D/system/machines diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/setFieldsDict b/tutorials/compressibleInterFoam/depthCharge3D/system/setFieldsDict similarity index 100% rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/setFieldsDict rename to tutorials/compressibleInterFoam/depthCharge3D/system/setFieldsDict From 7106f490bf80697ee37176f620c8a14da92e8381 Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 24 Dec 2008 10:23:55 +0000 Subject: [PATCH 16/38] Applied patch http://openfoam.cfd-online.com/cgi-bin/forum/show.cgi?126/10427 --- src/sampling/sampledSet/sampledSets/sampledSets.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C index b5518732cb..43bdad2e23 100644 --- a/src/sampling/sampledSet/sampledSets/sampledSets.C +++ b/src/sampling/sampledSet/sampledSets/sampledSets.C @@ -102,7 +102,7 @@ bool Foam::sampledSets::checkFieldTypes() nFields += grep(symmTensorFields_, fieldTypes); nFields += grep(tensorFields_, fieldTypes); - if (Pstream::master) + if (Pstream::master()) { if (debug) { From 5381d742bf3ae4161659b2c7ce7b42f6b0064686 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 29 Dec 2008 12:24:38 +0000 Subject: [PATCH 17/38] Changed "uint" to "unsigned int". --- src/OpenFOAM/primitives/uint/uintIO.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenFOAM/primitives/uint/uintIO.C b/src/OpenFOAM/primitives/uint/uintIO.C index 26b64224f7..5729cfd3bd 100644 --- a/src/OpenFOAM/primitives/uint/uintIO.C +++ b/src/OpenFOAM/primitives/uint/uintIO.C @@ -66,7 +66,7 @@ Istream& operator>>(Istream& is, unsigned int& i) if (t.isLabel()) { - i = uint(t.labelToken()); + i = (unsigned int)(t.labelToken()); } else { From 57af4614ca685a7505d6da4741661e2caae0147e Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 29 Dec 2008 13:20:04 +0000 Subject: [PATCH 18/38] small porting warnings --- src/OpenFOAM/db/Time/TimeIO.C | 7 ++++++- src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C | 2 +- src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H | 2 +- .../intermediate/submodels/IO/DataEntry/Table/Table.C | 9 ++++++--- .../potential/pairPotential/basic/pairPotential.C | 4 ++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C index 4299d05b5e..11edcf1add 100644 --- a/src/OpenFOAM/db/Time/TimeIO.C +++ b/src/OpenFOAM/db/Time/TimeIO.C @@ -67,7 +67,12 @@ void Foam::Time::readDict() case wcAdjustableRunTime: // Recalculate outputTimeIndex_ to be in units of current // writeInterval. - outputTimeIndex_ *= oldWriteInterval/writeInterval_; + outputTimeIndex_ = label + ( + outputTimeIndex_ + * oldWriteInterval + / writeInterval_ + ); break; default: diff --git a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C index 27740816ac..9b43979ae3 100644 --- a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C +++ b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C @@ -59,7 +59,7 @@ const NamedEnum shellSurfaces::refineModeNames_; void Foam::shellSurfaces::setAndCheckLevels ( - const scalar shellI, + const label shellI, const List >& distLevels ) { diff --git a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H index 0ec93cbeb1..778e9031db 100644 --- a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H +++ b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H @@ -97,7 +97,7 @@ private: //- Helper function for initialisation. void setAndCheckLevels ( - const scalar shellI, + const label shellI, const List >& ); diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C index e528359aa8..cefdb90100 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C @@ -78,11 +78,14 @@ Type Foam::Table::value(const scalar x) const i++; } - // Linear interpolation to find value - return + // Linear interpolation to find value. Note constructor needed for + // Table