Geo/line piping element #12770
Merged
Geo/line piping element #12770
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…not compile, so bad )
…Step. Reformatted. Some sonar cloud warnings resolved.
rfaasse
reviewed
Oct 21, 2024
Comment on lines
203
to
223
| BoundedMatrix<double, TNumNodes, TNumNodes> CalculatePermeabilityMatrix( | ||
| const GeometryType::ShapeFunctionsGradientsType& rShapeFunctionGradients, | ||
| const Vector& rIntegrationCoefficients) const | ||
| { | ||
| RetentionLaw::Parameters RetentionParameters(GetProperties()); | ||
| const auto& r_properties = GetProperties(); | ||
| const double dynamic_viscosity_inverse = 1.0 / r_properties[DYNAMIC_VISCOSITY]; | ||
|
|
||
| auto constitutive_matrix = FillPermeabilityMatrix(r_properties[PIPE_HEIGHT]); | ||
|
|
||
| auto result = BoundedMatrix<double, TNumNodes, TNumNodes>{ZeroMatrix{TNumNodes, TNumNodes}}; | ||
| for (unsigned int integration_point_index = 0; | ||
| integration_point_index < GetGeometry().IntegrationPointsNumber(GetIntegrationMethod()); | ||
| ++integration_point_index) { | ||
| result += GeoTransportEquationUtilities::CalculatePermeabilityMatrix<TDim, TNumNodes>( | ||
| rShapeFunctionGradients[integration_point_index], dynamic_viscosity_inverse, | ||
| constitutive_matrix, 1.0, rIntegrationCoefficients[integration_point_index]); | ||
| } | ||
|
|
||
| return result; | ||
| } |
There was a problem hiding this comment.
In the experiment branch with calculators (see #12763), the calculation of the permeability matrix is delegated to these new calculators. Here, the calculation is of course slightly different. In the longer term, should we have a version of the permeability calculator that does it slightly different for piping vs 'normal', or should we handle that differently?
Looping @avdg81
avdg81
reviewed
Oct 21, 2024
...echanicsApplication/tests/cpp_tests/custom_elements/test_geo_steady_state_piping_element.cpp
Outdated
Show resolved
Hide resolved
...echanicsApplication/tests/cpp_tests/custom_elements/test_geo_steady_state_piping_element.cpp
Outdated
Show resolved
Hide resolved
...echanicsApplication/tests/cpp_tests/custom_elements/test_geo_steady_state_piping_element.cpp
Outdated
Show resolved
Hide resolved
Comment on lines
63
to
66
| PointerVector<Node> nodes; | ||
| nodes.push_back(r_model_part.CreateNewNode(0, 0.0, 0.0, 0.0)); | ||
| nodes.push_back(r_model_part.CreateNewNode(1, 1.0, 0.0, 0.0)); | ||
| const auto p_geometry = std::make_shared<Line2D2<Node>>(nodes); |
There was a problem hiding this comment.
Wouldn't it be possible to reuse the first helper function here (i.e. CreateNodes)...? I see there is a minor difference: here you explicitly request the model part to create new nodes, whereas the helper function creates "free" nodes. Not sure whether that is a problem.
Suggested change
| PointerVector<Node> nodes; | |
| nodes.push_back(r_model_part.CreateNewNode(0, 0.0, 0.0, 0.0)); | |
| nodes.push_back(r_model_part.CreateNewNode(1, 1.0, 0.0, 0.0)); | |
| const auto p_geometry = std::make_shared<Line2D2<Node>>(nodes); | |
| const auto p_geometry = std::make_shared<Line2D2<Node>>(CreateNodes()); |
Comment on lines
75
to
78
| PointerVector<Node> nodes; | ||
| nodes.push_back(r_model_part.CreateNewNode(1, 0.0, 0.0, 0.0)); | ||
| nodes.push_back(r_model_part.CreateNewNode(2, 1.0, 0.0, 0.0)); | ||
| const auto p_geometry = std::make_shared<Line2D2<Node>>(nodes); |
There was a problem hiding this comment.
If you believe that the previous suggestion makes sense, then you may want to apply it here, too:
Suggested change
| PointerVector<Node> nodes; | |
| nodes.push_back(r_model_part.CreateNewNode(1, 0.0, 0.0, 0.0)); | |
| nodes.push_back(r_model_part.CreateNewNode(2, 1.0, 0.0, 0.0)); | |
| const auto p_geometry = std::make_shared<Line2D2<Node>>(nodes); | |
| const auto p_geometry = std::make_shared<Line2D2<Node>>(CreateNodes()); |
applications/GeoMechanicsApplication/custom_elements/geo_steady_state_Pw_piping_element.h
Outdated
Show resolved
Hide resolved
applications/GeoMechanicsApplication/custom_elements/geo_steady_state_Pw_piping_element.h
Outdated
Show resolved
Hide resolved
applications/GeoMechanicsApplication/custom_elements/geo_steady_state_Pw_piping_element.h
Outdated
Show resolved
Hide resolved
applications/GeoMechanicsApplication/custom_elements/geo_steady_state_Pw_piping_element.h
Outdated
Show resolved
Hide resolved
applications/GeoMechanicsApplication/custom_elements/geo_steady_state_Pw_piping_element.h
Outdated
Show resolved
Hide resolved
rfaasse
reviewed
Oct 22, 2024
...echanicsApplication/tests/cpp_tests/custom_elements/test_geo_steady_state_piping_element.cpp
Outdated
Show resolved
Hide resolved
rfaasse
reviewed
Oct 22, 2024
applications/GeoMechanicsApplication/custom_elements/geo_steady_state_Pw_piping_element.h
Show resolved
Hide resolved
…for pipe_height function ( review comments by Anne )
avdg81
approved these changes
Oct 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝 Description
Based on the line Pw element a minimal line piping element is created.
Todo