Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion examples/notebook/test_physics.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
")\n",
"\n",
"# useful for easily allocating distributed data storages (fields)\n",
"quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)\n",
"quantity_factory = QuantityFactory(sizer=sizer, backend=backend)\n",
"\n",
"compilation_config = CompilationConfig(backend=backend, communicator=cs_communicator)\n",
"\n",
Expand Down
6 changes: 2 additions & 4 deletions examples/notebook/test_rad.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"id": "aed95766-57de-4d98-bc32-13473065140f",
"metadata": {},
"outputs": [],
Expand All @@ -102,9 +102,7 @@
" tile_partitioner=communicator.partitioner.tile,\n",
" tile_rank=communicator.tile.rank,\n",
")\n",
"quantity_factory = QuantityFactory.from_backend(\n",
" sizer, backend=\"numpy\"\n",
")"
"quantity_factory = QuantityFactory(sizer, backend=\"numpy\")"
]
},
{
Expand Down
6 changes: 2 additions & 4 deletions examples/notebook/test_raddriver.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"id": "b2625312-8234-4ed3-be7d-bd4118b75489",
"metadata": {},
"outputs": [],
Expand All @@ -88,9 +88,7 @@
" tile_partitioner=communicator.partitioner.tile,\n",
" tile_rank=communicator.tile.rank,\n",
")\n",
"quantity_factory = QuantityFactory.from_backend(\n",
" sizer, backend=\"numpy\"\n",
")"
"quantity_factory = QuantityFactory(sizer, backend=\"numpy\")"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_sfc.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def setup_infrastructure(nx: Int, ny: Int, nz: Int, nzsoil: Int, etafile: Path):
tile_partitioner=communicator.partitioner.tile,
tile_rank=communicator.tile.rank,
)
quantity_factory = QuantityFactory.from_backend(sizer, backend="numpy")
quantity_factory = QuantityFactory(sizer, backend="numpy")

soil_sizer = SubtileGridSizer.from_tile_params(
nx_tile=nx,
Expand All @@ -140,7 +140,7 @@ def setup_infrastructure(nx: Int, ny: Int, nz: Int, nzsoil: Int, etafile: Path):
tile_partitioner=communicator.partitioner.tile,
tile_rank=communicator.tile.rank,
)
qf_soil = QuantityFactory.from_backend(soil_sizer, backend="numpy")
qf_soil = QuantityFactory(soil_sizer, backend="numpy")

comconf = CompilationConfig()
comconf.validate_args = False
Expand Down
4 changes: 2 additions & 2 deletions tests/savepoint/translate/translate_atmos_phy_statein.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)
self.compute_func = self.stencil_factory.from_origin_domain(
atmos_phys_driver_statein,
Expand Down
4 changes: 2 additions & 2 deletions tests/savepoint/translate/translate_cloud_frac.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ def __init__(
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

def compute(self, inputs):
Expand Down
40 changes: 20 additions & 20 deletions tests/savepoint/translate/translate_cumulative_shalconv.py
Original file line number Diff line number Diff line change
Expand Up @@ -3405,8 +3405,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -3518,8 +3518,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -3623,8 +3623,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -3740,8 +3740,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -3853,8 +3853,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -4020,8 +4020,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -4185,8 +4185,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -4320,8 +4320,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -4381,8 +4381,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down Expand Up @@ -4535,8 +4535,8 @@ def __init__(self, grid, config, stencil_factory):
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

self.grid_indexing = stencil_factory.grid_indexing
Expand Down
8 changes: 4 additions & 4 deletions tests/savepoint/translate/translate_final_mp.py
Original file line number Diff line number Diff line change
Expand Up @@ -1036,8 +1036,8 @@ def __init__(
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
self.sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
self.sizer, backend=self.stencil_factory.backend
)

def compute(self, inputs):
Expand Down Expand Up @@ -1493,8 +1493,8 @@ def __init__(
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
self.sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
self.sizer, backend=self.stencil_factory.backend
)

def compute(self, inputs):
Expand Down
4 changes: 2 additions & 2 deletions tests/savepoint/translate/translate_gfdl_cld_microphysics.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ def __init__(
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
self.sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
self.sizer, backend=self.stencil_factory.backend
)

def compute(self, inputs):
Expand Down
4 changes: 1 addition & 3 deletions tests/savepoint/translate/translate_gfs_physics_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,7 @@ def compute(self, inputs):
layout=self.config.layout,
)

quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
)
quantity_factory = QuantityFactory(sizer, backend=self.stencil_factory.backend)
schemes = [PHYSICS_PACKAGES["GFS_microphysics"]]
physics_state = PhysicsState(
**inputs,
Expand Down
4 changes: 1 addition & 3 deletions tests/savepoint/translate/translate_mfpblt.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ def compute(self, inputs):
layout=self.config.layout,
)

quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
)
quantity_factory = QuantityFactory(sizer, backend=self.stencil_factory.backend)

k_mask = quantity_factory.zeros(
[X_DIM, Y_DIM, Z_DIM],
Expand Down
4 changes: 1 addition & 3 deletions tests/savepoint/translate/translate_mfscu.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ def compute(self, inputs):
layout=self.config.layout,
)

quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
)
quantity_factory = QuantityFactory(sizer, backend=self.stencil_factory.backend)

k_mask = quantity_factory.zeros(
[X_DIM, Y_DIM, Z_DIM],
Expand Down
4 changes: 1 addition & 3 deletions tests/savepoint/translate/translate_microphysics.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ def compute(self, inputs):
layout=self.config.layout,
)

quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
)
quantity_factory = QuantityFactory(sizer, backend=self.stencil_factory.backend)
physics_state = PhysicsState.init_from_storages(
inputs,
sizer=sizer,
Expand Down
8 changes: 4 additions & 4 deletions tests/savepoint/translate/translate_mp_full.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,8 @@ def __init__(
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

def compute(self, inputs):
Expand Down Expand Up @@ -697,8 +697,8 @@ def __init__(
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
sizer, backend=self.stencil_factory.backend
)

def compute(self, inputs):
Expand Down
4 changes: 2 additions & 2 deletions tests/savepoint/translate/translate_particle_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,8 @@ def __init__(
layout=self.config.layout,
)

self.quantity_factory = QuantityFactory.from_backend(
self.sizer, self.stencil_factory.backend
self.quantity_factory = QuantityFactory(
self.sizer, backend=self.stencil_factory.backend
)

def compute(self, inputs):
Expand Down
4 changes: 1 addition & 3 deletions tests/savepoint/translate/translate_pbl.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ def compute(self, inputs):
layout=self.config.layout,
)

quantity_factory = QuantityFactory.from_backend(
sizer, self.stencil_factory.backend
)
quantity_factory = QuantityFactory(sizer, backend=self.stencil_factory.backend)

self.make_storage_data_input_vars(inputs)

Expand Down
Loading