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

Corrected formatting

Browse Source
This commit is contained in:
Henry 2011-09-05 19:21:53 +01:00
parent 5139d52bd6
commit 85d1a92cf2
9 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C
View File

@ -31,7 +31,8 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -44,7 +45,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
{}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField& ptf,
const fvPatch& p,
@ -59,7 +61,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
{}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -85,7 +88,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField& wbppsf
)
@ -97,7 +101,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
{}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField& wbppsf,
const DimensionedField<scalar, volMesh>& iF
@ -145,7 +150,10 @@ void Foam::multiphaseFixedFluxPressureFvPatchScalarField::updateCoeffs()
}
void Foam::multiphaseFixedFluxPressureFvPatchScalarField::write(Ostream& os) const
void Foam::multiphaseFixedFluxPressureFvPatchScalarField::write
(
Ostream& os
) const
{
fvPatchScalarField::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_);

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H
View File

@ -88,8 +88,8 @@ public:
const dictionary&
);
//- Construct by mapping given multiphaseFixedFluxPressureFvPatchScalarField onto
// a new patch
//- Construct by mapping given
// multiphaseFixedFluxPressureFvPatchScalarField onto a new patch
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField&,

3
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -96,7 +96,8 @@ void Foam::multiphaseSystem::solveAlphas()
surfaceScalarField phir
(
(phase1.phi() - phase2.phi())
+ min(cAlpha(phase1, phase2)*phic, max(phic))*nHatf(phase1, phase2)
+ min(cAlpha(phase1, phase2)*phic, max(phic))
*nHatf(phase1, phase2)
);
phiAlphaCorr += fvc::flux

6
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
View File

@ -233,7 +233,11 @@ private:
surfaceVectorField::GeometricBoundaryField& nHatb
) const;
tmp<volScalarField> K(const phaseModel& alpha1, const phaseModel& alpha2) const;
tmp<volScalarField> K
(
const phaseModel& alpha1,
const phaseModel& alpha2
) const;
public:

40
applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
View File

@ -62,8 +62,10 @@
mrfZones.relativeFlux(phase.phi());
phase.phi() += rAlphaAUfs[phasei]*(g & mesh.Sf());
multiphaseSystem::dragModelTable::const_iterator dmIter = fluid.dragModels().begin();
multiphaseSystem::dragCoeffFields::const_iterator dcIter = dragCoeffs().begin();
multiphaseSystem::dragModelTable::const_iterator dmIter =
fluid.dragModels().begin();
multiphaseSystem::dragCoeffFields::const_iterator dcIter =
dragCoeffs().begin();
for
(
;
@ -84,15 +86,23 @@
if
(
(&phase == &dmIter()->phase1() && &phase2 == &dmIter()->phase2())
|| (&phase == &dmIter()->phase2() && &phase2 == &dmIter()->phase1())
(
&phase == &dmIter()->phase1()
&& &phase2 == &dmIter()->phase2()
)
|| (
&phase == &dmIter()->phase2()
&& &phase2 == &dmIter()->phase1()
)
) break;
phasej++;
}
phase.phi() +=
fvc::interpolate((1.0/phase.rho())*rAUs[phasei]*(*dcIter()))*phi0s[phasej];
fvc::interpolate
((1.0/phase.rho())*rAUs[phasei]*(*dcIter()))
*phi0s[phasej];
}
}
@ -182,8 +192,10 @@
+ rAlphaAUfs[phasei]*mSfGradp/phase.rho()
);
multiphaseSystem::dragModelTable::const_iterator dmIter = fluid.dragModels().begin();
multiphaseSystem::dragCoeffFields::const_iterator dcIter = dragCoeffs().begin();
multiphaseSystem::dragModelTable::const_iterator dmIter =
fluid.dragModels().begin();
multiphaseSystem::dragCoeffFields::const_iterator dcIter =
dragCoeffs().begin();
for
(
;
@ -204,14 +216,22 @@
if
(
(&phase == &dmIter()->phase1() && &phase2 == &dmIter()->phase2())
|| (&phase == &dmIter()->phase2() && &phase2 == &dmIter()->phase1())
(
&phase == &dmIter()->phase1()
&& &phase2 == &dmIter()->phase2()
)
|| (
&phase == &dmIter()->phase2()
&& &phase2 == &dmIter()->phase1()
)
) break;
phasej++;
}
phase.U() += (1.0/phase.rho())*rAUs[phasei]*(*dcIter())*U0s[phasej];
phase.U() +=
(1.0/phase.rho())
*rAUs[phasei]*(*dcIter())*U0s[phasej];
}
}

5
applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.H
View File

@ -122,7 +122,10 @@ public:
autoPtr<phaseModel> operator()(Istream& is) const
{
dictionaryEntry ent(dictionary::null, is);
return autoPtr<phaseModel>(new phaseModel(ent.keyword(), ent, mesh_));
return autoPtr<phaseModel>
(
new phaseModel(ent.keyword(), ent, mesh_)
);
}
};

8
src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
View File

@ -113,13 +113,15 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs()
scalar theta = time*mag(srf.omega().value());
refValue() =
cos(theta)*UInf_ + sin(theta)*(srf.axis() ^ UInf_)
//cos(theta)*UInf_ + sin(theta)*(srf.axis() ^ UInf_)
UInf_
- srf.velocity(patch().Cf());
// Set the inlet-outlet choice based on the direction of the freestream
valueFraction() = 1.0 - pos(refValue() & patch().Sf());
//valueFraction() = 1.0 - pos(refValue() & patch().Sf());
mixedFvPatchField<vector>::updateCoeffs();
//mixedFvPatchField<vector>::updateCoeffs();
inletOutletFvPatchVectorField::updateCoeffs();
}

20
src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C
View File

@ -31,7 +31,8 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -44,7 +45,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
{}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField& ptf,
const fvPatch& p,
@ -59,7 +61,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
{}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -85,7 +88,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField& wbppsf
)
@ -97,7 +101,8 @@ Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressure
{}
Foam::multiphaseFixedFluxPressureFvPatchScalarField::multiphaseFixedFluxPressureFvPatchScalarField
Foam::multiphaseFixedFluxPressureFvPatchScalarField::
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField& wbppsf,
const DimensionedField<scalar, volMesh>& iF
@ -145,7 +150,10 @@ void Foam::multiphaseFixedFluxPressureFvPatchScalarField::updateCoeffs()
}
void Foam::multiphaseFixedFluxPressureFvPatchScalarField::write(Ostream& os) const
void Foam::multiphaseFixedFluxPressureFvPatchScalarField::write
(
Ostream& os
) const
{
fvPatchScalarField::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_);

4
src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H
View File

@ -88,8 +88,8 @@ public:
const dictionary&
);
//- Construct by mapping given multiphaseFixedFluxPressureFvPatchScalarField onto
// a new patch
//- Construct by mapping given
// multiphaseFixedFluxPressureFvPatchScalarField onto a new patch
multiphaseFixedFluxPressureFvPatchScalarField
(
const multiphaseFixedFluxPressureFvPatchScalarField&,