From 6644f8343bdfd8e3232217380a2a8cbd43e10e2f Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 29 Jan 2016 09:56:59 +0000 Subject: [PATCH] coordinateSystems/coordinateRotation: Corrected e1, e2 and e3 and updated documentation Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1982 --- .../coordinateRotation/EulerCoordinateRotation.H | 14 +++++++------- .../coordinateRotation/STARCDCoordinateRotation.H | 14 +++++++------- .../coordinateRotation/axesRotation.H | 14 +++++++------- .../coordinateRotation/cylindrical.H | 8 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H index 362c846fe1..0b24b4abc9 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H +++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -148,22 +148,22 @@ public: return Rtr_; }; - //- Return local Cartesian x-axis + //- Return local Cartesian x-axis in global coordinates virtual const vector e1() const { - return R_.x(); + return Rtr_.x(); } - //- Return local Cartesian y-axis + //- Return local Cartesian y-axis in global coordinates virtual const vector e2() const { - return R_.y(); + return Rtr_.y(); } - //- Return local Cartesian z-axis + //- Return local Cartesian z-axis in global coordinates virtual const vector e3() const { - return R_.z(); + return Rtr_.z(); } //- Return transformation tensor field diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H index 1b73f71ee2..e50de63228 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H +++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -144,22 +144,22 @@ public: return Rtr_; }; - //- Return local Cartesian x-axis + //- Return local Cartesian x-axis in global coordinates virtual const vector e1() const { - return R_.x(); + return Rtr_.x(); } - //- Return local Cartesian y-axis + //- Return local Cartesian y-axis in global coordinates virtual const vector e2() const { - return R_.y(); + return Rtr_.y(); } - //- Return local Cartesian z-axis + //- Return local Cartesian z-axis in global coordinates virtual const vector e3() const { - return R_.z(); + return Rtr_.z(); } //- Return transformation tensor field diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H index 937f28c041..1254a474d3 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H +++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,22 +150,22 @@ public: return Rtr_; } - //- Return local Cartesian x-axis + //- Return local Cartesian x-axis in global coordinates virtual const vector e1() const { - return R_.x(); + return Rtr_.x(); } - //- Return local Cartesian y-axis + //- Return local Cartesian y-axis in global coordinates virtual const vector e2() const { - return R_.y(); + return Rtr_.y(); } - //- Return local Cartesian z-axis + //- Return local Cartesian z-axis in global coordinates virtual const vector e3() const { - return R_.z(); + return Rtr_.z(); } //- Return transformation tensor field diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H index 50e0450b27..8c571ff4ae 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H +++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -154,21 +154,21 @@ public: return tensor::zero; } - //- Return local Cartesian x-axis + //- Return local Cartesian x-axis in global coordinates virtual const vector e1() const { NotImplemented; return vector::zero; } - //- Return local Cartesian y-axis + //- Return local Cartesian y-axis in global coordinates virtual const vector e2() const { NotImplemented; return vector::zero; } - //- Return local Cartesian z-axis + //- Return local Cartesian z-axis in global coordinates virtual const vector e3() const { return e3_;