Merge #1260

1260: Fix names and method call in TestUtilities r=charleskawczynski a=charleskawczynski

This PR fixes some method calls, which are currently commented out, however, we plan to uncomment them in #1251.

Co-authored-by: Charles Kawczynski <kawczynski.charles@gmail.com>

Author: bors[bot]

Project.toml

@@ -1,7 +1,7 @@
 name = "ClimaCore"
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
 authors = ["CliMA Contributors <clima-software@caltech.edu>"]
-version = "0.10.34"
+version = "0.10.35"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

test/Spaces/extruded_cuda.jl

@@ -35,8 +35,8 @@ end
     FT = Float64
     CUDA.allowscalar(true)
     # TODO: add support and test for all spaces
-    cpuspace = TU.ExtrudedCenterFiniteDifferenceSpace(FT; context = cpu_context)
-    gpuspace = TU.ExtrudedCenterFiniteDifferenceSpace(FT; context = gpu_context)
+    cpuspace = TU.CenterExtrudedFiniteDifferenceSpace(FT; context = cpu_context)
+    gpuspace = TU.CenterExtrudedFiniteDifferenceSpace(FT; context = gpu_context)
 
     # Test that all geometries match with CPU version:
     @test compare(cpuspace, gpuspace, :center_local_geometry)

test/TestUtilities/TestUtilities.jl

@@ -102,7 +102,7 @@ function SphereSpectralElementSpace(
     return Spaces.SpectralElementSpace2D(topology, quad)
 end
 
-function ExtrudedCenterFiniteDifferenceSpace(
+function CenterExtrudedFiniteDifferenceSpace(
     ::Type{FT};
     zelem = 10,
     context = ClimaComms.SingletonCommsContext(),
@@ -128,13 +128,13 @@ function ExtrudedCenterFiniteDifferenceSpace(
     return Spaces.ExtrudedFiniteDifferenceSpace(hspace, vspace)
 end
 
-function ExtrudedFaceFiniteDifferenceSpace(
+function FaceExtrudedFiniteDifferenceSpace(
     ::Type{FT};
     zelem = 10,
     context = ClimaComms.SingletonCommsContext(),
 ) where {FT}
-    cspace = ExtrudedCenterFiniteDifferenceSpace(FT; zelem, context)
-    return Spaces.ExtrudedFaceFiniteDifferenceSpace(cspace)
+    cspace = CenterExtrudedFiniteDifferenceSpace(FT; zelem, context)
+    return Spaces.ExtrudedFiniteDifferenceSpace{Spaces.CellFace}(cspace)
 end
 
 function all_spaces(
@@ -152,8 +152,8 @@ function all_spaces(
         ColumnCenterFiniteDifferenceSpace(FT; zelem, context),
         ColumnFaceFiniteDifferenceSpace(FT; zelem, context),
         SphereSpectralElementSpace(FT; context),
-        ExtrudedCenterFiniteDifferenceSpace(FT; zelem, context),
-        # ExtrudedFaceFiniteDifferenceSpace(FT; zelem, context), # errors on sum
+        CenterExtrudedFiniteDifferenceSpace(FT; zelem, context),
+        # FaceExtrudedFiniteDifferenceSpace(FT; zelem, context), # errors on sum  
         # TODO: incorporate this list of spaces somehow:
         #     space_vf = Spaces.CenterFiniteDifferenceSpace(topology_z)
         #     space_ifh = Spaces.SpectralElementSpace1D(topology_x, quad)