Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/main_unit_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
uses: actions/checkout@v6
with:
submodules: 'recursive'
repository: NOAA-GFDL/pace
repository: FlorianDeconinck/pace
ref: update/2026.02.00
path: pace
ref: develop

- name: 'Setup Python ${{ inputs.python_version && inputs.python_version || env.python_default }}'
uses: actions/setup-python@v6
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/driver_configs/baroclinic_c192_54ranks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: dace:gpu
backend: st:dace:gpu:KJI
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/driver_configs/baroclinic_c192_6ranks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: dace:gpu
backend: st:dace:gpu:KJI
rebuild: false
validate_args: true
format_source: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dycore_only: true
disable_step_physics: true
stencil_config:
compilation_config:
backend: gt:gpu
backend: st:gt:gpu:KJI
rebuild: false
validate_args: true
format_source: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dycore_only: true
disable_step_physics: true
stencil_config:
compilation_config:
backend: gt:gpu
backend: st:gt:gpu:KJI
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion NDSL
Submodule NDSL updated 133 files
2 changes: 1 addition & 1 deletion docs/util/communication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ To see how the boundary and other objects operate, we will need some data to ope
>>> import numpy as np
>>> quantity = pace.util.Quantity(
... data=np.zeros((6, 6)),
... dims=[pace.util.X_DIM, pace.util.Y_DIM],
... dims=[pace.util.I_DIM, pace.util.J_DIM],
... units="m",
... origin=(1, 1),
... extent=(4, 4),
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/analytic_test.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_comm_read.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_comm_write.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_dp.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_explicit_physics.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_from_serialbox.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: gtc:numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
7 changes: 6 additions & 1 deletion examples/configs/baroclinic_c12_null_comm.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down Expand Up @@ -94,3 +94,8 @@ physics_config:
hydrostatic: false
nwat: 6
do_qa: true

grid_config:
type: generated
config:
eta_file: './eta79.nc'
Comment thread
romanc marked this conversation as resolved.
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_orch_cpu.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: dace:cpu
backend: st:dace:cpu:KIJ
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_read_restart_fortran.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c12_write_restart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c48_6ranks_serialbox_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dycore_only: true
disable_step_physics: true
stencil_config:
compilation_config:
backend: gt:gpu
backend: st:gt:gpu:KJI
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/baroclinic_c48_no_out.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/test_external_C12_1x1.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/test_external_C12_2x2.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/tropical_read_restart_fortran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dycore_only: true
disable_step_physics: true
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
2 changes: 1 addition & 1 deletion examples/configs/tropicalcyclone_c128.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dycore_only: true
disable_step_physics: true
stencil_config:
compilation_config:
backend: numpy
backend: st:numpy:cpu:IJK
rebuild: false
validate_args: true
format_source: false
Expand Down
29 changes: 15 additions & 14 deletions examples/notebooks/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
SubtileGridSizer,
TilePartitioner,
)
from ndsl.constants import RADIUS, X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
from ndsl.config import Backend, backend_python
from ndsl.constants import I_DIM, I_INTERFACE_DIM, J_DIM, J_INTERFACE_DIM, K_DIM, RADIUS
from ndsl.grid import (
AngleGridData,
ContravariantGridData,
Expand Down Expand Up @@ -62,7 +63,7 @@ def init_quantity(
grid: VariableGrid,
dims: VariableDims = VariableDims.XYZ,
units: str = "",
backend: str = "numpy",
backend: Backend = backend_python,
) -> Quantity:
"""
Use: output = init_quantity(dimensions, grid, dims, units)
Expand Down Expand Up @@ -102,7 +103,7 @@ def init_quantity(
if grid == VariableGrid.CellCenters:
variable = Quantity(
data=empty,
dims=(X_DIM, Y_DIM, Z_DIM)[:skip_z],
dims=(I_DIM, J_DIM, K_DIM)[:skip_z],
units=units,
origin=(nhalo, nhalo, 0)[:skip_z],
extent=(nx, ny, nz)[:skip_z],
Expand All @@ -112,7 +113,7 @@ def init_quantity(
if grid == VariableGrid.CellCorners:
variable = Quantity(
data=empty,
dims=(X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM)[:skip_z],
dims=(I_INTERFACE_DIM, J_INTERFACE_DIM, K_DIM)[:skip_z],
units=units,
origin=(nhalo, nhalo, 0)[:skip_z],
extent=(nx + 1, ny + 1, nz)[:skip_z],
Expand All @@ -122,7 +123,7 @@ def init_quantity(
elif grid == VariableGrid.StaggeredInX:
variable = Quantity(
data=empty,
dims=(X_INTERFACE_DIM, Y_DIM, Z_DIM)[:skip_z],
dims=(I_INTERFACE_DIM, J_DIM, K_DIM)[:skip_z],
units=units,
origin=(nhalo, nhalo, 0)[:skip_z],
extent=(nx + 1, ny, nz)[:skip_z],
Expand All @@ -132,7 +133,7 @@ def init_quantity(
elif grid == VariableGrid.StaggeredInY:
variable = Quantity(
data=empty,
dims=(X_DIM, Y_INTERFACE_DIM, Z_DIM)[:skip_z],
dims=(I_DIM, J_INTERFACE_DIM, K_DIM)[:skip_z],
units=units,
origin=(nhalo, nhalo, 0)[:skip_z],
extent=(nx, ny + 1, nz)[:skip_z],
Expand Down Expand Up @@ -310,13 +311,13 @@ def configure_domain(

def configure_stencil(
domain_configuration: Dict[str, Any],
backend: str = "numpy",
backend: Backend = backend_python,
single_layer: bool = True,
) -> Dict[str, Any]:
"""
Use:
stencil_configuration = configure_stencil(
domain_configuration, backend="numpy", single_layer=True)
domain_configuration, backend=Backend("st:numpy:cpu:IJK"), single_layer=True)

Inputs:
- domain configuration (Dict) from configure_domain()
Expand Down Expand Up @@ -646,20 +647,20 @@ def calculate_winds_from_streamfunction_grid(
if isinstance(u_grid.data, np.ndarray) and isinstance(v_grid.data, np.ndarray):
if grid == GridType.AGrid:
if not (
u_grid.metadata.dims == (X_DIM, Y_DIM, Z_DIM)
and v_grid.metadata.dims == (X_DIM, Y_DIM, Z_DIM)
u_grid.metadata.dims == (I_DIM, J_DIM, K_DIM)
and v_grid.metadata.dims == (I_DIM, J_DIM, K_DIM)
):
print("Incorrect wind input dimensions for A-grid.")
elif grid == GridType.CGrid:
if not (
u_grid.metadata.dims == (X_DIM, Y_INTERFACE_DIM, Z_DIM)
and v_grid.metadata.dims == (X_INTERFACE_DIM, Y_DIM, Z_DIM)
u_grid.metadata.dims == (I_DIM, J_INTERFACE_DIM, K_DIM)
and v_grid.metadata.dims == (I_INTERFACE_DIM, J_DIM, K_DIM)
):
print("Incorrect wind input dimensions for C-grid.")
elif grid == GridType.DGrid:
if not (
u_grid.metadata.dims == (X_INTERFACE_DIM, Y_DIM, Z_DIM)
and v_grid.metadata.dims == (X_DIM, Y_INTERFACE_DIM, Z_DIM)
u_grid.metadata.dims == (I_INTERFACE_DIM, J_DIM, K_DIM)
and v_grid.metadata.dims == (I_DIM, J_INTERFACE_DIM, K_DIM)
):
print("Incorrect wind input dimensions for D-grid.")
else:
Expand Down
Loading