Geo/check number of tables phreatic multi line (#12689)

* Make sure the number of attached tables matches the number of points for phreatic multiline. * Added test with matching number of tables and coordinates.
KratosMultiphysics · Dec 13, 2024 · 9817513 · 9817513
1 parent 37890d1
commit 9817513
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 10 deletions.
diff --git a/...anicsApplication/custom_processes/apply_constant_phreatic_multi_line_pressure_process.cpp b/...anicsApplication/custom_processes/apply_constant_phreatic_multi_line_pressure_process.cpp
@@ -51,12 +51,12 @@ void ApplyConstantPhreaticMultiLinePressureProcess::InitializeParameters(Paramet
                 "is_seepage": false,
                 "gravity_direction": 1,
                 "out_of_plane_direction": 2,
-                "x_coordinates":           [0.0,1.0],
-                "y_coordinates":           [1.0,0.5],
-				"z_coordinates":           [0.0,0.0],
+                "x_coordinates":           [0.0, 1.0],
+                "y_coordinates":           [1.0, 0.5],
+                "z_coordinates":           [0.0, 0.0],
                 "specific_weight" : 10000.0,
                 "pressure_tension_cut_off" : 0.0,
-                "table" : [0,1]
+                "table" : [0, 0]
             }  )");
 
     // Some values are mandatory, since no meaningful default value exist. For this reason try
@@ -172,7 +172,7 @@ std::string ApplyConstantPhreaticMultiLinePressureProcess::Info() const
 
 void ApplyConstantPhreaticMultiLinePressureProcess::PrintInfo(std::ostream& rOStream) const
 {
-    rOStream << "ApplyConstantPhreaticMultiLinePressureProcess";
+    rOStream << Info();
 }
 
 const std::string& ApplyConstantPhreaticMultiLinePressureProcess::VariableName() const

diff --git a/...echanicsApplication/custom_processes/apply_phreatic_multi_line_pressure_table_process.cpp b/...echanicsApplication/custom_processes/apply_phreatic_multi_line_pressure_table_process.cpp
@@ -23,6 +23,11 @@ ApplyPhreaticMultiLinePressureTableProcess::ApplyPhreaticMultiLinePressureTableP
 {
     KRATOS_TRY
 
+    KRATOS_ERROR_IF(HorizontalDirectionCoordinates().size() != rParameters["table"].GetVector().size())
+        << "Got " << HorizontalDirectionCoordinates().size() << " coordinates and "
+        << rParameters["table"].GetVector().size() << " table references. The number of coordinates "
+        << "and table references should be equal." << std::endl;
+
     for (auto value : rParameters["table"].GetVector()) {
         const auto TableId = static_cast<unsigned int>(value);
         if (TableId > 0) {
@@ -80,7 +85,7 @@ std::string ApplyPhreaticMultiLinePressureTableProcess::Info() const
 
 void ApplyPhreaticMultiLinePressureTableProcess::PrintInfo(std::ostream& rOStream) const
 {
-    rOStream << "ApplyPhreaticMultiLinePressureTableProcess";
+    rOStream << Info();
 }
 
 } // namespace Kratos
diff --git a/...sApplication/tests/cpp_tests/test_apply_constant_phreatic_multi_line_pressure_process.cpp b/...sApplication/tests/cpp_tests/test_apply_constant_phreatic_multi_line_pressure_process.cpp
@@ -136,7 +136,7 @@ KRATOS_TEST_CASE_IN_SUITE(ApplyConstantPhreaticMultiLinePressureProcessDoesNotTh
         r_model_part, test_parameters))
 
     test_parameters.RemoveValue("x_coordinates");
-    test_parameters.AddVector("x_coordinates", ScalarVector{5, 1.0});
+    test_parameters.AddVector("x_coordinates", ScalarVector{2, 1.0});
 
     KRATOS_EXPECT_TRUE(CanCreateInstanceOfApplyConstantPhreaticMultiLinePressureProcessWithoutFailure(
         r_model_part, test_parameters))
@@ -171,6 +171,7 @@ KRATOS_TEST_CASE_IN_SUITE(ApplyConstantPhreaticMultilinePressureProcess_AppliesC
                 "x_coordinates": [0.0, 1.0, 2.0],
                 "y_coordinates": [1.0, 1.0, 1.0],
                 "z_coordinates": [0.0, 0.0, 0.0],
+                "table": [0, 0, 0],
                 "gravity_direction": 1
             }  )"};
 

