Fix scoping issue-- call adapt directly

Author: charleskawczynski

src/Remapping/Remapping.jl

@@ -16,7 +16,7 @@ import ..DataLayouts,
     ..Hypsography
 import ClimaCore.Utilities: half
 import ClimaCore.Spaces: cuda_synchronize
-import ..to_cpu
+import Adapt
 
 using ..RecursiveApply
 

src/Remapping/distributed_remapping.jl

@@ -399,10 +399,11 @@ function _Remapper(
         )
         num_dims = num_hdims
     else
-        cpu_space = if ClimaComms.device(space) isa ClimaComms.AbstractCPUDevice
+        device = ClimaComms.device(space)
+        cpu_space = if device isa ClimaComms.AbstractCPUDevice
             space
         else
-            to_cpu(space)
+            Adapt.adapt(ClimaComms.array_type(device), space)
         end
         vert_interpolation_weights =
             ArrayType(vertical_interpolation_weights(cpu_space, target_zcoords))
@@ -471,7 +472,12 @@ function _Remapper(
     cpu_space = if ClimaComms.device(space) isa ClimaComms.AbstractCPUDevice
         space
     else
-        to_cpu(space)
+        device = ClimaComms.device(space)
+        cpu_space = if device isa ClimaComms.AbstractCPUDevice
+            space
+        else
+            Adapt.adapt(ClimaComms.array_type(device), space)
+        end
     end
 
     vert_interpolation_weights =