Rename float_type_cs -> float_type

experiments/AMIP/moist_mpi_earth/coupler_driver_modular.jl

@@ -5,16 +5,16 @@ include("mpi/mpi_init.jl") # setup MPI context for distributed runs #hide
 #=
 ## Overview
 
-AMIP is a standard experimental protocol of the Program for Climate Model Diagnosis & Intercomparison (PCMDI). 
+AMIP is a standard experimental protocol of the Program for Climate Model Diagnosis & Intercomparison (PCMDI).
 It is used as a model benchmark for the atmospheric and land model components, while sea-surface temperatures (SST) and sea-ice concentration (SIC)
 are prescribed using time-interpolations between monthly observed data. We use standard data files with original sources:
-- SST and SIC: https://gdex.ucar.edu/dataset/158_asphilli.html 
+- SST and SIC: https://gdex.ucar.edu/dataset/158_asphilli.html
 - land-sea mask: https://www.ncl.ucar.edu/Applications/Data/#cdf
 
-For more information, see the PCMDI's specifications for [AMIP I](https://pcmdi.github.io/mips/amip/) and [AMIP II](https://pcmdi.github.io/mips/amip2/). 
+For more information, see the PCMDI's specifications for [AMIP I](https://pcmdi.github.io/mips/amip/) and [AMIP II](https://pcmdi.github.io/mips/amip2/).
 
-This driver contains two modes. The full `AMIP` mode and a `SlabPlanet` (all surfaces are thermal slabs) mode. Since `AMIP` is not a closed system, the 
-`SlabPlanet` mode is useful for checking conservation properties of the coupling. 
+This driver contains two modes. The full `AMIP` mode and a `SlabPlanet` (all surfaces are thermal slabs) mode. Since `AMIP` is not a closed system, the
+`SlabPlanet` mode is useful for checking conservation properties of the coupling.
 
 =#
 
