Test tracer conservation for TripolarGrid with and without bathymetry

Author: NoraLoose

test/test_zstar_coordinate.jl

@@ -241,32 +241,34 @@ z_stretched = MutableVerticalDiscretization(collect(-20:0))
     end
 end
 
-function make_tripolar_test_model(arch; with_wind = false)
+# Code credit:
+# https://github.com/PRONTOLab/GB-25/blob/682106b8487f94da24a64d93e86d34d560f33ffc/src/model_utils.jl#L65
+function mtn₁(λ, φ)
+    λ₁ = 70
+    φ₁ = 55
+    dφ = 5
+    return exp(-((λ - λ₁)^2 + (φ - φ₁)^2) / 2dφ^2)
+end
 
-    grid = TripolarGrid(arch; size = (20, 20, 20), z = z_stretched)
+function mtn₂(λ, φ)
+    λ₁ = 70
+    λ₂ = λ₁ + 180
+    φ₂ = 55
+    dφ = 5
+    return exp(-((λ - λ₂)^2 + (φ - φ₂)^2) / 2dφ^2)
+end
 
-    # Code credit:
-    # https://github.com/PRONTOLab/GB-25/blob/682106b8487f94da24a64d93e86d34d560f33ffc/src/model_utils.jl#L65
-    function mtn₁(λ, φ)
-        λ₁ = 70
-        φ₁ = 55
-        dφ = 5
-        return exp(-((λ - λ₁)^2 + (φ - φ₁)^2) / 2dφ^2)
-    end
+function make_tripolar_test_model(arch; with_bathymetry = true, with_wind = false)
 
-    function mtn₂(λ, φ)
-        λ₁ = 70
-        λ₂ = λ₁ + 180
-        φ₂ = 55
-        dφ = 5
-        return exp(-((λ - λ₂)^2 + (φ - φ₂)^2) / 2dφ^2)
-    end
+    grid = TripolarGrid(arch; size = (20, 20, 20), z = z_stretched)
 
-    zb = - 20
-    h  = - zb + 10
-    gaussian_islands(λ, φ) = zb + h * (mtn₁(λ, φ) + mtn₂(λ, φ))
+    if with_bathymetry
+    	zb = - 20
+    	h  = - zb + 10
+    	gaussian_islands(λ, φ) = zb + h * (mtn₁(λ, φ) + mtn₂(λ, φ))
 
-    grid = ImmersedBoundaryGrid(grid, GridFittedBottom(gaussian_islands))
+    	grid = ImmersedBoundaryGrid(grid, GridFittedBottom(gaussian_islands))
+    end
     free_surface = SplitExplicitFreeSurface(grid; substeps=10)
 
     kwargs = (;
@@ -300,21 +302,16 @@ end
 
 @testset "TripolarGrid ZStar tracer conservation tests" begin
     for arch in archs
-    	@info "Testing ZStar coordinate with TripolarGrid on $(arch)..."
-
-    	model = make_tripolar_test_model(arch, with_wind=false)
-    	Δt = 2minutes
-    	test_zstar_coordinate(model, 300, Δt)
-    end
-end
-
-@testset "ZStar tracer conservation tests with wind stress" begin
-    for arch in archs
-        @info "Testing ZStar coordinate with TripolarGrid and wind stress on $(arch)..."
-    
-        model = make_tripolar_test_model(arch; with_wind=true)
-        Δt = 2minutes
-        test_zstar_coordinate(model, 300, Δt)
+	for with_wind in (false, true)
+            for with_bathymetry in (false, true)
+		wind_str = with_wind ? "with wind" : "without wind"
+                bathy_str = with_bathymetry ? "with bathymetry" : "without bathymetry"
+                @info "Testing ZStar coordinate on TripolarGrid $wind_str, $bathy_str on $(arch)..."
+
+    	        model = make_tripolar_test_model(arch; with_bathymetry = with_bathymetry, with_wind = with_wind)
+    	        Δt = 2minutes
+    	        test_zstar_coordinate(model, 300, Δt)
+	    end
+	end
     end
 end
-