diff --git a/...nicsApplication/tests/cpp_tests/test_apply_phreatic_multi_line_pressure_table_process.cpp b/...nicsApplication/tests/cpp_tests/test_apply_phreatic_multi_line_pressure_table_process.cpp
@@ -0,0 +1,80 @@
+// KRATOS___
+//     //   ) )
+//    //         ___      ___
+//   //  ____  //___) ) //   ) )
+//  //    / / //       //   / /
+// ((____/ / ((____   ((___/ /  MECHANICS
+//
+//  License:         geo_mechanics_application/license.txt
+//
+//  Main authors:    Wijtze Pieter Kikstra
+//
+#include "containers/model.h"
+#include "custom_processes/apply_phreatic_multi_line_pressure_table_process.h"
+#include "geo_mechanics_fast_suite.h"
+#include "includes/checks.h"
+
+using namespace Kratos;
+
+namespace
+{
+
+bool CanCreateInstanceOfApplyPhreaticMultiLinePressureTableProcessWithoutFailure(ModelPart& rModelPart,
+                                                                                 const Parameters& rProcessParameters)
+{
+    try {
+        ApplyPhreaticMultiLinePressureTableProcess{rModelPart, rProcessParameters};
+    } catch (const Exception&) {
+        return false;
+    }
+
+    return true;
+}
+
+} // namespace
+
+namespace Kratos::Testing
+{
+
+KRATOS_TEST_CASE_IN_SUITE(ApplyPhreaticMultiLinePressureTableProcessThrowsWhenTableLengthDoesNotMatchCoordinates,
+                          KratosGeoMechanicsFastSuiteWithoutKernel)
+{
+    auto  model           = Model{};
+    auto& r_model_part    = model.CreateModelPart("foo");
+    auto  test_parameters = Parameters{R"(
+            {
+                "model_part_name": "foo",
+                "variable_name": "WATER_PRESSURE",
+                "x_coordinates": [0.0, 1.0],
+                "y_coordinates": [0.0, 1.0],
+                "z_coordinates": [0.0, 0.0],
+                "gravity_direction": 1,
+                "out_of_plane_direction": 2,
+                "table": [1, 2, 3, 4]
+            }  )"};
+
+    KRATOS_EXPECT_EXCEPTION_IS_THROWN((ApplyPhreaticMultiLinePressureTableProcess{r_model_part, test_parameters}), "Got 2 coordinates and 4 table references. The number of coordinates and table references should be equal.")
+}
+
+KRATOS_TEST_CASE_IN_SUITE(ApplyPhreaticMultiLinePressureTableProcessDoesNotThrowWhenTableLengthMatchesCoordinates,
+                          KratosGeoMechanicsFastSuiteWithoutKernel)
+{
+    auto  model           = Model{};
+    auto& r_model_part    = model.CreateModelPart("foo");
+    auto  test_parameters = Parameters{R"(
+            {
+                "model_part_name": "foo",
+                "variable_name": "WATER_PRESSURE",
+                "x_coordinates": [0.0, 1.0, 2.0],
+                "y_coordinates": [0.0, 1.0, 2.0],
+                "z_coordinates": [0.0, 0.0, 0.0],
+                "gravity_direction": 1,
+                "out_of_plane_direction": 2,
+                "table": [0, 0, 3]
+            }  )"};
+
+    KRATOS_EXPECT_TRUE(CanCreateInstanceOfApplyPhreaticMultiLinePressureTableProcessWithoutFailure(
+        r_model_part, test_parameters))
+}
+
+} // namespace Kratos::Testing
diff --git a/...csApplication/tests/test_inclined_phreatic_multi_line_3_points.gid/ProjectParameters.json b/...csApplication/tests/test_inclined_phreatic_multi_line_3_points.gid/ProjectParameters.json
@@ -148,14 +148,13 @@
             "model_part_name":      "PorousDomain.Fluid_Pressure-auto-1",
             "variable_name":        "WATER_PRESSURE",
             "is_fixed":             true,
-            "value":                0.0,
-            "table":                [0, 0, 0],
             "fluid_pressure_type": "Phreatic_Multi_Line",
             "gravity_direction":    1,
             "out_of_plane_direction":    2,
             "x_coordinates" :    [0.0,0.5,1.0],
             "y_coordinates":    [1.0,0.9,0.5],
-			"z_coordinates":    [0.0,0.0,0.0], 
+            "z_coordinates":    [0.0,0.0,0.0],
+            "table":                [0, 0, 0],
             "specific_weight":      10000.0
         }
     }],