Skip to content

Commit 59a634a

Browse files
imikejacksonimikejackson
committed
COMP: Remove legacy float[3][3] for MatSymOp functions
1 parent 08cf743 commit 59a634a

23 files changed

Lines changed: 52 additions & 358 deletions

‎Source/EbsdLib/LaueOps/CubicLowOps.cpp‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -276,45 +276,19 @@ RodriguesDType CubicLowOps::getRodSymOp(size_t i) const
276276
return CubicLow::RodSym[i];
277277
}
278278

279-
ebsdlib::Matrix3X3D CubicLowOps::getMatSymOpD(int i) const
279+
Matrix3X3D CubicLowOps::getMatSymOpD(int i) const
280280
{
281281
return {CubicLow::MatSym[i][0][0], CubicLow::MatSym[i][0][1], CubicLow::MatSym[i][0][2], CubicLow::MatSym[i][1][0], CubicLow::MatSym[i][1][1],
282282
CubicLow::MatSym[i][1][2], CubicLow::MatSym[i][2][0], CubicLow::MatSym[i][2][1], CubicLow::MatSym[i][2][2]};
283283
}
284284

285-
ebsdlib::Matrix3X3F CubicLowOps::getMatSymOpF(int i) const
285+
Matrix3X3F CubicLowOps::getMatSymOpF(int i) const
286286
{
287287
return {static_cast<float>(CubicLow::MatSym[i][0][0]), static_cast<float>(CubicLow::MatSym[i][0][1]), static_cast<float>(CubicLow::MatSym[i][0][2]),
288288
static_cast<float>(CubicLow::MatSym[i][1][0]), static_cast<float>(CubicLow::MatSym[i][1][1]), static_cast<float>(CubicLow::MatSym[i][1][2]),
289289
static_cast<float>(CubicLow::MatSym[i][2][0]), static_cast<float>(CubicLow::MatSym[i][2][1]), static_cast<float>(CubicLow::MatSym[i][2][2])};
290290
}
291291

292-
void CubicLowOps::getMatSymOp(int i, double g[3][3]) const
293-
{
294-
g[0][0] = CubicLow::MatSym[i][0][0];
295-
g[0][1] = CubicLow::MatSym[i][0][1];
296-
g[0][2] = CubicLow::MatSym[i][0][2];
297-
g[1][0] = CubicLow::MatSym[i][1][0];
298-
g[1][1] = CubicLow::MatSym[i][1][1];
299-
g[1][2] = CubicLow::MatSym[i][1][2];
300-
g[2][0] = CubicLow::MatSym[i][2][0];
301-
g[2][1] = CubicLow::MatSym[i][2][1];
302-
g[2][2] = CubicLow::MatSym[i][2][2];
303-
}
304-
305-
void CubicLowOps::getMatSymOp(int i, float g[3][3]) const
306-
{
307-
g[0][0] = static_cast<float>(CubicLow::MatSym[i][0][0]);
308-
g[0][1] = static_cast<float>(CubicLow::MatSym[i][0][1]);
309-
g[0][2] = static_cast<float>(CubicLow::MatSym[i][0][2]);
310-
g[1][0] = static_cast<float>(CubicLow::MatSym[i][1][0]);
311-
g[1][1] = static_cast<float>(CubicLow::MatSym[i][1][1]);
312-
g[1][2] = static_cast<float>(CubicLow::MatSym[i][1][2]);
313-
g[2][0] = static_cast<float>(CubicLow::MatSym[i][2][0]);
314-
g[2][1] = static_cast<float>(CubicLow::MatSym[i][2][1]);
315-
g[2][2] = static_cast<float>(CubicLow::MatSym[i][2][2]);
316-
}
317-
318292
// -----------------------------------------------------------------------------
319293
//
320294
// -----------------------------------------------------------------------------

‎Source/EbsdLib/LaueOps/CubicLowOps.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,8 @@ class EbsdLib_EXPORT CubicLowOps : public LaueOps
176176
* @param i The index from the Symmetry Operator Array to retrieve
177177
* @return void or a Matrix3X3 object.
178178
*/
179-
void getMatSymOp(int i, double g[3][3]) const override;
180-
void getMatSymOp(int i, float g[3][3]) const override;
181-
ebsdlib::Matrix3X3F getMatSymOpF(int i) const override;
182-
ebsdlib::Matrix3X3D getMatSymOpD(int i) const override;
179+
Matrix3X3F getMatSymOpF(int i) const override;
180+
Matrix3X3D getMatSymOpD(int i) const override;
183181

