Fix crash if the minimum and maximum depth are the same.

GeodynamicWorldBuilder · Apr 27, 2024 · 6bd7dea · 6bd7dea
1 parent 261c22b
commit 6bd7dea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/source/world_builder/features/continental_plate_models/temperature/linear.cc b/source/world_builder/features/continental_plate_models/temperature/linear.cc
@@ -128,9 +128,9 @@ namespace WorldBuilder
                                                             this->world->specific_heat) * max_depth_local_local);
                     }
 
-                  const double new_temperature = top_temperature_local +
-                                                 (depth - min_depth_local) *
-                                                 ((bottom_temperature_local - top_temperature_local) / (max_depth_local_local - min_depth_local_local));
+                  const double new_temperature = top_temperature_local + (max_depth_local_local - min_depth_local_local < 10.0*std::numeric_limits<double>::epsilon() ? 0.0 :
+                                                                          (depth - min_depth_local) *
+                                                                          ((bottom_temperature_local - top_temperature_local) / (max_depth_local_local - min_depth_local_local)));
 
                   WBAssert(!std::isnan(new_temperature), "Temperature is not a number: " << new_temperature
                            << ", based on a temperature model with the name " << this->name);

diff --git a/source/world_builder/features/mantle_layer_models/temperature/linear.cc b/source/world_builder/features/mantle_layer_models/temperature/linear.cc
@@ -127,9 +127,9 @@ namespace WorldBuilder
 
                     }
 
-                  const double new_temperature =  top_temperature_local +
-                                                  (depth - min_depth_local_local) *
-                                                  ((bottom_temperature_local - top_temperature_local) / (max_depth_local_local - min_depth_local_local));
+                  const double new_temperature =  top_temperature_local + (max_depth_local_local - min_depth_local_local < 10.0*std::numeric_limits<double>::epsilon() ? 0.0 :
+                                                                           (depth - min_depth_local_local) *
+                                                                           ((bottom_temperature_local - top_temperature_local) / (max_depth_local_local - min_depth_local_local)));
 
                   return apply_operation(operation,temperature_,new_temperature);
                 }

diff --git a/source/world_builder/features/oceanic_plate_models/temperature/linear.cc b/source/world_builder/features/oceanic_plate_models/temperature/linear.cc
@@ -125,9 +125,9 @@ namespace WorldBuilder
                                                             this->world->specific_heat) * max_depth_local_local);
                     }
 
-                  const double new_temperature =  top_temperature_local +
-                                                  (depth - min_depth_local_local) *
-                                                  ((bottom_temperature_local - top_temperature_local) / (max_depth_local_local - min_depth_local_local));
+                  const double new_temperature =  top_temperature_local + (max_depth_local_local - min_depth_local_local < 10.0*std::numeric_limits<double>::epsilon() ? 0.0 :
+                                                                           (depth - min_depth_local_local) *
+                                                                           ((bottom_temperature_local - top_temperature_local) / (max_depth_local_local - min_depth_local_local)));
 
                   return apply_operation(operation,temperature_,new_temperature);
                 }