[GeoMechanicsApplication] Add the missing conditions to Geomechanics Application for 2D #11625

mnabideltares · 2023-09-27T16:32:09Z

📝 Description
The conditions are not completely added to the GeoMechanics Application. For example, PwCondition is defined on 2 noded element (in 2D) but it is not extended to 3 noded element. There are also missing higher order condition elements in 3D.
Here we fix the 2D conditions. The 3D conditions will be done in a seperate issue in order to keep this commit managable

🆕 Changelog

Added missing 2D conditions
Modified the functions to make them generic for n-th order line elements/conditions
Cleaned up some parts

** Acceptance

All existing test cases have to pass

…odified. CalculateIntegrationCoefficient's in UPwFaceLoadCondition are squashed to be a single function

UPwNormalFaceLoadCondition is modified

#pragma once is added

WPK4FEM

Codewise this is quite an improvement, the formulas have been written down using vector multiplications i.s.o. writing down component multiplication and summation.

However, new conditions have been added without adding tests for the new conditions. These have to be made.

Further, run clang format on the changed code.

# Conflicts: # applications/GeoMechanicsApplication/custom_conditions/Pw_condition.cpp

…on-working conditions

markelov208

Mohamed, just a small comment on READMe file but it is not blocking.

applications/GeoMechanicsApplication/tests/test_conditions/README.md

minor

Minor fixes

WPK4FEM

Thank you Mohamed and Gennady for all improvements.
Some small things left.

...ations/GeoMechanicsApplication/tests/test_conditions/documentation_data/load_flux_domain.svg

applications/GeoMechanicsApplication/tests/test_conditions/README.md

...tests/test_conditions/test_AxisymmetricUPwNormalFaceLoadCondition2D4N/ProjectParameters.json

...tests/test_conditions/test_AxisymmetricUPwNormalFaceLoadCondition2D5N/ProjectParameters.json

...ation/tests/test_conditions/test_LineNormalLoadDiffOrderCondition2D3N/ProjectParameters.json

...ation/tests/test_conditions/test_LineNormalLoadDiffOrderCondition2D4N/ProjectParameters.json

...ation/tests/test_conditions/test_LineNormalLoadDiffOrderCondition2D5N/ProjectParameters.json

...Application/tests/test_conditions/test_UPwNormalFaceLoadCondition2D4N/ProjectParameters.json

...Application/tests/test_conditions/test_UPwNormalFaceLoadCondition2D3N/ProjectParameters.json

...Application/tests/test_conditions/test_UPwNormalFaceLoadCondition2D2N/ProjectParameters.json

…adme.md

…com/KratosMultiphysics/Kratos into geo/11616-add-missing-conditions-2d

This keyword is needed, the code gives error if this keyword is not found

...ations/GeoMechanicsApplication/tests/test_conditions/documentation_data/load_flux_domain.svg

...tests/test_conditions/test_AxisymmetricUPwNormalFaceLoadCondition2D4N/ProjectParameters.json

rfaasse

Thank you for your hard work in incorporating these changes @mnabideltares and @markelov208! This PR improves the code quality a lot!

