Merge /u/dario-zivkovic/foam-extend/ branch BUGFIX-nextRelase-implement-mapping-methods-in-point-patch-vector-fields into nextRelease

https://sourceforge.net/p/foam-extend/foam-extend-4.0/merge-requests/84/
This commit is contained in:
Hrvoje Jasak 2018-12-03 17:15:44 +00:00
commit da3db5cd07
6 changed files with 120 additions and 3 deletions

View file

@ -99,7 +99,7 @@ angularOscillatingDisplacementPointPatchVectorField
angle0_(ptf.angle0_),
amplitude_(ptf.amplitude_),
omega_(ptf.omega_),
p0_(ptf.p0_)
p0_(ptf.p0_, mapper)
{}
@ -122,6 +122,29 @@ angularOscillatingDisplacementPointPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void angularOscillatingDisplacementPointPatchVectorField::autoMap
(
const PointPatchFieldMapper& m
)
{
fixedValuePointPatchVectorField::autoMap(m);
p0_.autoMap(m);
}
void angularOscillatingDisplacementPointPatchVectorField::rmap
(
const PointPatchField
<pointPatchField, pointMesh, pointPatch, DummyMatrix, vector>& ptf,
const labelList& addr
)
{
const angularOscillatingDisplacementPointPatchVectorField& aODptf =
refCast<const angularOscillatingDisplacementPointPatchVectorField>(ptf);
fixedValuePointPatchVectorField::rmap(aODptf, addr);
p0_.rmap(aODptf.p0_, addr);
}
void angularOscillatingDisplacementPointPatchVectorField::updateCoeffs()
{
if (this->updated())

View file

@ -138,6 +138,22 @@ public:
// Member functions
// Mapping functions
//- Map (and resize as needed) from self given a mapping object
void autoMap
(
const PointPatchFieldMapper&
);
//- Reverse map the given pointPatchField onto this pointPatchField
void rmap
(
const PointPatchField
<pointPatchField, pointMesh, pointPatch, DummyMatrix, vector>&,
const labelList&
);
// Evaluation functions
//- Update the coefficients associated with the patch field

View file

@ -99,7 +99,7 @@ angularOscillatingVelocityPointPatchVectorField
angle0_(ptf.angle0_),
amplitude_(ptf.amplitude_),
omega_(ptf.omega_),
p0_(ptf.p0_)
p0_(ptf.p0_, mapper)
{}
@ -122,6 +122,29 @@ angularOscillatingVelocityPointPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void angularOscillatingVelocityPointPatchVectorField::autoMap
(
const PointPatchFieldMapper& m
)
{
fixedValuePointPatchVectorField::autoMap(m);
p0_.autoMap(m);
}
void angularOscillatingVelocityPointPatchVectorField::rmap
(
const PointPatchField
<pointPatchField, pointMesh, pointPatch, DummyMatrix, vector>& ptf,
const labelList& addr
)
{
const angularOscillatingVelocityPointPatchVectorField& aOVptf =
refCast<const angularOscillatingVelocityPointPatchVectorField>(ptf);
fixedValuePointPatchVectorField::rmap(aOVptf, addr);
p0_.rmap(aOVptf.p0_, addr);
}
void angularOscillatingVelocityPointPatchVectorField::updateCoeffs()
{
if (this->updated())

View file

@ -130,6 +130,22 @@ public:
// Member functions
// Mapping functions
//- Map (and resize as needed) from self given a mapping object
void autoMap
(
const PointPatchFieldMapper&
);
//- Reverse map the given pointPatchField onto this pointPatchField
void rmap
(
const PointPatchField
<pointPatchField, pointMesh, pointPatch, DummyMatrix, vector>&,
const labelList&
);
// Evaluation functions
//- Update the coefficients associated with the patch field

View file

@ -90,7 +90,7 @@ oscillatingVelocityPointPatchVectorField
fixedValuePointPatchVectorField(ptf, p, iF, mapper),
amplitude_(ptf.amplitude_),
omega_(ptf.omega_),
p0_(ptf.p0_)
p0_(ptf.p0_, mapper)
{}
@ -110,6 +110,29 @@ oscillatingVelocityPointPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void oscillatingVelocityPointPatchVectorField::autoMap
(
const PointPatchFieldMapper& m
)
{
fixedValuePointPatchVectorField::autoMap(m);
p0_.autoMap(m);
}
void oscillatingVelocityPointPatchVectorField::rmap
(
const PointPatchField
<pointPatchField, pointMesh, pointPatch, DummyMatrix, vector>& ptf,
const labelList& addr
)
{
const oscillatingVelocityPointPatchVectorField& oVptf =
refCast<const oscillatingVelocityPointPatchVectorField>(ptf);
fixedValuePointPatchVectorField::rmap(oVptf, addr);
p0_.rmap(oVptf.p0_, addr);
}
void oscillatingVelocityPointPatchVectorField::updateCoeffs()
{
if (this->updated())

View file

@ -128,6 +128,22 @@ public:
// Member functions
// Mapping functions
//- Map (and resize as needed) from self given a mapping object
void autoMap
(
const PointPatchFieldMapper&
);
//- Reverse map the given pointPatchField onto this pointPatchField
void rmap
(
const PointPatchField
<pointPatchField, pointMesh, pointPatch, DummyMatrix, vector>&,
const labelList&
);
// Evaluation functions
//- Update the coefficients associated with the patch field