@@ -41,7 +41,7 @@ you can run directly from the Julia REPL. The latter is recommended for debuggin
 with threading enabled:
 ```julia
 julia --project --threads 8
-``` 
+```
 =#
 
 #=
@@ -94,7 +94,7 @@ import ClimaCoupler
 import ClimaCoupler.Regridder: land_sea_mask, update_masks!, combine_surfaces!, dummmy_remap!, binary_mask
 import ClimaCoupler.ConservationChecker:
     EnergyConservationCheck, WaterConservationCheck, check_conservation!, plot_global_conservation
-import ClimaCoupler.Utilities: CoupledSimulation, float_type_cs, swap_space!
+import ClimaCoupler.Utilities: CoupledSimulation, float_type, swap_space!
 import ClimaCoupler.BCReader:
     bcfile_info_init, float_type_bcf, update_midmonth_data!, next_date_in_file, interpolate_midmonth_to_daily
 import ClimaCoupler.TimeManager: current_date, datetime_to_strdate, trigger_callback, Monthly, EveryTimestep
@@ -136,9 +136,9 @@ include("atmos/atmos_init.jl")
 atmos_sim = atmos_init(FT, Y, integrator, params = params);
 
 #=
-We use a common `Space` for all global surfaces. This enables the MPI processes to operate on the same columns in both 
-the atmospheric and surface components, so exchanges are parallelized. Note this is only possible when the 
-atmosphere and surface are of the same horizontal resolution. 
+We use a common `Space` for all global surfaces. This enables the MPI processes to operate on the same columns in both
+the atmospheric and surface components, so exchanges are parallelized. Note this is only possible when the
+atmosphere and surface are of the same horizontal resolution.
 =#
 ## init a 2D bounary space at the surface
 boundary_space = atmos_sim.domain.face_space.horizontal_space
@@ -163,9 +163,9 @@ land_sim =
 #=
 ### Ocean and Sea Ice
 In the `AMIP` mode, all ocean properties are prescribed from a file, while sea-ice temperatures are calculated using observed
-SIC and assuming a 2m thickness of the ice. 
+SIC and assuming a 2m thickness of the ice.
 
-In the `SlabPlanet` mode, all ocean and sea ice are dynamical models, namely thermal slabs, with different parameters. 
+In the `SlabPlanet` mode, all ocean and sea ice are dynamical models, namely thermal slabs, with different parameters.
 =#
 
 @info mode_name
@@ -241,7 +241,7 @@ end
 #=
 ## Coupler Initialization
 The coupler needs to contain exchange information, manage the calendar and be able to access all component models. It can also optionally
-save online diagnostics. These are all initialized here and saved in a global `CouplerSimulation` struct, `cs`. 
+save online diagnostics. These are all initialized here and saved in a global `CouplerSimulation` struct, `cs`.
 =#
 
 ## coupler exchange fields
@@ -313,7 +313,7 @@ cs = CoupledSimulation{FT}(
 
 
 #=
-## Initial States Exchange 
+## Initial States Exchange
 =#
 ## share states between models
 include("./push_pull.jl")
@@ -412,8 +412,8 @@ end
 solve_coupler!(cs);
 
 #=
-## Postprocessing 
-Currently all postprocessing is performed using the root process only. 
+## Postprocessing
+Currently all postprocessing is performed using the root process only.
 =#
 
 if ClimaComms.iamroot(comms_ctx)

experiments/AMIP/moist_mpi_earth/coupler_utils/general_helper.jl

@@ -18,7 +18,7 @@ struct CouplerSimulation{FT, C, S, D, B, P}
 end
 
 CouplerSimulation{FT}(args...) where {FT} = CouplerSimulation{FT, typeof.(args[1:5])...}(args...)
-float_type_cs(::CouplerSimulation{FT}) where {FT} = FT
+float_type(::CouplerSimulation{FT}) where {FT} = FT
 
 function swap_space!(field, new_space)
     field_out = zeros(new_space)

experiments/AMIP/moist_mpi_earth/coupler_utils/variable_definer.jl

@@ -3,14 +3,14 @@
 """
     get_var(cs::CouplerSimulation, ::Symbol)
 
-Defines variable extraction from the coupler simulation. 
+Defines variable extraction from the coupler simulation.
 """
 get_var(cs, ::Val{:T}) = air_temperature(cs)
 
 get_var(cs, ::Val{:u}) = ClimaCore.Geometry.UVVector.(cs.model_sims.atmos_sim.integrator.u.c.uₕ).components.data.:1
 
 get_var(cs, ::Val{:q_tot}) =
-    cs.model_sims.atmos_sim.integrator.u.c.ρq_tot ./ cs.model_sims.atmos_sim.integrator.u.c.ρ .* float_type_cs(cs)(1000)
+    cs.model_sims.atmos_sim.integrator.u.c.ρq_tot ./ cs.model_sims.atmos_sim.integrator.u.c.ρ .* float_type(cs)(1000)
 
 get_var(cs, ::Val{:toa}) = swap_space!(toa_fluxes(cs), cs.boundary_space)
 

experiments/AMIP/moist_mpi_earth/push_pull.jl

@@ -1,6 +1,6 @@
 """
    atmos_push!(cs)
-   
+
 updates F_A, F_R, P_liq, and F_E in place based on values used in the atmos_sim for the current step.
 """
 function atmos_push!(cs)
@@ -21,7 +21,7 @@ and hydrostatic balance assumptions. The land model does not compute the surface
 a reasonable stand-in.
 """
 function land_pull!(cs)
-    FT = float_type_cs(cs)
+    FT = float_type(cs)
     land_sim = cs.model_sims.land_sim
     csf = cs.fields
     land_mask = cs.surface_masks.land
@@ -59,7 +59,7 @@ In the current version, the sea ice has a prescribed thickness, and we assume th
 sublimating. That contribution has been zeroed out in the atmos fluxes.
 """
 function ice_pull!(cs)
-    FT = float_type_cs(cs)
+    FT = float_type(cs)
     ice_sim = cs.model_sims.ice_sim
     csf = cs.fields
     ice_mask = cs.surface_masks.ice
@@ -71,7 +71,7 @@ end
 
 """
    atmos_pull!(cs)
-              
+
 Creates the surface fields for temperature, roughness length, albedo, and specific humidity; computes
 turbulent surface fluxes; updates the atmosphere boundary flux cache variables in place; updates the
 RRTMGP cache variables in place.
@@ -105,7 +105,7 @@ function atmos_pull!(cs)
 
     update_masks!(cs)
 
-    # combine models' surfaces onlo one coupler field 
+    # combine models' surfaces onlo one coupler field
     combined_field = zeros(boundary_space)
 
     # surface temperature
@@ -120,7 +120,7 @@ function atmos_pull!(cs)
     combine_surfaces!(combined_field, cs.surface_masks, (; land = z0b_land, ocean = z0b_ocean, ice = z0b_ice))
     dummmy_remap!(z0b_cpl, combined_field)
 
-    # calculate atmospheric surface density 
+    # calculate atmospheric surface density
     set_ρ_sfc!(ρ_sfc_cpl, T_sfc_cpl, atmos_sim.integrator)
 
     # surface specific humidity

experiments/AMIP/moist_mpi_earth/user_diagnostics.jl

@@ -3,7 +3,7 @@
 # Atmos diagnostics
 
 """
-    get_var(cs::CoupledSimulation, ::Val{:T}) 
+    get_var(cs::CoupledSimulation, ::Val{:T})
 
 Air temperature (K).
 """
@@ -15,23 +15,23 @@ function get_var(cs::CoupledSimulation, ::Val{:T})
 end
 
 """
-    get_var(cs::CoupledSimulation, ::Val{:u}) 
+    get_var(cs::CoupledSimulation, ::Val{:u})
 
 Zonal wind (m s⁻¹).
 """
 get_var(cs::CoupledSimulation, ::Val{:u}) =
     ClimaCore.Geometry.UVVector.(cs.model_sims.atmos_sim.integrator.u.c.uₕ).components.data.:1
 
 """
-    get_var(cs::CoupledSimulation, ::Val{:q_tot}) 
+    get_var(cs::CoupledSimulation, ::Val{:q_tot})
 
 Total specific humidity (kg kg⁻¹).
 """
 get_var(cs::CoupledSimulation, ::Val{:q_tot}) =
-    cs.model_sims.atmos_sim.integrator.u.c.ρq_tot ./ cs.model_sims.atmos_sim.integrator.u.c.ρ .* float_type_cs(cs)(1000)
+    cs.model_sims.atmos_sim.integrator.u.c.ρq_tot ./ cs.model_sims.atmos_sim.integrator.u.c.ρ .* float_type(cs)(1000)
 
 """
-    get_var(cs::CoupledSimulation, ::Val{:toa}) 
+    get_var(cs::CoupledSimulation, ::Val{:toa})
 
 Top of the atmosphere radiation fluxes (W m⁻²).
 """
@@ -64,7 +64,7 @@ function get_var(cs::CoupledSimulation, ::Val{:toa})
 end
 
 """
-    get_var(cs::CoupledSimulation, ::Val{:precipitation}) 
+    get_var(cs::CoupledSimulation, ::Val{:precipitation})
 
 Precipitation (m m⁻²).
 """
@@ -77,7 +77,7 @@ get_var(cs::CoupledSimulation, ::Val{:precipitation}) =
 
 # coupler diagnotics
 """
-    get_var(cs::CoupledSimulation, ::Val{:T_sfc}) 
+    get_var(cs::CoupledSimulation, ::Val{:T_sfc})
 
 Combined surface temperature (K).
 """

src/Utilities.jl

@@ -29,9 +29,9 @@ struct CoupledSimulation{
     FV,
     P,
     E,
-    TSI,
-    TI <: Int,
-    DTI <: Int,
+    TSI <: Tuple{Real, Real},
+    TI <: Real,
+    DTI <: Real,
     NTSM <: NamedTuple,
     NTMS <: NamedTuple,
     NTM <: NamedTuple,