Merge pull request #13029 from KratosMultiphysics/thermal-dem-tests

[ThermalDEM] Added new tests
KratosMultiphysics · Jan 23, 2025 · ec95428 · ec95428
2 parents 3be55ed + e9c0dd7
commit ec95428
Show file tree

Hide file tree

Showing 237 changed files with 30,976 additions and 391 deletions.
diff --git a/applications/ThermalDEMApplication/README.md b/applications/ThermalDEMApplication/README.md
@@ -95,7 +95,7 @@ Add **thermal settings** with desired options:
 		"nusselt_correlation"            : "sphere_hanz_marshall" or "sphere_whitaker" or "sphere_gunn" or "sphere_li_mason",
 		"radiation_model"                : "continuum_zhou" or "continuum_krause",
 		"heat_generation_model"          : ["sliding_friction","rolling_friction","contact_damping"],
-		"adjusted_contact_model"         : "zhou" or "lu" or "morris",
+		"adjusted_contact_model"         : "zhou" or "lu" or "morris_area" or "morris_area_time" or "rangel_area" or "rangel_area_time",
 		"voronoi_method"                 : "tesselation" or "porosity",
 		"porosity_method"                : "global" or "average_convex_hull" or "average_alpha_shape",
 		"min_conduction_distance"        : 0.0000000275,

diff --git a/...ions/ThermalDEMApplication/custom_constitutive/conduction/direct_conduction_collision.cpp b/...ions/ThermalDEMApplication/custom_constitutive/conduction/direct_conduction_collision.cpp
@@ -54,7 +54,13 @@ namespace Kratos {
 
       const double C_coeff = 0.435 * (sqrt(C2 * C2 - 4.0 * C1 * (C3 - Fo)) - C2) / C1;
 
-      return C_coeff * Globals::Pi * Rc_max * Rc_max * pow(col_time_max,-0.5) * temp_grad / (pow(b1,-0.5) + pow(b2,-0.5));
+      if (!std::isnan(C_coeff)) {
+        return C_coeff * Globals::Pi * Rc_max * Rc_max * pow(col_time_max,-0.5) * temp_grad / (pow(b1,-0.5) + pow(b2,-0.5));
+      }
+      else {
+        KRATOS_WARNING("Collisional Heat Conduction") << "Multiplying coefficient in NaN (possible high Fourier number). Assuming 0.0..." << std::endl;
+        return 0.0;
+      }
     }
     else {
       // Assumption: Use simple BOB model for static contact

diff --git a/applications/ThermalDEMApplication/custom_elements/thermal_spheric_particle.cpp b/applications/ThermalDEMApplication/custom_elements/thermal_spheric_particle.cpp
@@ -821,8 +821,8 @@ namespace Kratos
     KRATOS_TRY
 
     // ATTENTION: Assumption: Original model was not assumed real Young modulus for col_time_max and Rc_max!
-    const double col_time_max = ComputeMaxCollisionTimeReal();
-    const double Rc_max       = ComputeMaxContactRadiusReal();
+    const double col_time_max = ComputeMaxCollisionTime();
+    const double Rc_max       = ComputeMaxContactRadius();
 
     if (Rc_max > 0.0)
       return GetParticleConductivity() * col_time_max / (GetParticleDensity() * GetParticleHeatCapacity() * Rc_max * Rc_max);

diff --git a/applications/ThermalDEMApplication/custom_utilities/tesselation_utilities_2d.cpp b/applications/ThermalDEMApplication/custom_utilities/tesselation_utilities_2d.cpp
@@ -249,7 +249,12 @@ namespace Kratos {
     }
 
     // Set new average porosity
-    r_process_info[AVERAGE_POROSITY] = 1.0 - particle_area / total_area;
+    double average_porosity = 1.0 - particle_area / total_area;
+    if (average_porosity < 0.0) {
+      KRATOS_WARNING("Average Porosity Calculation") << "Porosity is negative. Assuming 0.0..." << std::endl;
+      average_porosity = 0.0;
+    }
+    r_process_info[AVERAGE_POROSITY] = average_porosity;
   }
 
   //------------------------------------------------------------------------------------------------------------

diff --git a/applications/ThermalDEMApplication/custom_utilities/tesselation_utilities_3d.cpp b/applications/ThermalDEMApplication/custom_utilities/tesselation_utilities_3d.cpp
@@ -272,7 +272,12 @@ namespace Kratos {
     }
 
     // Set new average porosity
-    r_process_info[AVERAGE_POROSITY] = 1.0 - particle_volume / total_volume;
+    double average_porosity = 1.0 - particle_volume / total_volume;
+    if (average_porosity < 0.0) {
+      KRATOS_WARNING("Average Porosity Calculation") << "Porosity is negative. Assuming 0.0..." << std::endl;
+      average_porosity = 0.0;
+    }
+    r_process_info[AVERAGE_POROSITY] = average_porosity;
   }
 
   //------------------------------------------------------------------------------------------------------------

diff --git a/applications/ThermalDEMApplication/tests/NightTests.py b/applications/ThermalDEMApplication/tests/NightTests.py
diff --git a/applications/ThermalDEMApplication/tests/SmallTests.py b/applications/ThermalDEMApplication/tests/SmallTests.py
diff --git a/applications/ThermalDEMApplication/tests/TestFactory.py b/applications/ThermalDEMApplication/tests/TestFactory.py
diff --git a/applications/ThermalDEMApplication/tests/Test_SphereSphere_Touch/MaterialsDEM.json b/applications/ThermalDEMApplication/tests/Test_SphereSphere_Touch/MaterialsDEM.json
diff --git a/applications/ThermalDEMApplication/tests/Test_SphereSphere_Touch/ProjectParameters_1.json b/applications/ThermalDEMApplication/tests/Test_SphereSphere_Touch/ProjectParameters_1.json