OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2345 Add + and * operators to the tensor class, to make averaging possible.

Browse Source
This commit is contained in:
Jacob Støren
2018-02-07 13:10:36 +01:00
parent bd14c65678
commit bb53b926bf
3 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/UnitTests/ScalarMapper-Test.cpp
View File

@@ -124,7 +124,7 @@ TEST(OffshoreSphericalCoords, OffshoreSphericalCoords)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(TensorRotation, TensorRotation)
TEST(Tensor, TensorRotation)
{
{
@@ -232,4 +232,32 @@ TEST(TensorRotation, TensorRotation)
EXPECT_NEAR(0.0f, rotT[caf::Ten3f::SYZ], 1e-4);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(Tensor, TensorAddScale)
{
caf::Ten3f orgT1(1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f);
caf::Ten3f orgT2(1.6f, 1.5f, 1.4f, 1.3f, 1.2f, 1.1f);
caf::Ten3f newT = orgT1 + orgT2;
EXPECT_NEAR(2.7f, newT[caf::Ten3f::SXX], 1e-4);
EXPECT_NEAR(2.7f, newT[caf::Ten3f::SYY], 1e-4);
EXPECT_NEAR(2.7f, newT[caf::Ten3f::SZZ], 1e-4);
EXPECT_NEAR(2.7f, newT[caf::Ten3f::SXY], 1e-4);
EXPECT_NEAR(2.7f, newT[caf::Ten3f::SZX], 1e-4);
EXPECT_NEAR(2.7f, newT[caf::Ten3f::SYZ], 1e-4);
newT = newT*0.5;
EXPECT_NEAR(1.35f, newT[caf::Ten3f::SXX], 1e-4);
EXPECT_NEAR(1.35f, newT[caf::Ten3f::SYY], 1e-4);
EXPECT_NEAR(1.35f, newT[caf::Ten3f::SZZ], 1e-4);
EXPECT_NEAR(1.35f, newT[caf::Ten3f::SXY], 1e-4);
EXPECT_NEAR(1.35f, newT[caf::Ten3f::SZX], 1e-4);
EXPECT_NEAR(1.35f, newT[caf::Ten3f::SYZ], 1e-4);
}