Modified Setup_Geometry

Author: adbayonao

src/Setup_geometry.jl

@@ -822,12 +822,12 @@ function add_plate!(Phase, Temp, Grid::AbstractGeneralGrid;
     ind = zeros(Bool, size(X))
     ind_slice = zeros(Bool, size(X[:, :, 1]))
 
-    for k = 1:size(Z)[3]
-        if Z[1, 1, k] >= zlim_[1] && Z[1, 1, k] <= zlim_[2]
+    for k = 1:size(Z, 3)
+        if zlim_[1] <= Z[1, 1, k] <= zlim_[2]
             inpolygon!(ind_slice, xlim_, ylim_, X[:, :, k], Y[:, :, k])
-            ind[:, :, k] = ind_slice
+            @views ind[:, :, k] = ind_slice
         else
-            ind[:, :, k] = zeros(size(X[:, :, 1]))
+            @views ind[:, :, k] = zeros(size(X[:, :, 1]))
         end
     end
 
@@ -1312,7 +1312,7 @@ function compute_thermal_structure(Temp, X, Y, Z, Phase, s::SpreadingRateTemp, s
         Distance = perpendicular_distance_to_segment(px, py, x1, y1, x2, y2)
 
         # Calculate thermal age
-        ThermalAge = abs(Distance * 1e3 * 1e2) / SpreadingVel + AgeRidge * 1e6  # Thermal age in years
+        ThermalAge = abs(Distance * 1e5) / SpreadingVel + AgeRidge * 1e6  # Thermal age in years
         if ThermalAge > maxAge * 1e6
             ThermalAge = maxAge * 1e6
         end
@@ -1342,11 +1342,7 @@ end
 # Function to determine the side of a point with respect to a line (adjusted for segment direction)
 function side_of_line(x, y, x1, y1, x2, y2, direction)
     side = (x2 - x1) * (y - y1) - (y2 - y1) * (x - x1)
-    if direction == :left
-        return side > 0
-    else
-        return side < 0
-    end
+    direction == :left ? side > 0 : side < 0
 end
 
 # Function to determine in which region a point lies (based on delimiters)
@@ -1356,11 +1352,7 @@ function determine_region(px, py, delimiters, segments)
         x2, y2 = delimiters[i][2]
 
         # Determine the direction of the segments
-        if x2 < x1
-            direction = :left  # Shift left
-        else
-            direction = :right  # Shift to the right
-        end
+        direction = x2 < x1 ? :left : :right
 
         # Check the side of the line considering the direction
         if side_of_line(px, py, x1, y1, x2, y2, direction)

test/test_plate.jl

@@ -38,10 +38,10 @@ using Test
 
     @test minimum(Temp) >= 0.0  # Minimum temperature
     @test maximum(Temp) <= 1350.0  # Maximum temperature
-    @test all(Temp .>= 0.0)  # Ensure no negative temperatures
-    @test all(Temp .<= 1350.0)  # Ensure no temperatures above max
+    @test all(≥(0),    Temp) # Ensure no negative temperatures
+    @test all(≤(1350), Temp) # Ensure no temperatures above max
 
     # Check if phases are correctly assigned in expected regions
-    @test Phases[1, 1, 1] == 2  # Example: Verify a point's phase
-    @test Phases[end, end, end] == 2  # Example: Verify another point's phase
+    @test first(Phases) == 2  # Example: Verify a point's phase
+    @test last(Phases)  == 2  # Example: Verify another point's phase
 end