184182
RodriguesDType getODFFZRod(const RodriguesDType& rod) const override;
185183
RodriguesDType getMDFFZRod(const RodriguesDType& rod) const override;

‎Source/EbsdLib/LaueOps/CubicOps.cpp‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -619,45 +619,19 @@ RodriguesDType CubicOps::getRodSymOp(size_t i) const
619619
return CubicHigh::RodSym[i];
620620
}
621621

622-
ebsdlib::Matrix3X3D CubicOps::getMatSymOpD(int i) const
622+
Matrix3X3D CubicOps::getMatSymOpD(int i) const
623623
{
624624
return {CubicHigh::MatSym[i][0][0], CubicHigh::MatSym[i][0][1], CubicHigh::MatSym[i][0][2], CubicHigh::MatSym[i][1][0], CubicHigh::MatSym[i][1][1],
625625
CubicHigh::MatSym[i][1][2], CubicHigh::MatSym[i][2][0], CubicHigh::MatSym[i][2][1], CubicHigh::MatSym[i][2][2]};
626626
}
627627

628-
ebsdlib::Matrix3X3F CubicOps::getMatSymOpF(int i) const
628+
Matrix3X3F CubicOps::getMatSymOpF(int i) const
629629
{
630630
return {static_cast<float>(CubicHigh::MatSym[i][0][0]), static_cast<float>(CubicHigh::MatSym[i][0][1]), static_cast<float>(CubicHigh::MatSym[i][0][2]),
631631
static_cast<float>(CubicHigh::MatSym[i][1][0]), static_cast<float>(CubicHigh::MatSym[i][1][1]), static_cast<float>(CubicHigh::MatSym[i][1][2]),
632632
static_cast<float>(CubicHigh::MatSym[i][2][0]), static_cast<float>(CubicHigh::MatSym[i][2][1]), static_cast<float>(CubicHigh::MatSym[i][2][2])};
633633
}
634634

635-
void CubicOps::getMatSymOp(int i, double g[3][3]) const
636-
{
637-
g[0][0] = CubicHigh::MatSym[i][0][0];
638-
g[0][1] = CubicHigh::MatSym[i][0][1];
639-
g[0][2] = CubicHigh::MatSym[i][0][2];
640-
g[1][0] = CubicHigh::MatSym[i][1][0];
641-
g[1][1] = CubicHigh::MatSym[i][1][1];
642-
g[1][2] = CubicHigh::MatSym[i][1][2];
643-
g[2][0] = CubicHigh::MatSym[i][2][0];
644-
g[2][1] = CubicHigh::MatSym[i][2][1];
645-
g[2][2] = CubicHigh::MatSym[i][2][2];
646-
}
647-
648-
void CubicOps::getMatSymOp(int i, float g[3][3]) const
649-
{
650-
g[0][0] = static_cast<float>(CubicHigh::MatSym[i][0][0]);
651-
g[0][1] = static_cast<float>(CubicHigh::MatSym[i][0][1]);
652-
g[0][2] = static_cast<float>(CubicHigh::MatSym[i][0][2]);
653-
g[1][0] = static_cast<float>(CubicHigh::MatSym[i][1][0]);
654-
g[1][1] = static_cast<float>(CubicHigh::MatSym[i][1][1]);
655-
g[1][2] = static_cast<float>(CubicHigh::MatSym[i][1][2]);
656-
g[2][0] = static_cast<float>(CubicHigh::MatSym[i][2][0]);
657-
g[2][1] = static_cast<float>(CubicHigh::MatSym[i][2][1]);
658-
g[2][2] = static_cast<float>(CubicHigh::MatSym[i][2][2]);
659-
}
660-
661635
// -----------------------------------------------------------------------------
662636
//
663637
// -----------------------------------------------------------------------------

‎Source/EbsdLib/LaueOps/CubicOps.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,8 @@ class EbsdLib_EXPORT CubicOps : public LaueOps
175175
* @param i The index from the Symmetry Operator Array to retrieve
176176
* @return void or a Matrix3X3 object.
177177
*/
178-
void getMatSymOp(int i, double g[3][3]) const override;
179-
void getMatSymOp(int i, float g[3][3]) const override;
180-
ebsdlib::Matrix3X3F getMatSymOpF(int i) const override;
181-
ebsdlib::Matrix3X3D getMatSymOpD(int i) const override;
178+
Matrix3X3F getMatSymOpF(int i) const override;
179+
Matrix3X3D getMatSymOpD(int i) const override;
182180

