Skip to content

Commit 421ecb9

Browse files
authored
refactor: use new constructor of QuantityFactory (#169)
Prefer the new constructor of `QuantityFactor` over the deprecated call to `QuantityFactor.from_backend(...)`. This removes a bunch of deprecation warnings in tests. Co-authored-by: Roman Cattaneo <1116746+romanc@users.noreply.github.com>
1 parent 57a6750 commit 421ecb9

File tree

14 files changed

+17
-17
lines changed

14 files changed

+17
-17
lines changed

docs/physics/state.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ You can initialize a zero-filled PhysicsState and MicrophysicsState from other P
3535
... tile_rank=communicator.tile.rank,
3636
... )
3737

38-
>>> quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend="numpy")
38+
>>> quantity_factory = QuantityFactory(sizer=sizer, backend="numpy")
3939
>>> physics_state = PhysicsState.init_zeros(
4040
... quantity_factory=quantity_factory, schemes=["GFS_microphysics"]
4141
... )

examples/notebooks/functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ def configure_domain(
268268
tile_rank=communicator.tile.rank,
269269
)
270270

271-
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
271+
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)
272272

273273
metric_terms = MetricTerms(
274274
quantity_factory=quantity_factory,

examples/notebooks/grid_generation.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
")\n",
189189
"\n",
190190
"# useful for easily allocating distributed data storages (fields)\n",
191-
"quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)"
191+
"quantity_factory = QuantityFactory(sizer=sizer, backend=backend)"
192192
]
193193
},
194194
{

pace/driver.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def get_grid(
177177
tile_partitioner=communicator.partitioner.tile,
178178
tile_rank=communicator.tile.rank,
179179
)
180-
quantity_factory = QuantityFactory.from_backend(
180+
quantity_factory = QuantityFactory(
181181
sizer, backend=self.stencil_config.compilation_config.backend
182182
)
183183

@@ -207,7 +207,7 @@ def get_driver_state(
207207
tile_rank=communicator.tile.rank,
208208
)
209209
if quantity_factory is None:
210-
quantity_factory = QuantityFactory.from_backend(
210+
quantity_factory = QuantityFactory(
211211
sizer, backend=self.stencil_config.compilation_config.backend
212212
)
213213
if stencil_factory is None:
@@ -760,7 +760,7 @@ def _setup_factories(
760760
grid_indexing = GridIndexing.from_sizer_and_communicator(
761761
sizer=sizer, comm=communicator
762762
)
763-
quantity_factory = QuantityFactory.from_backend(
763+
quantity_factory = QuantityFactory(
764764
sizer, backend=config.stencil_config.compilation_config.backend
765765
)
766766
stencil_factory = StencilFactory(

pace/state.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def load_state_from_restart(
9191
tile_partitioner=communicator.partitioner.tile,
9292
tile_rank=communicator.tile.rank,
9393
)
94-
quantity_factory = QuantityFactory.from_backend(
94+
quantity_factory = QuantityFactory(
9595
sizer, backend=driver_config.stencil_config.compilation_config.backend
9696
)
9797

tests/main/driver/test_diagnostics_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_zselect_raises_error_if_not_3d(tmpdir):
4242
z_select=[ZSelect(level=0, names=["phis"])],
4343
)
4444
result = config.diagnostics_factory(unittest.mock.MagicMock())
45-
quantity_factory = QuantityFactory.from_backend(
45+
quantity_factory = QuantityFactory(
4646
sizer=SubtileGridSizer.from_tile_params(
4747
nx_tile=12,
4848
ny_tile=12,
@@ -63,7 +63,7 @@ def test_zselect_raises_error_if_3rd_dim_not_z(tmpdir):
6363
z_select=[ZSelect(level=0, names=["foo"])],
6464
)
6565
result = config.diagnostics_factory(unittest.mock.MagicMock())
66-
quantity_factory = QuantityFactory.from_backend(
66+
quantity_factory = QuantityFactory(
6767
sizer=SubtileGridSizer.from_tile_params(
6868
nx_tile=12,
6969
ny_tile=12,

tests/main/driver/test_restart_fortran.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_state_from_fortran_restart():
3535
tile_rank=0,
3636
)
3737

38-
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend="numpy")
38+
quantity_factory = QuantityFactory(sizer=sizer, backend="numpy")
3939
restart_dir = REPO_ROOT / "tests" / "main" / "data" / "c12_restart"
4040

4141
(

tests/main/driver/test_restart_serial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_restart_save_to_disk():
6767
tile_partitioner=partitioner.tile,
6868
tile_rank=communicator.tile.rank,
6969
)
70-
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
70+
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)
7171

7272
eta_file = Path(driver_config.grid_config.config.eta_file)
7373
(

tests/main/fv3core/test_dycore_baroclinic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def setup_dycore(
112112
grid_indexing = GridIndexing.from_sizer_and_communicator(
113113
sizer=sizer, comm=communicator
114114
)
115-
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
115+
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)
116116
eta_file = "NDSL/tests/data/eta/eta79.nc"
117117
metric_terms = MetricTerms(
118118
quantity_factory=quantity_factory,

tests/main/fv3core/test_dycore_call.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def setup_dycore() -> Tuple[DynamicalCore, DycoreState, Timer]:
9696
grid_indexing = GridIndexing.from_sizer_and_communicator(
9797
sizer=sizer, comm=communicator
9898
)
99-
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
99+
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)
100100
eta_file = Path("NDSL/tests/data/eta/eta79.nc")
101101
metric_terms = MetricTerms(
102102
quantity_factory=quantity_factory,

0 commit comments

Comments
 (0)