Do not allow mismatch between dims and bcs

CliMA · Jul 23, 2024 · 5ebbd64 · 5ebbd64
1 parent 6b8f4f2
commit 5ebbd64
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/ext/InterpolationsRegridderExt.jl b/ext/InterpolationsRegridderExt.jl
@@ -58,6 +58,8 @@ function Regridders.InterpolationsRegridder(
 )
     coordinates = ClimaCore.Fields.coordinate_field(target_space)
 
+    num_dimensions = length(propertynames(coordinates))
+
     if isnothing(extrapolation_bc)
         extrapolation_bc = ()
         if eltype(coordinates) <: ClimaCore.Geometry.LatLongPoint
@@ -69,7 +71,15 @@ function Regridders.InterpolationsRegridder(
         end
     end
 
-    return InterpolationsRegridder(target_space, coordinates, extrapolation_bc)
+    num_dimensions == length(extrapolation_bc) || error(
+        "Number of boundary conditions does not match the number of dimensions",
+    )
+
+    return InterpolationsRegridder(
+        target_space,
+        coordinates,
+        extrapolation_bc
+    )
 end
 
 """

diff --git a/test/data_handling.jl b/test/data_handling.jl
@@ -87,13 +87,10 @@ ClimaComms.init(context)
         target_space;
         regridder_type = :InterpolationsRegridder,
         file_reader_kwargs = (; preprocess_func = (data) -> 0.0 * data),
-        regridder_kwargs = (;
-            extrapolation_bc = (Intp.Flat(), Intp.Flat(), Intp.Flat())
-        ),
+        regridder_kwargs = (; extrapolation_bc = (Intp.Flat(), Intp.Flat())),
     )
 
-    @test data_handler.regridder.extrapolation_bc ==
-          (Intp.Flat(), Intp.Flat(), Intp.Flat())
+    @test data_handler.regridder.extrapolation_bc == (Intp.Flat(), Intp.Flat())
     field = DataHandling.regridded_snapshot(data_handler)
     @test extrema(field) == (0.0, 0.0)
 end

diff --git a/test/regridders.jl b/test/regridders.jl
@@ -97,6 +97,17 @@ end
             extrapolation_bc,
         )
 
+        # Test num_dimensions != length(extrapolation_bc)
+        @test_throws ErrorException Regridders.InterpolationsRegridder(
+            hv_center_space;
+            extrapolation_bc = (
+                Interpolations.Periodic(),
+                Interpolations.Flat(),
+                Interpolations.Flat(),
+                Interpolations.Flat(),
+            ),
+        )
+
         regridded_lat = Regridders.regrid(reg_hv, data_lat3D, dimensions3D)
         regridded_lon = Regridders.regrid(reg_hv, data_lon3D, dimensions3D)
         regridded_z = Regridders.regrid(reg_hv, data_z3D, dimensions3D)