Skip to content

Commit 8e5a2b1

Browse files
committed
renamed GetUndrainedYoungsModulus to CalculateUndrainedYoungsModulus
1 parent f5c51ba commit 8e5a2b1

5 files changed

Lines changed: 15 additions & 14 deletions

File tree

applications/GeoMechanicsApplication/custom_constitutive/plane_strain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Matrix PlaneStrain::CalculateElasticConstitutiveTensor(const Properties& rProper
2424
constexpr auto undrained = false;
2525
const auto nu = undrained ? ConstitutiveLawUtilities::GetUndrainedPoissonsRatio(rProperties)
2626
: rProperties[POISSON_RATIO];
27-
const auto E = undrained ? ConstitutiveLawUtilities::GetUndrainedYoungsModulus(rProperties, nu)
27+
const auto E = undrained ? ConstitutiveLawUtilities::CalculateUndrainedYoungsModulus(rProperties, nu)
2828
: rProperties[YOUNG_MODULUS];
2929

3030
return ConstitutiveLawUtilities::MakeContinuumConstitutiveTensor(

applications/GeoMechanicsApplication/custom_constitutive/three_dimensional.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Matrix ThreeDimensional::CalculateElasticConstitutiveTensor(const Properties& rP
2525
constexpr auto undrained = false;
2626
const auto nu = undrained ? ConstitutiveLawUtilities::GetUndrainedPoissonsRatio(rProperties)
2727
: rProperties[POISSON_RATIO];
28-
const auto E = undrained ? ConstitutiveLawUtilities::GetUndrainedYoungsModulus(rProperties, nu)
28+
const auto E = undrained ? ConstitutiveLawUtilities::CalculateUndrainedYoungsModulus(rProperties, nu)
2929
: rProperties[YOUNG_MODULUS];
3030

3131
return ConstitutiveLawUtilities::MakeContinuumConstitutiveTensor(

applications/GeoMechanicsApplication/custom_utilities/constitutive_law_utilities.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ double ConstitutiveLawUtilities::CalculateK0NCFromFrictionAngleInRadians(double
185185
return 1.0 - std::sin(FrictionAngleInRadians);
186186
}
187187

188-
double ConstitutiveLawUtilities::GetUndrainedYoungsModulus(const Properties& rProperties, double UndrainedPoissonsRatio)
188+
double ConstitutiveLawUtilities::CalculateUndrainedYoungsModulus(const Properties& rProperties, double UndrainedPoissonsRatio)
189189
{
190190
const auto denominator = 1.0 + rProperties[POISSON_RATIO];
191191
KRATOS_ERROR_IF(denominator <= std::numeric_limits<double>::epsilon())

applications/GeoMechanicsApplication/custom_utilities/constitutive_law_utilities.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) ConstitutiveLawUtilities
5151

5252
[[nodiscard]] static double CalculateK0NCFromFrictionAngleInRadians(double FrictionAngleInRadians);
5353

54-
[[nodiscard]] static double GetUndrainedYoungsModulus(const Properties& rProperties,
55-
double UndrainedPoissonsRatio);
54+
[[nodiscard]] static double CalculateUndrainedYoungsModulus(const Properties& rProperties,
55+
double UndrainedPoissonsRatio);
5656

5757
[[nodiscard]] static double GetUndrainedPoissonsRatio(const Properties& rProperties);
5858

applications/GeoMechanicsApplication/tests/cpp_tests/custom_utilities/test_constitutive_law_utilities.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtilities_ValidateFrictionAngle, Kratos
255255
KRATOS_EXPECT_EXCEPTION_IS_THROWN(ConstitutiveLawUtilities::ValidateFrictionAngle(properties, element_id), "Properties ( 0) of element ( 1): INDEX_OF_UMAT_PHI_PARAMETER (3) is not in range [1, size of UMAT_PARAMETERS].");
256256
}
257257

258-
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedYoungsModulusGivesUndrainedYoungsModulus,
258+
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_CalculateUndrainedYoungsModulus_ReturnsExpectedValue,
259259
KratosGeoMechanicsFastSuiteWithoutKernel)
260260
{
261261
// Arrange
@@ -265,13 +265,13 @@ KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedYoungsModulusGiv
265265

266266
// Act
267267
const auto undrained_youngs_modulus =
268-
ConstitutiveLawUtilities::GetUndrainedYoungsModulus(properties, 0.4);
268+
ConstitutiveLawUtilities::CalculateUndrainedYoungsModulus(properties, 0.4);
269269

270270
// Assert
271271
KRATOS_EXPECT_EQ(undrained_youngs_modulus, 7.0 / 6.0);
272272
}
273273

274-
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedYoungsModulusThrowsError,
274+
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_CalculateUndrainedYoungsModulus_ThrowsError,
275275
KratosGeoMechanicsFastSuiteWithoutKernel)
276276
{
277277
// Arrange
@@ -280,11 +280,12 @@ KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedYoungsModulusThr
280280
properties.SetValue(POISSON_RATIO, -2.0);
281281

282282
// Act & Assert
283-
KRATOS_EXPECT_EXCEPTION_IS_THROWN((void)ConstitutiveLawUtilities::GetUndrainedYoungsModulus(properties, 0.4),
284-
"POISSON_RATIO (-2) <= -1.");
283+
KRATOS_EXPECT_EXCEPTION_IS_THROWN(
284+
(void)ConstitutiveLawUtilities::CalculateUndrainedYoungsModulus(properties, 0.4),
285+
"POISSON_RATIO (-2) <= -1.");
285286
}
286287

287-
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetSkemptonBGivesSkemptonB, KratosGeoMechanicsFastSuiteWithoutKernel)
288+
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetSkemptonB_ReturnsExpectedValue, KratosGeoMechanicsFastSuiteWithoutKernel)
288289
{
289290
// Arrange
290291
Properties properties;
@@ -330,7 +331,7 @@ KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetSkemptonBGivesSkemptonB,
330331
KRATOS_EXPECT_EQ(skempton_b, 0.8);
331332
}
332333

333-
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetSkemptonBThrowsError, KratosGeoMechanicsFastSuiteWithoutKernel)
334+
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetSkemptonB_ThrowsError, KratosGeoMechanicsFastSuiteWithoutKernel)
334335
{
335336
// Arrange
336337
Properties properties;
@@ -360,7 +361,7 @@ KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetSkemptonBThrowsError, Kra
360361
"Calculated Skempton B (-0.0010011) is out of range [0,1].");
361362
}
362363

363-
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedPoissonsRatioGivesUndrainedPoissonsRatio,
364+
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedPoissonsRatio_ReturnsExpectedValue,
364365
KratosGeoMechanicsFastSuiteWithoutKernel)
365366
{
366367
// Arrange
@@ -424,7 +425,7 @@ KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedPoissonsRatioGiv
424425
KRATOS_EXPECT_NEAR(undrained_poissons_ratio, 0.495, Defaults::absolute_tolerance);
425426
}
426427

427-
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedPoissonsRatioThrowsError,
428+
KRATOS_TEST_CASE_IN_SUITE(ConstitutiveLawUtitlities_GetUndrainedPoissonsRatio_ThrowsError,
428429
KratosGeoMechanicsFastSuiteWithoutKernel)
429430
{
430431
// Arrange

0 commit comments

Comments
 (0)