183181
RodriguesDType getODFFZRod(const RodriguesDType& rod) const override;
184182
RodriguesDType getMDFFZRod(const RodriguesDType& rod) const override;

‎Source/EbsdLib/LaueOps/HexagonalLowOps.cpp‎

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -243,45 +243,19 @@ RodriguesDType HexagonalLowOps::getRodSymOp(size_t i) const
243243
return HexagonalLow::RodSym[i];
244244
}
245245

246-
ebsdlib::Matrix3X3D HexagonalLowOps::getMatSymOpD(int i) const
246+
Matrix3X3D HexagonalLowOps::getMatSymOpD(int i) const
247247
{
248248
return {HexagonalLow::MatSym[i][0][0], HexagonalLow::MatSym[i][0][1], HexagonalLow::MatSym[i][0][2], HexagonalLow::MatSym[i][1][0], HexagonalLow::MatSym[i][1][1],
249249
HexagonalLow::MatSym[i][1][2], HexagonalLow::MatSym[i][2][0], HexagonalLow::MatSym[i][2][1], HexagonalLow::MatSym[i][2][2]};
250250
}
251251

252-
ebsdlib::Matrix3X3F HexagonalLowOps::getMatSymOpF(int i) const
252+
Matrix3X3F HexagonalLowOps::getMatSymOpF(int i) const
253253
{
254254
return {static_cast<float>(HexagonalLow::MatSym[i][0][0]), static_cast<float>(HexagonalLow::MatSym[i][0][1]), static_cast<float>(HexagonalLow::MatSym[i][0][2]),
255255
static_cast<float>(HexagonalLow::MatSym[i][1][0]), static_cast<float>(HexagonalLow::MatSym[i][1][1]), static_cast<float>(HexagonalLow::MatSym[i][1][2]),
256256
static_cast<float>(HexagonalLow::MatSym[i][2][0]), static_cast<float>(HexagonalLow::MatSym[i][2][1]), static_cast<float>(HexagonalLow::MatSym[i][2][2])};
257257
}
258258

