mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Changed g from being read from environmentalProperties to being read directly as a
uniformDimensionedVectorField.
This commit is contained in:
@ -9,6 +9,7 @@
|
||||
#include "fvMatrices.H"
|
||||
#include "fvm.H"
|
||||
#include "linear.H"
|
||||
#include "uniformDimensionedFields.H"
|
||||
#include "calculatedFvPatchFields.H"
|
||||
#include "fixedValueFvPatchFields.H"
|
||||
#include "adjustPhi.H"
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Info << "\nReading environmentalProperties" << endl;
|
||||
|
||||
IOdictionary environmentalProperties
|
||||
(
|
||||
IOobject
|
||||
(
|
||||
"environmentalProperties",
|
||||
runTime.constant(),
|
||||
mesh,
|
||||
IOobject::MUST_READ,
|
||||
IOobject::NO_WRITE
|
||||
)
|
||||
);
|
||||
|
||||
dimensionedVector g(environmentalProperties.lookup("g"));
|
||||
@ -0,0 +1,12 @@
|
||||
Info << "\nReading g" << endl;
|
||||
uniformDimensionedVectorField g
|
||||
(
|
||||
IOobject
|
||||
(
|
||||
"g",
|
||||
runTime.constant(),
|
||||
mesh,
|
||||
IOobject::MUST_READ,
|
||||
IOobject::NO_WRITE
|
||||
)
|
||||
);
|
||||
@ -28,6 +28,7 @@ License
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
#include "uniformDimensionedFields.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -110,10 +111,8 @@ void buoyantPressureFvPatchScalarField::updateCoeffs()
|
||||
return;
|
||||
}
|
||||
|
||||
const dictionary& environmentalProperties
|
||||
= db().lookupObject<IOdictionary>("environmentalProperties");
|
||||
|
||||
dimensionedVector g(environmentalProperties.lookup("g"));
|
||||
const uniformDimensionedVectorField& g =
|
||||
db().lookupObject<uniformDimensionedVectorField>("g");
|
||||
|
||||
const fvPatchField<scalar>& rho =
|
||||
patch().lookupPatchField<volScalarField, scalar>(rhoName_);
|
||||
|
||||
@ -29,7 +29,7 @@ License
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
#include "surfaceFields.H"
|
||||
|
||||
#include "uniformDimensionedFields.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -126,10 +126,8 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::updateCoeffs()
|
||||
return;
|
||||
}
|
||||
|
||||
const dictionary& environmentalProperties
|
||||
= db().lookupObject<IOdictionary>("environmentalProperties");
|
||||
|
||||
dimensionedVector g(environmentalProperties.lookup("g"));
|
||||
const uniformDimensionedVectorField& g =
|
||||
db().lookupObject<uniformDimensionedVectorField>("g");
|
||||
|
||||
operator==
|
||||
(
|
||||
|
||||
@ -59,7 +59,7 @@ Foam::spray::spray
|
||||
const basicMultiComponentMixture& composition,
|
||||
const PtrList<gasThermoPhysics>& gasProperties,
|
||||
const dictionary&,
|
||||
const dictionary& environmentalProperties
|
||||
const dimensionedVector& g
|
||||
)
|
||||
:
|
||||
Cloud<parcel>(U.mesh(), false), // suppress className checking on positions
|
||||
@ -181,7 +181,7 @@ Foam::spray::spray
|
||||
),
|
||||
|
||||
subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
|
||||
g_(dimensionedVector(environmentalProperties.lookup("g")).value()),
|
||||
g_(g.value()),
|
||||
|
||||
gasProperties_(gasProperties),
|
||||
composition_(composition),
|
||||
@ -266,7 +266,7 @@ Foam::spray::spray
|
||||
"const volScalarField& T, const combustionMixture& composition,"
|
||||
"const PtrList<gasThermoPhsyics>& gaseousFuelProperties, "
|
||||
"const dictionary& thermophysicalProperties, "
|
||||
"const dictionary& environmentalProperties)"
|
||||
"const dimensionedScalar& g)"
|
||||
) << "spray::(...) only one wedgePolyPatch found. "
|
||||
"Please check you BC-setup."
|
||||
<< abort(FatalError);
|
||||
|
||||
@ -122,7 +122,7 @@ class spray
|
||||
|
||||
|
||||
//- Acceleration due to gravity
|
||||
vector g_;
|
||||
const vector& g_;
|
||||
|
||||
|
||||
// Composition properties
|
||||
@ -195,7 +195,7 @@ public:
|
||||
const basicMultiComponentMixture& composition,
|
||||
const PtrList<gasThermoPhysics>& gasProperties,
|
||||
const dictionary& thermophysicalProperties,
|
||||
const dictionary& environmentalProperties
|
||||
const dimensionedVector& g
|
||||
);
|
||||
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ License
|
||||
#include "fvPatchFieldMapper.H"
|
||||
#include "volFields.H"
|
||||
#include "surfaceFields.H"
|
||||
#include "uniformDimensionedFields.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -140,10 +141,8 @@ void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs()
|
||||
return;
|
||||
}
|
||||
|
||||
const dictionary& environmentalProperties
|
||||
= db().lookupObject<IOdictionary>("environmentalProperties");
|
||||
|
||||
dimensionedVector g(environmentalProperties.lookup("g"));
|
||||
const uniformDimensionedVectorField& g =
|
||||
db().lookupObject<uniformDimensionedVectorField>("g");
|
||||
|
||||
const fvPatchField<scalar>& rho =
|
||||
patch().lookupPatchField<volScalarField, scalar>("rho");
|
||||
|
||||
Reference in New Issue
Block a user