Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

arch_array -> on_architecture #70

Merged
merged 3 commits into from
Mar 27, 2024
Merged

arch_array -> on_architecture #70

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59aa7f1
arch_array -> on_architecture
navidcy Mar 26, 2024
804d8b9
up Oceananigans
navidcy Mar 27, 2024
2698c71
Update pipeline.yml
navidcy Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Downloads = "1.6"
JLD2 = "0.4"
KernelAbstractions = "0.9"
NCDatasets = "0.12, 0.13, 0.14"
Oceananigans = "0.90"
Oceananigans = "0.90.10"
SeawaterPolynomials = "0.3"
Statistics = "1.9"
julia = "1.9"
Expand Down
14 changes: 7 additions & 7 deletions sandbox/one_degree_75S_75N.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using Oceananigans
using Oceananigans.Units

using Oceananigans.Operators: Δzᵃᵃᶜ
using Oceananigans.Architectures: arch_array
using Oceananigans.Architectures: on_architecture
using Oceananigans.Coriolis: HydrostaticSphericalCoriolis
using Oceananigans.Coriolis: WetCellEnstrophyConservingScheme
using Oceananigans.TurbulenceClosures: RiBasedVerticalDiffusivity, FluxTapering
Expand Down Expand Up @@ -65,12 +65,12 @@ close(boundary_conditions_file)
@info "... read boundary conditions (" * prettytime(1e-9 * (time_ns() - start)) * ")"

# Convert boundary conditions arrays to GPU
τˣ = arch_array(arch, τˣ)
τʸ = arch_array(arch, τʸ)
target_sea_surface_temperature = T★ = arch_array(arch, T★)
target_sea_surface_salinity = S★ = arch_array(arch, S★)
surface_temperature_flux = Q★ = arch_array(arch, Q★)
surface_salt_flux = F★ = arch_array(arch, F★)
τˣ = on_architecture(arch, τˣ)
τʸ = on_architecture(arch, τʸ)
target_sea_surface_temperature = T★ = on_architecture(arch, T★)
target_sea_surface_salinity = S★ = on_architecture(arch, S★)
surface_temperature_flux = Q★ = on_architecture(arch, Q★)
surface_salt_flux = F★ = on_architecture(arch, F★)

# Stretched faces from ECCO Version 4 (49 levels in the vertical)
z_faces = ClimaOcean.VerticalGrids.z_49_levels_10_to_400_meter_spacing
Expand Down
2 changes: 1 addition & 1 deletion src/NearGlobalSimulations/NearGlobalSimulations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using Oceananigans
using Oceananigans.Units

using Oceananigans.Operators: Δzᵃᵃᶜ, ℑxyᶠᶜᵃ, ℑxyᶜᶠᵃ
using Oceananigans.Architectures: arch_array
using Oceananigans.Architectures: on_architecture
using Oceananigans.Coriolis: HydrostaticSphericalCoriolis
# using Oceananigans.Coriolis: ActiveCellEnstrophyConservingScheme
using Oceananigans.TurbulenceClosures: RiBasedVerticalDiffusivity, FluxTapering
Expand Down
12 changes: 6 additions & 6 deletions src/NearGlobalSimulations/one_degree_global_simulation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ function one_degree_near_global_simulation(architecture = GPU();
@info "... read boundary conditions (" * prettytime(1e-9 * (time_ns() - start)) * ")"

# Convert boundary conditions arrays to GPU
τˣ = arch_array(architecture, τˣ)
τʸ = arch_array(architecture, τʸ)
target_sea_surface_temperature = T★ = arch_array(architecture, T★)
target_sea_surface_salinity = S★ = arch_array(architecture, S★)
surface_temperature_flux = Q★ = arch_array(architecture, Q★)
surface_salt_flux = F★ = arch_array(architecture, F★)
τˣ = on_architecture(architecture, τˣ)
τʸ = on_architecture(architecture, τʸ)
target_sea_surface_temperature = T★ = on_architecture(architecture, T★)
target_sea_surface_salinity = S★ = on_architecture(architecture, S★)
surface_temperature_flux = Q★ = on_architecture(architecture, Q★)
surface_salt_flux = F★ = on_architecture(architecture, F★)

# Stretched faces from ECCO Version 4 (49 levels in the vertical)
z_faces = VerticalGrids.z_49_levels_10_to_400_meter_spacing
Expand Down
12 changes: 6 additions & 6 deletions src/NearGlobalSimulations/quarter_degree_global_simulation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ function quarter_degree_near_global_simulation(architecture = GPU();
@info "... read boundary conditions (" * prettytime(1e-9 * (time_ns() - start)) * ")"

# Convert boundary conditions arrays to GPU
τˣ = arch_array(architecture, τˣ)
τʸ = arch_array(architecture, τʸ)
target_sea_surface_temperature = T★ = arch_array(architecture, T★)
target_sea_surface_salinity = S★ = arch_array(architecture, S★)
surface_temperature_flux = Q★ = arch_array(architecture, Q★)
surface_salt_flux = F★ = arch_array(architecture, F★)
τˣ = on_architecture(architecture, τˣ)
τʸ = on_architecture(architecture, τʸ)
target_sea_surface_temperature = T★ = on_architecture(architecture, T★)
target_sea_surface_salinity = S★ = on_architecture(architecture, S★)
surface_temperature_flux = Q★ = on_architecture(architecture, Q★)
surface_salt_flux = F★ = on_architecture(architecture, F★)

# Stretched faces from ECCO Version 4 (49 levels in the vertical)
z_faces = VerticalGrids.z_49_levels_10_to_400_meter_spacing
Expand Down
Loading