259-
void HexagonalLowOps::getMatSymOp(int i, double g[3][3]) const
260-
{
261-
g[0][0] = HexagonalLow::MatSym[i][0][0];
262-
g[0][1] = HexagonalLow::MatSym[i][0][1];
263-
g[0][2] = HexagonalLow::MatSym[i][0][2];
264-
g[1][0] = HexagonalLow::MatSym[i][1][0];
265-
g[1][1] = HexagonalLow::MatSym[i][1][1];
266-
g[1][2] = HexagonalLow::MatSym[i][1][2];
267-
g[2][0] = HexagonalLow::MatSym[i][2][0];
268-
g[2][1] = HexagonalLow::MatSym[i][2][1];
269-
g[2][2] = HexagonalLow::MatSym[i][2][2];
270-
}
271-
272-
void HexagonalLowOps::getMatSymOp(int i, float g[3][3]) const
273-
{
274-
g[0][0] = static_cast<float>(HexagonalLow::MatSym[i][0][0]);
275-
g[0][1] = static_cast<float>(HexagonalLow::MatSym[i][0][1]);
276-
g[0][2] = static_cast<float>(HexagonalLow::MatSym[i][0][2]);
277-
g[1][0] = static_cast<float>(HexagonalLow::MatSym[i][1][0]);
278-
g[1][1] = static_cast<float>(HexagonalLow::MatSym[i][1][1]);
279-
g[1][2] = static_cast<float>(HexagonalLow::MatSym[i][1][2]);
280-
g[2][0] = static_cast<float>(HexagonalLow::MatSym[i][2][0]);
281-
g[2][1] = static_cast<float>(HexagonalLow::MatSym[i][2][1]);
282-
g[2][2] = static_cast<float>(HexagonalLow::MatSym[i][2][2]);
283-
}
284-
285259
// -----------------------------------------------------------------------------
286260
//
287261
// -----------------------------------------------------------------------------
@@ -837,7 +811,7 @@ double HexagonalLowOps::getmPrime(const QuatD& q1, const QuatD& q2, double LD[3]
837811
return 0.0;
838812
#if 0
839813
/* I am asserting here because this code will simply give junk results and if someone uses it
840-
* they could unknowningly get really bad results
814+
* they could unknowingly get really bad results
841815
*/
842816
double g1[3][3];
843817
double g2[3][3];
@@ -877,7 +851,7 @@ double HexagonalLowOps::getF1(const QuatD& q1, const QuatD& q2, double LD[3], bo
877851
return 0.0;
878852
#if 0
879853
/* I am asserting here because this code will simply give junk results and if someone uses it
880-
* they could unknowningly get really bad results
854+
* they could unknowingly get really bad results
881855
*/
882856
double g1[3][3];
883857
double g2[3][3];

‎Source/EbsdLib/LaueOps/HexagonalLowOps.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,8 @@ class EbsdLib_EXPORT HexagonalLowOps : public LaueOps
176176
* @param i The index from the Symmetry Operator Array to retrieve
177177
* @return void or a Matrix3X3 object.
178178
*/
179-
void getMatSymOp(int i, double g[3][3]) const override;
180-
void getMatSymOp(int i, float g[3][3]) const override;
181-
ebsdlib::Matrix3X3F getMatSymOpF(int i) const override;
182-
ebsdlib::Matrix3X3D getMatSymOpD(int i) const override;
179+
Matrix3X3F getMatSymOpF(int i) const override;
180+
Matrix3X3D getMatSymOpD(int i) const override;
183181

184182
RodriguesDType getODFFZRod(const RodriguesDType& rod) const override;
185183
RodriguesDType getMDFFZRod(const RodriguesDType& rod) const override;

‎Source/EbsdLib/LaueOps/HexagonalOps.cpp‎

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -288,44 +288,19 @@ RodriguesDType HexagonalOps::getRodSymOp(size_t i) const
288288
return HexagonalHigh::RodSym[i];
289289
}
290290

291-
ebsdlib::Matrix3X3D HexagonalOps::getMatSymOpD(int i) const
291+
Matrix3X3D HexagonalOps::getMatSymOpD(int i) const
292292
{
293293
return {HexagonalHigh::MatSym[i][0][0], HexagonalHigh::MatSym[i][0][1], HexagonalHigh::MatSym[i][0][2], HexagonalHigh::MatSym[i][1][0], HexagonalHigh::MatSym[i][1][1],
294294
HexagonalHigh::MatSym[i][1][2], HexagonalHigh::MatSym[i][2][0], HexagonalHigh::MatSym[i][2][1], HexagonalHigh::MatSym[i][2][2]};
295295
}
296296

297-
ebsdlib::Matrix3X3F HexagonalOps::getMatSymOpF(int i) const
297+
Matrix3X3F HexagonalOps::getMatSymOpF(int i) const
298298
{
299299
return {static_cast<float>(HexagonalHigh::MatSym[i][0][0]), static_cast<float>(HexagonalHigh::MatSym[i][0][1]), static_cast<float>(HexagonalHigh::MatSym[i][0][2]),
300300
static_cast<float>(HexagonalHigh::MatSym[i][1][0]), static_cast<float>(HexagonalHigh::MatSym[i][1][1]), static_cast<float>(HexagonalHigh::MatSym[i][1][2]),
301301
static_cast<float>(HexagonalHigh::MatSym[i][2][0]), static_cast<float>(HexagonalHigh::MatSym[i][2][1]), static_cast<float>(HexagonalHigh::MatSym[i][2][2])};
302302
}
303303

304-
void HexagonalOps::getMatSymOp(int i, double g[3][3]) const
305-
{
306-
g[0][0] = HexagonalHigh::MatSym[i][0][0];
307-
g[0][1] = HexagonalHigh::MatSym[i][0][1];
308-
g[0][2] = HexagonalHigh::MatSym[i][0][2];
309-
g[1][0] = HexagonalHigh::MatSym[i][1][0];
310-
g[1][1] = HexagonalHigh::MatSym[i][1][1];
311-
g[1][2] = HexagonalHigh::MatSym[i][1][2];
312-
g[2][0] = HexagonalHigh::MatSym[i][2][0];
313-
g[2][1] = HexagonalHigh::MatSym[i][2][1];
314-
g[2][2] = HexagonalHigh::MatSym[i][2][2];
315-
}
316-
317-
void HexagonalOps::getMatSymOp(int i, float g[3][3]) const
318-
{
319-
g[0][0] = static_cast<float>(HexagonalHigh::MatSym[i][0][0]);
320-
g[0][1] = static_cast<float>(HexagonalHigh::MatSym[i][0][1]);
321-
g[0][2] = static_cast<float>(HexagonalHigh::MatSym[i][0][2]);
322-
g[1][0] = static_cast<float>(HexagonalHigh::MatSym[i][1][0]);
323-
g[1][1] = static_cast<float>(HexagonalHigh::MatSym[i][1][1]);
324-
g[1][2] = static_cast<float>(HexagonalHigh::MatSym[i][1][2]);
325-
g[2][0] = static_cast<float>(HexagonalHigh::MatSym[i][2][0]);
326-
g[2][1] = static_cast<float>(HexagonalHigh::MatSym[i][2][1]);
327-
g[2][2] = static_cast<float>(HexagonalHigh::MatSym[i][2][2]);
328-
}
329304
// -----------------------------------------------------------------------------
330305
//
331306
// -----------------------------------------------------------------------------
@@ -883,7 +858,7 @@ double HexagonalOps::getmPrime(const QuatD& q1, const QuatD& q2, double LD[3]) c
883858
return 0.0;
884859
#if 0
885860
/* I am asserting here because this code will simply give junk results and if someone uses it
886-
* they could unknowningly get really bad results
861+
* they could unknowingly get really bad results
887862
*/
888863
double g1[3][3];
889864
double g2[3][3];
@@ -922,7 +897,7 @@ double HexagonalOps::getF1(const QuatD& q1, const QuatD& q2, double LD[3], bool
922897
return 0.0;
923898
#if 0
924899
/* I am asserting here because this code will simply give junk results and if someone uses it
925-
* they could unknowningly get really bad results
900+
* they could unknowingly get really bad results
926901
*/
927902
double g1[3][3];
928903
double g2[3][3];
@@ -1378,7 +1353,7 @@ std::vector<ebsdlib::UInt8ArrayType::Pointer> HexagonalOps::generatePoleFigure(P
13781353
generateSphereCoordsFromEulers(config.eulers, xyz001.get(), xyz011.get(), xyz111.get());
13791354

13801355
// These arrays hold the "intensity" images which eventually get converted to an actual Color RGB image
1381-
// Generate the modified Lambert projection images (Squares, 2 of them, 1 for northern hemisphere, 1 for southern hemisphere
1356+
// Generate the modified Lambert projection images (Squares, 2 of them, 1 for Northern Hemisphere, 1 for Southern Hemisphere
13821357
ebsdlib::DoubleArrayType::Pointer intensity001 = ebsdlib::DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label0 + "_Intensity_Image", true);
13831358
ebsdlib::DoubleArrayType::Pointer intensity011 = ebsdlib::DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image", true);
13841359
ebsdlib::DoubleArrayType::Pointer intensity111 = ebsdlib::DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image", true);

‎Source/EbsdLib/LaueOps/HexagonalOps.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,8 @@ class EbsdLib_EXPORT HexagonalOps : public LaueOps
176176
* @param i The index from the Symmetry Operator Array to retrieve
177177
* @return void or a Matrix3X3 object.
178178
*/
179-
void getMatSymOp(int i, double g[3][3]) const override;
180-
void getMatSymOp(int i, float g[3][3]) const override;
181-
ebsdlib::Matrix3X3F getMatSymOpF(int i) const override;
182-
ebsdlib::Matrix3X3D getMatSymOpD(int i) const override;
179+
Matrix3X3F getMatSymOpF(int i) const override;
180+
Matrix3X3D getMatSymOpD(int i) const override;
183181

184182
RodriguesDType getODFFZRod(const RodriguesDType& rod) const override;
185183
RodriguesDType getMDFFZRod(const RodriguesDType& rod) const override;

‎Source/EbsdLib/LaueOps/LaueOps.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class EbsdLib_EXPORT LaueOps
167167
* @param q2 Input Quaternion
168168
* @return Axis Angle Representation
169169
*/
170-
virtual ebsdlib::AxisAngleDType calculateMisorientation(const QuatD& q1, const QuatD& q2) const = 0;
170+
virtual AxisAngleDType calculateMisorientation(const QuatD& q1, const QuatD& q2) const = 0;
171171

172172
/**
173173
* @brief calculateMisorientation Finds the misorientation between 2 quaternions and returns the result as an Axis Angle value
@@ -197,10 +197,8 @@ class EbsdLib_EXPORT LaueOps
197197
* @param g The g matrix
198198
* @return void or a Matrix3X3 object.
199199
*/
200-
virtual void getMatSymOp(int i, double g[3][3]) const = 0;
201-
virtual void getMatSymOp(int i, float g[3][3]) const = 0;
202-
virtual ebsdlib::Matrix3X3F getMatSymOpF(int i) const = 0;
203-
virtual ebsdlib::Matrix3X3D getMatSymOpD(int i) const = 0;
200+
virtual Matrix3X3F getMatSymOpF(int i) const = 0;
201+
virtual Matrix3X3D getMatSymOpD(int i) const = 0;
204202

205203
/**
206204
* @brief getODFFZRod

‎Source/EbsdLib/LaueOps/MonoclinicOps.cpp‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -219,45 +219,19 @@ RodriguesDType MonoclinicOps::getRodSymOp(size_t i) const
219219
return Monoclinic::RodSym[i];
220220
}
221221

222-
ebsdlib::Matrix3X3D MonoclinicOps::getMatSymOpD(int i) const
222+
Matrix3X3D MonoclinicOps::getMatSymOpD(int i) const
223223
{
224224
return {Monoclinic::MatSym[i][0][0], Monoclinic::MatSym[i][0][1], Monoclinic::MatSym[i][0][2], Monoclinic::MatSym[i][1][0], Monoclinic::MatSym[i][1][1],
225225
Monoclinic::MatSym[i][1][2], Monoclinic::MatSym[i][2][0], Monoclinic::MatSym[i][2][1], Monoclinic::MatSym[i][2][2]};
226226
}
227227

228-
ebsdlib::Matrix3X3F MonoclinicOps::getMatSymOpF(int i) const
228+
Matrix3X3F MonoclinicOps::getMatSymOpF(int i) const
229229
{
230230
return {static_cast<float>(Monoclinic::MatSym[i][0][0]), static_cast<float>(Monoclinic::MatSym[i][0][1]), static_cast<float>(Monoclinic::MatSym[i][0][2]),
231231
static_cast<float>(Monoclinic::MatSym[i][1][0]), static_cast<float>(Monoclinic::MatSym[i][1][1]), static_cast<float>(Monoclinic::MatSym[i][1][2]),
232232
static_cast<float>(Monoclinic::MatSym[i][2][0]), static_cast<float>(Monoclinic::MatSym[i][2][1]), static_cast<float>(Monoclinic::MatSym[i][2][2])};
233233
}
234234

235-
void MonoclinicOps::getMatSymOp(int i, double g[3][3]) const
236-
{
237-
g[0][0] = Monoclinic::MatSym[i][0][0];
238-
g[0][1] = Monoclinic::MatSym[i][0][1];
239-
g[0][2] = Monoclinic::MatSym[i][0][2];
240-
g[1][0] = Monoclinic::MatSym[i][1][0];
241-
g[1][1] = Monoclinic::MatSym[i][1][1];
242-
g[1][2] = Monoclinic::MatSym[i][1][2];
243-
g[2][0] = Monoclinic::MatSym[i][2][0];
244-
g[2][1] = Monoclinic::MatSym[i][2][1];
245-
g[2][2] = Monoclinic::MatSym[i][2][2];
246-
}
247-
248-
void MonoclinicOps::getMatSymOp(int i, float g[3][3]) const
249-
{
250-
g[0][0] = static_cast<float>(Monoclinic::MatSym[i][0][0]);
251-
g[0][1] = static_cast<float>(Monoclinic::MatSym[i][0][1]);
252-
g[0][2] = static_cast<float>(Monoclinic::MatSym[i][0][2]);
253-
g[1][0] = static_cast<float>(Monoclinic::MatSym[i][1][0]);
254-
g[1][1] = static_cast<float>(Monoclinic::MatSym[i][1][1]);
255-
g[1][2] = static_cast<float>(Monoclinic::MatSym[i][1][2]);
256-
g[2][0] = static_cast<float>(Monoclinic::MatSym[i][2][0]);
257-
g[2][1] = static_cast<float>(Monoclinic::MatSym[i][2][1]);
258-
g[2][2] = static_cast<float>(Monoclinic::MatSym[i][2][2]);
259-
}
260-
261235
// -----------------------------------------------------------------------------
262236
//
263237
// -----------------------------------------------------------------------------

0 commit comments

Comments
 (0)