From 82b80a93e49abb33a2cbb977fad07f44121e77fe Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Sat, 11 Jan 2025 09:26:27 -0500 Subject: [PATCH] Fix type params in common spaces / grids --- src/CommonGrids/CommonGrids.jl | 8 +++++--- src/CommonSpaces/CommonSpaces.jl | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/CommonGrids/CommonGrids.jl b/src/CommonGrids/CommonGrids.jl index 4a0b183c38..6a806431aa 100644 --- a/src/CommonGrids/CommonGrids.jl +++ b/src/CommonGrids/CommonGrids.jl @@ -28,7 +28,7 @@ n_quad_points = 4 device = ClimaComms.device() context = ClimaComms.context(device) hypsography = Grids.Flat() -global_geometry = Geometry.ShallowSphericalGlobalGeometry(radius) +global_geometry = Geometry.ShallowSphericalGlobalGeometry{FT}(radius) quad = Quadratures.GLL{n_quad_points}() h_mesh = Meshes.EquiangularCubedSphere(Domains.SphereDomain{FT}(radius), h_elem) h_topology = Topologies.Topology2D(context, h_mesh) @@ -95,7 +95,7 @@ import .Helpers.DefaultRectangleXYMesh context::ClimaComms.AbstractCommsContext = ClimaComms.context(device), stretch::Meshes.StretchingRule = Meshes.Uniform(), hypsography_fun = (h_grid, z_grid) -> Grids.Flat(), - global_geometry::Geometry.AbstractGlobalGeometry = Geometry.ShallowSphericalGlobalGeometry(radius), + global_geometry::Geometry.AbstractGlobalGeometry = Geometry.ShallowSphericalGlobalGeometry{FT}(radius), quad::Quadratures.QuadratureStyle = Quadratures.GLL{n_quad_points}(), h_mesh = Meshes.EquiangularCubedSphere(Domains.SphereDomain{FT}(radius), h_elem), h_topology::Topologies.AbstractDistributedTopology = Topologies.Topology2D(context, h_mesh), @@ -155,7 +155,9 @@ function ExtrudedCubedSphereGrid( context::ClimaComms.AbstractCommsContext = ClimaComms.context(device), stretch::Meshes.StretchingRule = Meshes.Uniform(), hypsography_fun = (h_grid, z_grid) -> Grids.Flat(), - global_geometry::Geometry.AbstractGlobalGeometry = Geometry.ShallowSphericalGlobalGeometry( + global_geometry::Geometry.AbstractGlobalGeometry = Geometry.ShallowSphericalGlobalGeometry{ + FT, + }( radius, ), quad::Quadratures.QuadratureStyle = Quadratures.GLL{n_quad_points}(), diff --git a/src/CommonSpaces/CommonSpaces.jl b/src/CommonSpaces/CommonSpaces.jl index 53af8fd9e3..8b3d559545 100644 --- a/src/CommonSpaces/CommonSpaces.jl +++ b/src/CommonSpaces/CommonSpaces.jl @@ -45,7 +45,7 @@ import ..CommonGrids: context::ClimaComms.AbstractCommsContext = ClimaComms.context(device), stretch::Meshes.StretchingRule = Meshes.Uniform(), hypsography_fun = (h_grid, z_grid) -> Grids.Flat(), - global_geometry::Geometry.AbstractGlobalGeometry = Geometry.ShallowSphericalGlobalGeometry(radius), + global_geometry::Geometry.AbstractGlobalGeometry = Geometry.ShallowSphericalGlobalGeometry{FT}(radius), quad::Quadratures.QuadratureStyle = Quadratures.GLL{n_quad_points}(), h_mesh = Meshes.EquiangularCubedSphere(Domains.SphereDomain{FT}(radius), h_elem), h_topology::Topologies.AbstractDistributedTopology = Topologies.Topology2D(context, h_mesh),