diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index 4a58e5d3fce425e9f76bad82b998484e7f27eacc..b24f21fe8dfc6d88bac7f046f52353fbcef55fc7 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -120,13 +120,14 @@ int main(int argc, char *argv[])
"cSf_pos",
interpolate(c, pos, T.name())*mesh.magSf()
);
-cSf_pos.oriented().oriented() = true;
+ cSf_pos.setOriented();
+
surfaceScalarField cSf_neg
(
"cSf_neg",
interpolate(c, neg, T.name())*mesh.magSf()
);
-cSf_neg.oriented().oriented() = true;
+ cSf_neg.setOriented();
surfaceScalarField ap
(
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index b212fd30ea8e1e4dc8dfa54d66da9626c37a2e88..6550d62b28cb858759307c5bcde1c442fcdc6108 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -101,13 +101,14 @@ int main(int argc, char *argv[])
"cSf_pos",
interpolate(c, pos, T.name())*mesh.magSf()
);
-cSf_pos.oriented().oriented() = true;
+ cSf_pos.setOriented();
+
surfaceScalarField cSf_neg
(
"cSf_neg",
interpolate(c, neg, T.name())*mesh.magSf()
);
-cSf_neg.oriented().oriented() = true;
+ cSf_neg.setOriented();
surfaceScalarField ap
(
diff --git a/applications/solvers/multiphase/MPPICInterFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/MPPICInterFoam/alphaEqnSubCycle.H
index 30916f5323ea97071ec034e43e2c3a3bbfc6e0f7..c0d3c8e43a968cf5fa334e6b84a9c106a66835ff 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/alphaEqnSubCycle.H
@@ -13,8 +13,6 @@ if (nAlphaSubCycles > 1)
dimensionedScalar("0", rhoPhi.dimensions(), 0)
);
- rhoPhiSum.oriented().oriented() = true;
-
for
(
subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
index b2f925ef3560bea4048fb9459681fe091e4076ea..89e56191503730cf9634ba0d7d72169b0aac8634 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
@@ -21,8 +21,6 @@
dimensionedScalar("0", rhoPhi.dimensions(), 0)
);
- rhoPhiSum.oriented().oriented() = true;
-
for
(
subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 9f51ee22a3b710c42565a6d98485cd2b6c06d5bb..627dd41b6f2ec5316cdcae0c0c1031a9759680c6 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -113,8 +113,7 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo
1e-8/pow(average(mesh_.V()), 1.0/3.0)
)
{
- rhoPhi_.oriented().oriented() = true;
-
+ rhoPhi_.setOriented();
calcAlphas();
alphas_.write();
correct();
@@ -700,7 +699,7 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const
);
surfaceScalarField& stf = tstf.ref();
- stf.oriented().oriented() = true;
+ stf.setOriented();
forAllConstIter(PtrDictionary<phaseModel>, phases_, phase1)
{
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C
index 5adc39ff69b541066c2d2d47df1f374103e33ba2..d9981659b8db1fe93eef0fb9646e3623c5dfee67 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C
@@ -104,7 +104,6 @@ int main(int argc, char *argv[])
mesh,
dimensionedScalar("0", dimMass/dimTime, 0)
);
- rhoPhi.oriented().oriented() = true;
mixture->correct();
diff --git a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
index dd1e69b2cc6df60b06403a3cba5aa239346a7281..772de0b97af120527af42789bbeb3b3d8bafc55f 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
@@ -13,8 +13,6 @@ if (nAlphaSubCycles > 1)
dimensionedScalar("0", rhoPhi.dimensions(), 0)
);
- rhoPhiSum.oriented().oriented() = true;
-
tmp<volScalarField> trSubDeltaT;
if (LTS)
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H
index af4dc128d41aa99b72a22129dd99d02ac5944f2a..6025b60069f29e9d22420d9ca7bfab852472ccd9 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H
@@ -12,7 +12,6 @@ if (nAlphaSubCycles > 1)
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
);
- rhoPhiSum.oriented().oriented() = true;
for
(
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index 4b04abbfa5dca5589a47b3e4c072419d2dfd06ec..3ef77d362f753507e99b02a03d7ce5251e608ef6 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -100,8 +100,6 @@ int main(int argc, char *argv[])
mesh,
dimensionedScalar("0", dimMass/dimTime, 0)
);
- rhoPhi.oriented().oriented() = true;
-
mixture->correct();
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
index ff11947b5afd29a9024cf26a88ddf439482cc898..a4b9838335d68e65d717a8c6b03e4537eb54e0dc 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
@@ -39,7 +39,6 @@ surfaceScalarField phi
mesh,
dimensionedScalar("phi", dimArea*dimVelocity, 0)
);
-phi.oriented().oriented() = true;
multiphaseSystem fluid(U, phi);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 47ee2dc0fb61d293470e00f66d39645165b246cd..7a244eb439a7214a065677e40f8a57cba4465ec0 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -815,8 +815,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
)
)
);
-
- tSurfaceTension.ref().oriented().oriented() = true;
+ tSurfaceTension.ref().setOriented();
forAllConstIter(PtrDictionary<phaseModel>, phases_, iter)
{
@@ -920,8 +919,6 @@ void Foam::multiphaseSystem::solve()
)
);
- alphaPhiSums[phasei].oriented().oriented() = true;
-
phasei++;
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 4bac0c71d080ce6533b0e876986f06f0e22e5cc5..7f91518ba2756e12f6e4706f05310a80c0a772fc 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -113,7 +113,7 @@ Foam::phaseModel::phaseModel
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
)
{
- alphaPhi_.oriented().oriented() = true;
+ alphaPhi_.setOriented();
const word phiName = IOobject::groupName("phi", name_);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 16c70fbabd611785ee71be42d630319b4db36df7..8e2d78cbec800fe8997331f972d69a04cd9cf997 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -57,7 +57,6 @@
mesh,
dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
);
- phiHbyA.oriented().oriented() = true;
volScalarField rho("rho", fluid.rho());
surfaceScalarField ghSnGradRho(ghf*fvc::snGrad(rho)*mesh.magSf());
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index c6069dfbc06c5ce4c5e0b0e45d2adcd4b693c011..772f6d8b507f30249b16ac50d1a2745b1eb14020 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -128,7 +128,7 @@ Foam::multiphaseMixture::multiphaseMixture
1e-8/pow(average(mesh_.V()), 1.0/3.0)
)
{
- rhoPhi_.oriented().oriented() = true;
+ rhoPhi_.setOriented();
calcAlphas();
alphas_.write();
@@ -275,7 +275,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
);
surfaceScalarField& stf = tstf.ref();
- stf.oriented().oriented() = true;
+ stf.setOriented();
forAllConstIter(PtrDictionary<phase>, phases_, iter1)
{
@@ -338,8 +338,6 @@ void Foam::multiphaseMixture::solve()
dimensionedScalar("0", rhoPhi_.dimensions(), 0)
);
- rhoPhiSum.oriented().oriented() = true;
-
dimensionedScalar totalDeltaT = runTime.deltaT();
for
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index b089d1b9b94cabf29032fe56f3113b350be0fac9..2213f1a7253e0ca60ca47724196492e1e8a551ad 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -455,8 +455,7 @@ Foam::BlendedInterfacialModel<ModelType>::Ff() const
dimensionedScalar("zero", ModelType::dimF*dimArea, 0)
)
);
-
- x.ref().oriented().oriented() = true;
+ x.ref().setOriented();
if (model_.valid())
{
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index bcdc4d5d29d810cff40a5fedc914a67fccc63113..02969b89cb86825dda8f261d7118df25cbe53164 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -365,7 +365,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Ff
)
);
- tFf.ref().oriented().oriented() = true;
+ tFf.ref().setOriented();
return tFf;
}
@@ -626,7 +626,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setPhiD
)
);
- phiDs[phasei].oriented().oriented() = true;
+ phiDs[phasei].setOriented();
}
return phiDs[phasei];
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index f271bf95e84b4d082c6e31e66b1147ecc5fec425..2afa388aca951c7c9a496765af7d099f4eab41d7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -200,8 +200,8 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
dimensionedScalar("0", dimDensity/dimTime, 0)
)
{
- alphaPhi_.oriented().oriented() = true;
- alphaRhoPhi_.oriented().oriented() = true;
+ alphaPhi_.setOriented();
+ alphaRhoPhi_.setOriented();
phi_.writeOpt() = IOobject::AUTO_WRITE;
correctKinematics();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 83057cde7fc1be3c287fc0f238809e6d41188823..6ed8cfdc1a077a1af62551e6037dfe3181db4d69 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -558,7 +558,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
)
);
- tSurfaceTension.ref().oriented().oriented() = true;
+ tSurfaceTension.ref().setOriented();
forAll(phases(), phasej)
{
@@ -665,8 +665,6 @@ void Foam::multiphaseSystem::solve()
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
)
);
-
- alphaPhiSums[phasei].oriented().oriented() = true;
}
for
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 95828abbfb9e3d99b54c4a34bd690d25bed0a1bf..5e916dce2fdcb9f945c7f86dfe5e2a323c3b66c9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -169,8 +169,6 @@ while (pimple.correct())
dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
);
- phiHbyA.oriented().oriented() = true;
-
forAll(phases, phasei)
{
phaseModel& phase = phases[phasei];
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H
index 96300269894d278bc968b607e3f9c5be47a4aa38..81c65c1caf737480956f72ff2d3952f7311436c5 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H
@@ -14,7 +14,6 @@ if (nAlphaSubCycles > 1)
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
);
- rhoPhiSum.oriented().oriented() = true;
for
(
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
index c8e8170fc4caa5f0de1cba017829c5b6984c7a44..80253f39816cad56785f63a3d8ef33b617b4095a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
@@ -109,8 +109,8 @@ Foam::phaseModel::phaseModel
dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0)
)
{
- alphaPhi_.oriented().oriented() = true;
- alphaRhoPhi_.oriented().oriented() = true;
+ alphaPhi_.setOriented();
+ alphaRhoPhi_.setOriented();
thermo_->validate("phaseModel " + name_, "h", "e");
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 9901226ba23477976771c1580d105c118883bb33..17449f78d53624486cdd711ae83d9cdfd6f35642 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -60,7 +60,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
Field<Type>(field),
mesh_(mesh),
dimensions_(dims),
- oriented_(false)
+ oriented_()
{
if (field.size() && field.size() != GeoMesh::size(mesh))
{
@@ -86,7 +86,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
Field<Type>(GeoMesh::size(mesh)),
mesh_(mesh),
dimensions_(dims),
- oriented_(false)
+ oriented_()
{
if (checkIOFlags)
{
@@ -108,7 +108,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
Field<Type>(GeoMesh::size(mesh), dt.value()),
mesh_(mesh),
dimensions_(dt.dimensions()),
- oriented_(false)
+ oriented_()
{
if (checkIOFlags)
{
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index ff894271c2a5134e6062b286cf5743a3fc58d3e0..0cc7ab3c69fea37b4f71413faa96be6e5f35c367 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -266,12 +266,15 @@ public:
//- Return non-const access to dimensions
inline dimensionSet& dimensions();
- //- Return oriented flag
+ //- Return oriented type
inline const orientedType& oriented() const;
- //- Return non-const access to the oriented flag
+ //- Return non-const access to the oriented type
inline orientedType& oriented();
+ //- Set the oriented flag
+ inline void setOriented(const bool oriented = true);
+
inline const Field<Type>& field() const;
inline Field<Type>& field();
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
index 0de4d18faa035bcf62fff771bf8596d31fc1f944..b4a5b5d8b5afdca66c34240db825b06be1b9a2bd 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
@@ -71,6 +71,16 @@ inline Foam::orientedType& Foam::DimensionedField<Type, GeoMesh>::oriented()
}
+template<class Type, class GeoMesh>
+inline void Foam::DimensionedField<Type, GeoMesh>::setOriented
+(
+ const bool oriented
+)
+{
+ oriented_.setOriented(oriented);
+}
+
+
template<class Type, class GeoMesh>
inline const Foam::Field<Type>&
Foam::DimensionedField<Type, GeoMesh>::field() const
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
index 5fe2ed249f9c9be7da77a218f84850eac963cc82..7bbd460d36bedad46bee772cb05224a0a26d0a99 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
@@ -37,7 +37,7 @@ void Foam::DimensionedField<Type, GeoMesh>::readField
)
{
dimensions_.reset(dimensionSet(fieldDict.lookup("dimensions")));
- fieldDict.template readIfPresent<bool>("oriented", oriented_.oriented());
+ oriented_.read(fieldDict);
Field<Type> f(fieldDictEntry, fieldDict, GeoMesh::size(mesh_));
this->transfer(f);
@@ -76,7 +76,7 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
Field<Type>(0),
mesh_(mesh),
dimensions_(dimless),
- oriented_(false)
+ oriented_()
{
readField(dictionary(readStream(typeName)), fieldDictEntry);
}
@@ -95,7 +95,7 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
Field<Type>(0),
mesh_(mesh),
dimensions_(dimless),
- oriented_(false)
+ oriented_()
{
readField(fieldDict, fieldDictEntry);
}
@@ -111,7 +111,7 @@ bool Foam::DimensionedField<Type, GeoMesh>::writeData
) const
{
os.writeEntry("dimensions", dimensions());
- if (oriented_.oriented()) os.writeEntry("oriented", oriented());
+ oriented_.writeEntry(os);
os<< nl << nl;
diff --git a/src/OpenFOAM/orientedType/orientedType.C b/src/OpenFOAM/orientedType/orientedType.C
index 08198c0f049955ef3b7112962429e0759c61f97f..4a04453ac09a3da6e0190477bcaef7562c7db649 100644
--- a/src/OpenFOAM/orientedType/orientedType.C
+++ b/src/OpenFOAM/orientedType/orientedType.C
@@ -25,29 +25,72 @@ License
#include "orientedType.H"
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ template<>
+ const char* NamedEnum
+ <
+ orientedType::orientedOption,
+ 3
+ >::names[] =
+ {
+ "oriented",
+ "unoriented",
+ "unknown"
+ };
+}
+
+const Foam::NamedEnum<Foam::orientedType::orientedOption, 3>
+ Foam::orientedType::orientedOptionNames;
+
+
+bool Foam::orientedType::checkType
+(
+ const orientedType& ot1,
+ const orientedType& ot2
+)
+{
+ if
+ (
+ (ot1.oriented() == UNKNOWN)
+ || (ot2.oriented() == UNKNOWN)
+ || (ot1.oriented() == ot2.oriented())
+ )
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::orientedType::orientedType()
:
- oriented_(false)
+ oriented_(UNKNOWN)
{}
-Foam::orientedType::orientedType(const orientedType& of)
+Foam::orientedType::orientedType(const orientedType& ot)
:
- oriented_(of.oriented_)
+ oriented_(ot.oriented_)
{}
Foam::orientedType::orientedType(const bool oriented)
:
- oriented_(oriented)
+ oriented_(oriented ? ORIENTED : UNORIENTED)
{}
Foam::orientedType::orientedType(Istream& is)
:
- oriented_(readBool(is))
+ oriented_(orientedOptionNames.read(is))
{
is.check(FUNCTION_NAME);
}
@@ -55,312 +98,339 @@ Foam::orientedType::orientedType(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool& Foam::orientedType::oriented()
+Foam::orientedType::orientedOption& Foam::orientedType::oriented()
{
return oriented_;
}
-bool Foam::orientedType::oriented() const
+Foam::orientedType::orientedOption Foam::orientedType::oriented() const
{
return oriented_;
}
+void Foam::orientedType::setOriented(const bool oriented)
+{
+ oriented_ = oriented ? ORIENTED : UNORIENTED;
+}
+
+
+void Foam::orientedType::read(const dictionary& dict)
+{
+ if (dict.found("oriented"))
+ {
+ oriented_ = orientedOptionNames.read(dict.lookup("oriented"));
+ }
+ else
+ {
+ oriented_ = UNKNOWN;
+ }
+}
+
+
+void Foam::orientedType::writeEntry(Ostream& os) const
+{
+ if (oriented_ == ORIENTED)
+ {
+ os.writeEntry("oriented", orientedOptionNames[oriented_]);
+ }
+}
+
+
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-void Foam::orientedType::operator=(const orientedType& of)
+void Foam::orientedType::operator=(const orientedType& ot)
{
- oriented_ = of.oriented();
+ // Oriented state is inherited on assignment
+ oriented_ = ot.oriented();
}
-void Foam::orientedType::operator+=(const orientedType& of)
+void Foam::orientedType::operator+=(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- if (oriented_ != of.oriented())
+ // Set the oriented status if it was unknown
+ if (oriented_ == UNKNOWN)
+ {
+ oriented_ = ot.oriented();
+ }
+
+ if (!checkType(*this, ot))
{
FatalErrorInFunction
- << "Operator += is undefined for oriented and unoriented types. "
- << "oriented:" << oriented_ << ", of:" << of.oriented()
+ << "Operator += is undefined for "
+ << orientedOptionNames[oriented_] << " and "
+ << orientedOptionNames[ot.oriented()] << " types"
<< abort(FatalError);
}
-
- // No change to oriented_ flag
}
-void Foam::orientedType::operator-=(const orientedType& of)
+void Foam::orientedType::operator-=(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- if (oriented_ != of.oriented())
+ // Set the oriented status if it was unknown
+ if (oriented_ == UNKNOWN)
+ {
+ oriented_ = ot.oriented();
+ }
+
+ if (!checkType(*this, ot))
{
FatalErrorInFunction
- << "Operator -= is undefined for oriented and unoriented types. "
- << "oriented:" << oriented_ << ", of:" << of.oriented()
+ << "Operator -= is undefined for "
+ << orientedOptionNames[oriented_] << " and "
+ << orientedOptionNames[ot.oriented()] << " types"
<< abort(FatalError);
}
-
- // No change to oriented_ flag
}
-void Foam::orientedType::operator*=(const orientedType& of)
+void Foam::orientedType::operator*=(const orientedType& ot)
{
- oriented_ = oriented_ ^ of.oriented();
+ const orientedType& ot1 = *this;
+ if (ot1() ^ ot())
+ {
+ oriented_ = ORIENTED;
+ }
+ else
+ {
+ oriented_ = UNORIENTED;
+ }
}
-void Foam::orientedType::operator/=(const orientedType& of)
+void Foam::orientedType::operator/=(const orientedType& ot)
{
- oriented_ = oriented_ ^ of.oriented();
+ const orientedType& ot1 = *this;
+ if (ot1() ^ ot())
+ {
+ oriented_ = ORIENTED;
+ }
+ else
+ {
+ oriented_ = UNORIENTED;
+ }
}
void Foam::orientedType::operator*=(const scalar s)
{
-//InfoInFunction << "oriented_: " << oriented_ << endl;
// No change to oriented_ flag
}
void Foam::orientedType::operator/=(const scalar s)
{
-//InfoInFunction << "oriented_: " << oriented_ << endl;
// No change to oriented_ flag
}
bool Foam::orientedType::operator()() const
{
-//InfoInFunction << "oriented_: " << oriented_ << endl;
- return oriented_;
+ return oriented_ == ORIENTED;
}
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-Foam::orientedType Foam::max(const orientedType& of1, const orientedType& of2)
+Foam::orientedType Foam::max(const orientedType& ot1, const orientedType& ot2)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- if (of1.oriented() != of2.oriented())
+ if (!orientedType::checkType(ot1, ot2))
{
FatalErrorInFunction
- << "max is undefined for oriented and unoriented types. "
- << "of1:" << of1.oriented() << ", of2:" << of2.oriented()
+ << "Operator max is undefined for "
+ << orientedType::orientedOptionNames[ot1.oriented()] << " and "
+ << orientedType::orientedOptionNames[ot2.oriented()] << " types"
<< abort(FatalError);
}
- return of1;
+ return ot1;
}
-Foam::orientedType Foam::min(const orientedType& of1, const orientedType& of2)
+Foam::orientedType Foam::min(const orientedType& ot1, const orientedType& ot2)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- if (of1.oriented() != of2.oriented())
+ if (!orientedType::checkType(ot1, ot2))
{
FatalErrorInFunction
- << "min is undefined for oriented and unoriented types. "
- << "of1:" << of1.oriented() << ", of2:" << of2.oriented()
+ << "Operator min is undefined for "
+ << orientedType::orientedOptionNames[ot1.oriented()] << " and "
+ << orientedType::orientedOptionNames[ot2.oriented()] << "types"
<< abort(FatalError);
}
- return of1;
+ return ot1;
}
Foam::orientedType Foam::cmptMultiply
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- return orientedType(of1.oriented() ^ of2.oriented());
+ return ot1 ^ ot2;
}
Foam::orientedType Foam::cmptDivide
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- return orientedType(of1.oriented() ^ of2.oriented());
+ return ot1 ^ ot2;
}
-Foam::orientedType Foam::cmptAv(const orientedType& of)
+Foam::orientedType Foam::cmptAv(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::pow(const orientedType& of, const scalar r)
+Foam::orientedType Foam::pow(const orientedType& ot, const scalar r)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
// Undefined???
// - only defined for integers where:
- // - odd powers = oriented_ = yes (if of is oriented)
+ // - odd powers = oriented_ = yes (if ot is oriented)
// - even powers = oriented_ = no
- return of;
+ return ot;
}
-Foam::orientedType Foam::sqr(const orientedType& of)
+Foam::orientedType Foam::sqr(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
return orientedType(false);
}
-Foam::orientedType Foam::pow3(const orientedType& of)
+Foam::orientedType Foam::pow3(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return orientedType(of.oriented());
+ return ot;
}
-Foam::orientedType Foam::pow4(const orientedType& of)
+Foam::orientedType Foam::pow4(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
return orientedType(false);
}
-Foam::orientedType Foam::pow5(const orientedType& of)
+Foam::orientedType Foam::pow5(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return orientedType(of.oriented());
+ return ot;
}
-Foam::orientedType Foam::pow6(const orientedType& of)
+Foam::orientedType Foam::pow6(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
return orientedType(false);
}
-Foam::orientedType Foam::pow025(const orientedType& of)
+Foam::orientedType Foam::pow025(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return orientedType(of.oriented());
+ return ot;
}
-Foam::orientedType Foam::sqrt(const orientedType& of)
+Foam::orientedType Foam::sqrt(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::cbrt(const orientedType& of)
+Foam::orientedType Foam::cbrt(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::magSqr(const orientedType& of)
+Foam::orientedType Foam::magSqr(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
return orientedType(false);
}
-Foam::orientedType Foam::mag(const orientedType& of)
+Foam::orientedType Foam::mag(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
return orientedType(false);
}
-Foam::orientedType Foam::sign(const orientedType& of)
+Foam::orientedType Foam::sign(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::pos(const orientedType& of)
+Foam::orientedType Foam::pos(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::neg(const orientedType& of)
+Foam::orientedType Foam::neg(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::posPart(const orientedType& of)
+Foam::orientedType Foam::posPart(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::negPart(const orientedType& of)
+Foam::orientedType Foam::negPart(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::inv(const orientedType& of)
+Foam::orientedType Foam::inv(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
-Foam::orientedType Foam::trans(const orientedType& of)
+Foam::orientedType Foam::trans(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
Foam::orientedType Foam::atan2
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- if (of1.oriented() != of2.oriented())
+ if (!orientedType::checkType(ot1, ot2))
{
FatalErrorInFunction
- << "atan2 is undefined for oriented and unoriented types. "
- << "of1:" << of1.oriented() << ", of2:" << of2.oriented()
+ << "Operator atan2 is undefined for "
+ << orientedType::orientedOptionNames[ot1.oriented()] << " and "
+ << orientedType::orientedOptionNames[ot2.oriented()] << "types"
<< abort(FatalError);
}
- return of1;
+ return ot1;
}
-Foam::orientedType Foam::transform(const orientedType& of)
+Foam::orientedType Foam::transform(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return of;
+ return ot;
}
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-Foam::Istream& Foam::operator>>(Istream& is, orientedType& of)
+Foam::Istream& Foam::operator>>(Istream& is, orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- is >> of.oriented_;
+ ot.oriented_ = orientedType::orientedOptionNames.read(is);
is.check(FUNCTION_NAME);
@@ -368,10 +438,9 @@ Foam::Istream& Foam::operator>>(Istream& is, orientedType& of)
}
-Foam::Ostream& Foam::operator<<(Ostream& os, const orientedType& of)
+Foam::Ostream& Foam::operator<<(Ostream& os, const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- os << of.oriented();
+ os << orientedType::orientedOptionNames[ot.oriented()];
os.check(FUNCTION_NAME);
@@ -383,114 +452,109 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const orientedType& of)
Foam::orientedType Foam::operator+
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- if (of1.oriented() != of2.oriented())
+ if (!orientedType::checkType(ot1, ot2))
{
FatalErrorInFunction
- << "Operator + is undefined for oriented and unoriented types. "
- << "of1:" << of1.oriented() << ", of2:" << of2.oriented()
+ << "Operator + is undefined for "
+ << orientedType::orientedOptionNames[ot1.oriented()] << " and "
+ << orientedType::orientedOptionNames[ot2.oriented()] << " types"
<< abort(FatalError);
}
- return orientedType(of1.oriented() || of2.oriented());
+ // Note use of () operators to convert to boolean op
+ return orientedType(ot1() || ot2());
}
-Foam::orientedType Foam::operator-(const orientedType& of)
+Foam::orientedType Foam::operator-(const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return orientedType(of);
+ return ot;
}
Foam::orientedType Foam::operator-
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- if (of1.oriented() != of2.oriented())
+ if (!orientedType::checkType(ot1, ot2))
{
FatalErrorInFunction
- << "Operator - is undefined for oriented and unoriented types. "
- << "of1:" << of1.oriented() << ", of2:" << of2.oriented()
+ << "Operator - is undefined for "
+ << orientedType::orientedOptionNames[ot1.oriented()] << " and "
+ << orientedType::orientedOptionNames[ot2.oriented()] << " types"
<< abort(FatalError);
}
- return orientedType(of1.oriented() || of2.oriented());
+ // Note use of () operators to convert to boolean op
+ return orientedType(ot1() || ot2());
}
-Foam::orientedType Foam::operator*(const scalar s, const orientedType& of)
+Foam::orientedType Foam::operator*(const scalar s, const orientedType& ot)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return orientedType(of);
+ return ot;
}
-Foam::orientedType Foam::operator/(const orientedType& of, const scalar s)
+Foam::orientedType Foam::operator/(const orientedType& ot, const scalar s)
{
-//InfoInFunction << "of:" << of.oriented() << endl;
- return orientedType(of);
+ return ot;
}
Foam::orientedType Foam::operator/
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- return orientedType(of1.oriented() ^ of2.oriented());
+ return ot1 ^ ot2;
}
Foam::orientedType Foam::operator*
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- return orientedType(of1.oriented() ^ of2.oriented());
+ return ot1 ^ ot2;
}
Foam::orientedType Foam::operator^
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- return orientedType(of1.oriented() ^ of2.oriented());
+ // Note use of () operators to convert to boolean op
+ return orientedType(ot1() ^ ot2());
}
Foam::orientedType Foam::operator&
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
- return orientedType(of1.oriented() ^ of2.oriented());
+ return ot1 ^ ot2;
}
Foam::orientedType Foam::operator&&
(
- const orientedType& of1,
- const orientedType& of2
+ const orientedType& ot1,
+ const orientedType& ot2
)
{
-//InfoInFunction << "of1:" << of1.oriented() << ", of2:" << of2.oriented() << endl;
return orientedType(false);
}
diff --git a/src/OpenFOAM/orientedType/orientedType.H b/src/OpenFOAM/orientedType/orientedType.H
index 4a26164dee03eb3b1e4980913e9264e0a46ae7b2..d050f71dcb5aaeb960f7e2a7b4658d55b04f1b0f 100644
--- a/src/OpenFOAM/orientedType/orientedType.H
+++ b/src/OpenFOAM/orientedType/orientedType.H
@@ -37,6 +37,8 @@ SourceFiles
#include "Istream.H"
#include "Ostream.H"
+#include "dictionary.H"
+#include "NamedEnum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,27 +54,43 @@ Istream& operator>>(Istream&, orientedType&);
Ostream& operator<<(Ostream&, const orientedType&);
/*---------------------------------------------------------------------------*\
- Class dimensioned Declaration
+ Class orientedType Declaration
\*---------------------------------------------------------------------------*/
class orientedType
{
+public:
+
+ // Public data types
+
+ //- Enumeration defining the valid oriented flags
+ enum orientedOption
+ {
+ ORIENTED,
+ UNORIENTED,
+ UNKNOWN
+ };
+
+ static const NamedEnum<orientedOption, 3> orientedOptionNames;
+
+
+private:
+
// Private data
//- Oriented flag
- bool oriented_;
+ orientedOption oriented_;
public:
-
// Constructors
//- Null constructor - flag initialised to false
orientedType();
//- Copy constructor
- orientedType(const orientedType& of);
+ orientedType(const orientedType& ot);
//- Construct from bool
orientedType(const bool oriented);
@@ -83,21 +101,37 @@ public:
// Member functions
+ //- Return true if can operate on this pair of oriented types
+ static bool checkType
+ (
+ const orientedType& ot1,
+ const orientedType& ot2
+ );
+
//- Return non-const reference to the oriented flag
- bool& oriented();
+ orientedOption& oriented();
//- Return const reference to the oriented flag
- bool oriented() const;
+ orientedOption oriented() const;
+
+ //- Set the oriented flag
+ void setOriented(const bool oriented = true);
+
+ //- Read the oriented state from dictionary
+ void read(const dictionary& dict);
+
+ //- Write the oriented flag entry
+ void writeEntry(Ostream& os) const;
// Member operators
- void operator=(const orientedType& of);
+ void operator=(const orientedType& ot);
- void operator+=(const orientedType& of);
- void operator-=(const orientedType& of);
- void operator*=(const orientedType& of);
- void operator/=(const orientedType& of);
+ void operator+=(const orientedType& ot);
+ void operator-=(const orientedType& ot);
+ void operator*=(const orientedType& ot);
+ void operator/=(const orientedType& ot);
void operator*=(const scalar s);
void operator/=(const scalar s);
bool operator()() const;
@@ -105,57 +139,57 @@ public:
// IOstream operators
- friend Istream& operator>>(Istream& is, orientedType& of);
+ friend Istream& operator>>(Istream& is, orientedType& ot);
- friend Ostream& operator<<(Ostream& os, const orientedType& of);
+ friend Ostream& operator<<(Ostream& os, const orientedType& ot);
};
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
-orientedType max(const orientedType& of1, const orientedType& of2);
-orientedType min(const orientedType& of1, const orientedType& of2);
-orientedType cmptMultiply(const orientedType& of1, const orientedType& of2);
-orientedType cmptDivide(const orientedType& of1, const orientedType& of);
-orientedType cmptAv(const orientedType& of);
-
-
-orientedType pow(const orientedType& of, const scalar r);
-orientedType sqr(const orientedType& of);
-orientedType pow3(const orientedType& of);
-orientedType pow4(const orientedType& of);
-orientedType pow5(const orientedType& of);
-orientedType pow6(const orientedType& of);
-orientedType pow025(const orientedType& of);
-
-
-orientedType sqrt(const orientedType& of);
-orientedType cbrt(const orientedType& of);
-orientedType magSqr(const orientedType& of);
-orientedType mag(const orientedType& of);
-orientedType sign(const orientedType& of);
-orientedType pos(const orientedType& of);
-orientedType neg(const orientedType& of);
-orientedType posPart(const orientedType& of);
-orientedType negPart(const orientedType& of);
-orientedType inv(const orientedType& of);
-
-
-orientedType trans(const orientedType& of);
-orientedType atan2(const orientedType& of1, const orientedType& of2);
-orientedType transform(const orientedType& of);
-
-orientedType operator-(const orientedType& of);
-orientedType operator*(const scalar s, const orientedType& of);
-orientedType operator/(const orientedType& of, const scalar s);
-
-orientedType operator+(const orientedType& of1, const orientedType& of2);
-orientedType operator-(const orientedType& of1, const orientedType& of2);
-orientedType operator/(const orientedType& of1, const orientedType& of2);
-orientedType operator*(const orientedType& of1, const orientedType& of2);
-orientedType operator^(const orientedType& of1, const orientedType& of2);
-orientedType operator&(const orientedType& of1, const orientedType& of2);
-orientedType operator&&(const orientedType& of1, const orientedType& of2);
+orientedType max(const orientedType& ot1, const orientedType& ot2);
+orientedType min(const orientedType& ot1, const orientedType& ot2);
+orientedType cmptMultiply(const orientedType& ot1, const orientedType& ot2);
+orientedType cmptDivide(const orientedType& ot1, const orientedType& ot);
+orientedType cmptAv(const orientedType& ot);
+
+
+orientedType pow(const orientedType& ot, const scalar r);
+orientedType sqr(const orientedType& ot);
+orientedType pow3(const orientedType& ot);
+orientedType pow4(const orientedType& ot);
+orientedType pow5(const orientedType& ot);
+orientedType pow6(const orientedType& ot);
+orientedType pow025(const orientedType& ot);
+
+
+orientedType sqrt(const orientedType& ot);
+orientedType cbrt(const orientedType& ot);
+orientedType magSqr(const orientedType& ot);
+orientedType mag(const orientedType& ot);
+orientedType sign(const orientedType& ot);
+orientedType pos(const orientedType& ot);
+orientedType neg(const orientedType& ot);
+orientedType posPart(const orientedType& ot);
+orientedType negPart(const orientedType& ot);
+orientedType inv(const orientedType& ot);
+
+
+orientedType trans(const orientedType& ot);
+orientedType atan2(const orientedType& ot1, const orientedType& ot2);
+orientedType transform(const orientedType& ot);
+
+orientedType operator-(const orientedType& ot);
+orientedType operator*(const scalar s, const orientedType& ot);
+orientedType operator/(const orientedType& ot, const scalar s);
+
+orientedType operator+(const orientedType& ot1, const orientedType& ot2);
+orientedType operator-(const orientedType& ot1, const orientedType& ot2);
+orientedType operator/(const orientedType& ot1, const orientedType& ot2);
+orientedType operator*(const orientedType& ot1, const orientedType& ot2);
+orientedType operator^(const orientedType& ot1, const orientedType& ot2);
+orientedType operator&(const orientedType& ot1, const orientedType& ot2);
+orientedType operator&&(const orientedType& ot1, const orientedType& ot2);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 7c9505841b320fcb3c7b054d9b082e0738db9804..3aea9d7f29d66528e988522973e3f24596a53090 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -1195,7 +1195,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
"ddt0(" + phi.name() + ')',
phi.dimensions()
);
- dphidt0.oriented().oriented() = true;
+ dphidt0.setOriented();
dimensionedScalar rDtCoef = rDtCoef_(ddt0);
@@ -1440,7 +1440,7 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
dimVolume
);
- meshPhi0.oriented().oriented() = true;
+ meshPhi0.setOriented();
if (evaluate(meshPhi0))
{
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index b6f6fbbef6a46a2bdde9eb3dfaf334529e2b2336..3844234dff0545fa9589366a5f0bff9bbf9e0e5e 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -124,7 +124,7 @@ snGradScheme<Type>::snGrad
)
);
GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tsf.ref();
- ssf.oriented().oriented() = true;
+ ssf.setOriented();
// set reference to difference factors array
const scalarField& deltaCoeffs = tdeltaCoeffs();
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index bb87c6d7f758d80e85752978a1a3954d265c8b3f..262444193cd12ea40dbc5dd13ca0a7fd56e62524 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -892,7 +892,7 @@ flux() const
GeometricField<Type, fvsPatchField, surfaceMesh>& fieldFlux =
tfieldFlux.ref();
- fieldFlux.oriented().oriented() = true;
+ fieldFlux.setOriented();
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 994226704135bed9f847ddcf59a84efcb8ea3079..c530ee0a9a0c8032062d4bf68e7f3584993c39b8 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -68,7 +68,7 @@ void Foam::fvMesh::makeSf() const
faceAreas()
);
- SfPtr_->oriented().oriented() = true;
+ SfPtr_->setOriented();
}
@@ -400,7 +400,7 @@ Foam::tmp<Foam::surfaceVectorField> Foam::fvMesh::delta() const
)
);
surfaceVectorField& delta = tdelta.ref();
- delta.oriented().oriented() = true;
+ delta.setOriented();
const volVectorField& C = this->C();
const labelUList& owner = this->owner();
@@ -438,7 +438,7 @@ const Foam::surfaceScalarField& Foam::fvMesh::phi() const
(*phiPtr_) = dimensionedScalar("0", dimVolume/dimTime, 0.0);
}
- phiPtr_->oriented().oriented() = true;
+ phiPtr_->setOriented();
return *phiPtr_;
}
diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
index f9e58e589b3c23bf8ffd3c5762dc5ec6bb255bef..d1f21db48ae9c7a7fcead0390be5c84498a42329 100644
--- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
+++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
@@ -72,9 +72,9 @@ void MapInternalField<Type, MeshMapper, surfaceMesh>::operator()
// Passing in oriented flag so that oriented fields (e.g. phi) are negated
// if flipped. Un-oriented fields, e.g U interpolated to faces (Uf) are not
// touched
- field.autoMap(mapper.surfaceMap(), field.oriented().oriented());
+ field.autoMap(mapper.surfaceMap(), field.oriented()());
- if (field.oriented().oriented())
+ if (field.oriented()())
{
// Flip the flux
const labelList flipFaces = mapper.surfaceMap().flipFaceFlux().toc();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index f09cc74c3395f63c535d3bb4abd86a596d0055ed..f13c646316b1ec18efafad56511002b4e62560fa 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -154,7 +154,7 @@ void Foam::surfaceInterpolation::makeWeights() const
dimless
);
surfaceScalarField& weights = *weights_;
- weights.oriented().oriented() = true;
+ weights.setOriented();
// Set local references to mesh data
// Note that we should not use fvMesh sliced fields at this point yet
@@ -226,7 +226,7 @@ void Foam::surfaceInterpolation::makeDeltaCoeffs() const
dimless/dimLength
);
surfaceScalarField& deltaCoeffs = *deltaCoeffs_;
- deltaCoeffs.oriented().oriented() = true;
+ deltaCoeffs.setOriented();
// Set local references to mesh data
@@ -277,7 +277,7 @@ void Foam::surfaceInterpolation::makeNonOrthDeltaCoeffs() const
dimless/dimLength
);
surfaceScalarField& nonOrthDeltaCoeffs = *nonOrthDeltaCoeffs_;
- nonOrthDeltaCoeffs.oriented().oriented() = true;
+ nonOrthDeltaCoeffs.setOriented();
// Set local references to mesh data
@@ -342,7 +342,7 @@ void Foam::surfaceInterpolation::makeNonOrthCorrectionVectors() const
dimless
);
surfaceVectorField& corrVecs = *nonOrthCorrectionVectors_;
- corrVecs.oriented().oriented() = true;
+ corrVecs.setOriented();
// Set local references to mesh data
const volVectorField& C = mesh_.C();
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
index ab231a939b6b40813f8f3f04cbb433e8b4c7dc9e..cffd1a6e1e239ca899475eee1b67a6f9c9addbc1 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
@@ -291,7 +291,7 @@ Foam::fvFieldDecomposer::decomposeField
)
);
- if (resF.oriented().oriented())
+ if (resF.oriented()())
{
bf[patchi] *= faceSign_[patchi];
}
@@ -313,7 +313,7 @@ Foam::fvFieldDecomposer::decomposeField
)
);
- if (resF.oriented().oriented())
+ if (resF.oriented()())
{
bf[patchi] *= faceSign_[patchi];
}