Add debugging info

CliMA · Jul 10, 2024 · 5bf2208 · 5bf2208
1 parent 3e30fd8
commit 5bf2208
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 182 deletions.
diff --git a/config/model_configs/box_analytic_cosine_mountain_test.yml b/config/model_configs/box_analytic_cosine_mountain_test.yml
@@ -9,7 +9,7 @@ x_elem: 30
 y_elem: 30
 z_elem: 100
 z_stretch: false
-dt: "8secs"
+dt: "6secs"
 t_end: "24hours"
 use_reference_state: false
 rayleigh_sponge: true

diff --git a/config/model_configs/plane_analytic_cosine_mountain_test.yml b/config/model_configs/plane_analytic_cosine_mountain_test.yml
@@ -7,7 +7,7 @@ z_max: 21e3
 x_elem: 30
 z_elem: 100
 z_stretch: false
-dt: "8secs"
+dt: "6secs"
 t_end: "24hours"
 use_reference_state: false
 rayleigh_sponge: true

diff --git a/examples/hybrid/driver.jl b/examples/hybrid/driver.jl
@@ -10,13 +10,8 @@ import ClimaAtmos as CA
 import Random
 Random.seed!(1234)
 
-# TODO: Fix the bug that's making this necessary for 2D topography runs.
-import ClimaCore.DataLayouts: promote_parent_array_type
-import CUDA
-promote_parent_array_type(
-    ::Type{CUDA.CuArray{T1, N, B} where {N}},
-    ::Type{Array{T2, N} where {N}},
-) where {T1, T2, B} = CUDA.CuArray{promote_type(T1, T2), N, B} where {N}
+include("fix_1d_spectral_space_on_gpu.jl")
+# include("disable_topography_dss.jl")
 
 if !(@isdefined config)
     (; config_file, job_id) = CA.commandline_kwargs()

diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl
@@ -1,7 +1,5 @@
 module ClimaAtmos
 
-# include("disable_topography_dss.jl")
-
 using NVTX, Colors
 import Thermodynamics as TD
 

diff --git a/src/analytic_solutions/analytic_solutions.jl b/src/analytic_solutions/analytic_solutions.jl
@@ -43,9 +43,6 @@ function initial_thermo_state(params, coord)
     T_min = FT(100)
     z_iso = log((T_min / T_sfc - a) / (1 - a)) / β
     p_iso = p_sfc * ((1 - a) / (1 - a * T_sfc / T_min))^(cp_d / R_d)
-    z > z_iso &&
-        @warn "Extending constant-N profile with isothermal profile above T = \
-               $T_min (z = $z_iso)" maxlog = 1
 
     # The perturbation in approximate_FΔuvw is computed around a background
     # state that is not hydrostatically balanced and is unphysical above 30 km,

diff --git a/src/disable_topography_dss.jl b/src/disable_topography_dss.jl
diff --git a/src/utils/common_spaces.jl b/src/utils/common_spaces.jl
@@ -120,6 +120,14 @@ function make_hybrid_spaces(
             hypsography =
                 Hypsography.LinearAdaption(Geometry.ZPoint.(z_surface))
         end
+        @show device
+        @show ClimaComms.device(Fields.coordinate_field(h_space))
+        @show ClimaComms.device(z_grid)
+        @show ClimaComms.device(z_surface)
+        @show ClimaComms.device(Geometry.ZPoint.(z_surface))
+        @show typeof(h_space)
+        @show typeof(z_grid)
+        @show typeof(z_surface)
     end
     grid = Grids.ExtrudedFiniteDifferenceGrid(h_grid, z_grid, hypsography; deep)
     # TODO: return the grid