There are a couple of minor suggestions and questions left from my side and there is a (very minor) merge conflict with master that still needs to be fixed (it's about added includes that should just both be included), but I think we're quite close now to getting this done!

applications/GeoMechanicsApplication/tests/test_conditions.py

applications/GeoMechanicsApplication/tests/test_conditions/README.md

rfaasse · 2024-03-14T08:06:55Z

applications/GeoMechanicsApplication/tests/test_GeoMechanicsApplication.py

@@ -80,7 +81,8 @@ def AssembleTestSuites():
                        KratosGeoMechanicsChangingWaterLevelTests,
                        KratosGeoMechanicsStrainMeasureTests,
                        KratosGeoMechanicsSetMultipleMovingLoadProcessTests,
-                        KratosGeoMechanicsRotationWithMovingLoadTests
+                        KratosGeoMechanicsRotationWithMovingLoadTests,
+                        KratosGeoMechanicsConditionTests


I'm not sure, how close we already are to the limit, do you know @avdg81?

applications/GeoMechanicsApplication/custom_conditions/U_Pw_face_load_interface_condition.cpp

...s/GeoMechanicsApplication/custom_conditions/axisymmetric_U_Pw_normal_face_load_condition.cpp

applications/GeoMechanicsApplication/geo_mechanics_application.h

applications/GeoMechanicsApplication/tests/test_conditions.py

… condition

…ng-conditions-2d

WPK4FEM

My stack of remarks has been processed.

rfaasse

Thank you for your hard work, looks good to me!

mnabideltares added 6 commits September 27, 2023 14:10

mUPwFaceLoadCondition2D3N, 4N and 5N were previously added, but now m…

d9df948

…odified. CalculateIntegrationCoefficient's in UPwFaceLoadCondition are squashed to be a single function

mUPwNormalFaceLoadCondition2D3N, 4N, 5N are added

8f63089

UPwNormalFaceLoadCondition is modified

UPwNormalFluxCondition2D3N, 4N and 5N are added

943faa3

PwNormalFluxCondition2D3N, 4N, and 5N are added

6b38383

clean up

a58cebc

#pragma once is added

Extra cleanup

1749146

mnabideltares linked an issue Sep 27, 2023 that may be closed by this pull request

[GeoMechanicsApplication] Add the missing conditions to Geomechanics Application for 2D #11616

Closed

4 tasks

mnabideltares self-assigned this Sep 27, 2023

mnabideltares added GeoMechanics Issues related to the GeoMechanicsApplication Feature labels Sep 27, 2023

mnabideltares requested review from avdg81, rfaasse, indigocoral, WPK4FEM and mcgicjn2 September 27, 2023 16:37

WPK4FEM requested changes Feb 26, 2024

View reviewed changes

mnabideltares added 4 commits February 26, 2024 17:26

Merge branch 'master' into geo/11616-add-missing-conditions-2d

1ddac32

# Conflicts: # applications/GeoMechanicsApplication/custom_conditions/Pw_condition.cpp

Added extra conditions

1430ea4

Added test cases for conditions

2bed4a3

Added extra test cases, Fixed Gauss points for Axisymmetric, Remove n…

fa18327

…on-working conditions

mnabideltares requested review from WPK4FEM and avdg81 and removed request for mcgicjn2, avdg81, rfaasse, indigocoral and WPK4FEM March 11, 2024 13:01

mnabideltares added 4 commits March 13, 2024 15:42

Revision 3

2dbbd4b

Readme.md revision 1

2ffc4d7

Readme.md revision 2

404ca3a

modified test cases, removed gravity, changed pressure bc to uniform

297ac61

mnabideltares requested review from rfaasse, WPK4FEM and markelov208 March 13, 2024 15:27

markelov208 reviewed Mar 13, 2024

View reviewed changes

applications/GeoMechanicsApplication/tests/test_conditions/README.md Outdated Show resolved Hide resolved

mnabideltares added 2 commits March 13, 2024 17:14

Update README.md

16a8544

minor

Update README.md

5e18efc

Minor fixes

WPK4FEM reviewed Mar 13, 2024

View reviewed changes

mnabideltares added 4 commits March 13, 2024 18:06

modified test cases based on reviewers comment, modified figure in Re…

b1327e6

…adme.md

Merge branch 'geo/11616-add-missing-conditions-2d' of https://github.…

33f4faf

…com/KratosMultiphysics/Kratos into geo/11616-add-missing-conditions-2d

"fluid_pressure_type": "Uniform", is added back to NORMAL_CONTACT_STRESS

5cc64ba

This keyword is needed, the code gives error if this keyword is not found

Readme is modified

cb5edcc

WPK4FEM reviewed Mar 14, 2024

View reviewed changes

...ations/GeoMechanicsApplication/tests/test_conditions/documentation_data/load_flux_domain.svg Outdated Show resolved Hide resolved

...tests/test_conditions/test_AxisymmetricUPwNormalFaceLoadCondition2D4N/ProjectParameters.json Show resolved Hide resolved

rfaasse reviewed Mar 14, 2024

View reviewed changes

mnabideltares and others added 5 commits March 14, 2024 13:32

Revision 4

cfd94df

Fixed grid input for 2D5N elements, fixed Gauss for 2D5N axisymmetric…

c0a8c4c

… condition

figure for Readme.md is modified

34928e3

Merge remote-tracking branch 'origin/master' into geo/11616-add-missi…

d920b4d

…ng-conditions-2d

Added missing Create member function

1a1f8da

rfaasse marked this pull request as ready for review March 15, 2024 13:33

WPK4FEM self-requested a review March 15, 2024 13:34

WPK4FEM approved these changes Mar 15, 2024

View reviewed changes

rfaasse approved these changes Mar 15, 2024

View reviewed changes

mnabideltares merged commit a82f1b0 into master Mar 15, 2024
15 of 16 checks passed

mnabideltares deleted the geo/11616-add-missing-conditions-2d branch March 15, 2024 14:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[GeoMechanicsApplication] Add the missing conditions to Geomechanics Application for 2D #11625

[GeoMechanicsApplication] Add the missing conditions to Geomechanics Application for 2D #11625

mnabideltares commented Sep 27, 2023 •

edited

Loading

WPK4FEM left a comment

markelov208 left a comment

WPK4FEM left a comment

rfaasse left a comment

rfaasse Mar 14, 2024

WPK4FEM left a comment

rfaasse left a comment

[GeoMechanicsApplication] Add the missing conditions to Geomechanics Application for 2D #11625

[GeoMechanicsApplication] Add the missing conditions to Geomechanics Application for 2D #11625

Conversation

mnabideltares commented Sep 27, 2023 • edited Loading

WPK4FEM left a comment

Choose a reason for hiding this comment

markelov208 left a comment

Choose a reason for hiding this comment

WPK4FEM left a comment

Choose a reason for hiding this comment

rfaasse left a comment

Choose a reason for hiding this comment

rfaasse Mar 14, 2024

Choose a reason for hiding this comment

WPK4FEM left a comment

Choose a reason for hiding this comment

rfaasse left a comment

Choose a reason for hiding this comment

mnabideltares commented Sep 27, 2023 •

edited

Loading