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 docs/physics/state.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ You can initialize a zero-filled PhysicsState and MicrophysicsState from other P
... tile_rank=communicator.tile.rank,
... )

>>> quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend="numpy")
>>> quantity_factory = QuantityFactory(sizer=sizer, backend="numpy")
>>> physics_state = PhysicsState.init_zeros(
... quantity_factory=quantity_factory, schemes=["GFS_microphysics"]
... )
Expand Down
2 changes: 1 addition & 1 deletion examples/notebooks/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def configure_domain(
tile_rank=communicator.tile.rank,
)

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

metric_terms = MetricTerms(
quantity_factory=quantity_factory,
Expand Down
2 changes: 1 addition & 1 deletion examples/notebooks/grid_generation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
")\n",
"\n",
"# useful for easily allocating distributed data storages (fields)\n",
"quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)"
"quantity_factory = QuantityFactory(sizer=sizer, backend=backend)"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions pace/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def get_grid(
tile_partitioner=communicator.partitioner.tile,
tile_rank=communicator.tile.rank,
)
quantity_factory = QuantityFactory.from_backend(
quantity_factory = QuantityFactory(
sizer, backend=self.stencil_config.compilation_config.backend
)

Expand Down Expand Up @@ -207,7 +207,7 @@ def get_driver_state(
tile_rank=communicator.tile.rank,
)
if quantity_factory is None:
quantity_factory = QuantityFactory.from_backend(
quantity_factory = QuantityFactory(
sizer, backend=self.stencil_config.compilation_config.backend
)
if stencil_factory is None:
Expand Down Expand Up @@ -760,7 +760,7 @@ def _setup_factories(
grid_indexing = GridIndexing.from_sizer_and_communicator(
sizer=sizer, comm=communicator
)
quantity_factory = QuantityFactory.from_backend(
quantity_factory = QuantityFactory(
sizer, backend=config.stencil_config.compilation_config.backend
)
stencil_factory = StencilFactory(
Expand Down
2 changes: 1 addition & 1 deletion pace/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def load_state_from_restart(
tile_partitioner=communicator.partitioner.tile,
tile_rank=communicator.tile.rank,
)
quantity_factory = QuantityFactory.from_backend(
quantity_factory = QuantityFactory(
sizer, backend=driver_config.stencil_config.compilation_config.backend
)

Expand Down
4 changes: 2 additions & 2 deletions tests/main/driver/test_diagnostics_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_zselect_raises_error_if_not_3d(tmpdir):
z_select=[ZSelect(level=0, names=["phis"])],
)
result = config.diagnostics_factory(unittest.mock.MagicMock())
quantity_factory = QuantityFactory.from_backend(
quantity_factory = QuantityFactory(
sizer=SubtileGridSizer.from_tile_params(
nx_tile=12,
ny_tile=12,
Expand All @@ -63,7 +63,7 @@ def test_zselect_raises_error_if_3rd_dim_not_z(tmpdir):
z_select=[ZSelect(level=0, names=["foo"])],
)
result = config.diagnostics_factory(unittest.mock.MagicMock())
quantity_factory = QuantityFactory.from_backend(
quantity_factory = QuantityFactory(
sizer=SubtileGridSizer.from_tile_params(
nx_tile=12,
ny_tile=12,
Expand Down
2 changes: 1 addition & 1 deletion tests/main/driver/test_restart_fortran.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_state_from_fortran_restart():
tile_rank=0,
)

quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend="numpy")
quantity_factory = QuantityFactory(sizer=sizer, backend="numpy")
restart_dir = REPO_ROOT / "tests" / "main" / "data" / "c12_restart"

(
Expand Down
2 changes: 1 addition & 1 deletion tests/main/driver/test_restart_serial.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_restart_save_to_disk():
tile_partitioner=partitioner.tile,
tile_rank=communicator.tile.rank,
)
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)

eta_file = Path(driver_config.grid_config.config.eta_file)
(
Expand Down
2 changes: 1 addition & 1 deletion tests/main/fv3core/test_dycore_baroclinic.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def setup_dycore(
grid_indexing = GridIndexing.from_sizer_and_communicator(
sizer=sizer, comm=communicator
)
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)
eta_file = "NDSL/tests/data/eta/eta79.nc"
metric_terms = MetricTerms(
quantity_factory=quantity_factory,
Expand Down
2 changes: 1 addition & 1 deletion tests/main/fv3core/test_dycore_call.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def setup_dycore() -> Tuple[DynamicalCore, DycoreState, Timer]:
grid_indexing = GridIndexing.from_sizer_and_communicator(
sizer=sizer, comm=communicator
)
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)
eta_file = Path("NDSL/tests/data/eta/eta79.nc")
metric_terms = MetricTerms(
quantity_factory=quantity_factory,
Expand Down
2 changes: 1 addition & 1 deletion tests/main/physics/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def setup_physics():
grid_indexing = GridIndexing.from_sizer_and_communicator(
sizer=sizer, comm=communicator
)
quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
quantity_factory = QuantityFactory(sizer=sizer, backend=backend)
dace_config = DaceConfig(
communicator=communicator,
backend=backend,
Expand Down
2 changes: 1 addition & 1 deletion tests/main/test_grid_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def get_cube_comm(layout, rank: int):
def get_quantity_factory(layout, nx_tile, ny_tile, nz):
nx = nx_tile // layout[0]
ny = ny_tile // layout[1]
return QuantityFactory.from_backend(
return QuantityFactory(
sizer=SubtileGridSizer.from_tile_params(
nx_tile=nx,
ny_tile=ny,
Expand Down
2 changes: 1 addition & 1 deletion tests/mpi/test_grid_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def get_cube_comm(layout, comm: MPIComm):
def get_quantity_factory(layout, nx_tile, ny_tile, nz):
nx = nx_tile // layout[0]
ny = ny_tile // layout[1]
return QuantityFactory.from_backend(
return QuantityFactory(
sizer=SubtileGridSizer.from_tile_params(
nx=nx, ny=ny, nz=nz, n_halo=3, layout=(1, 1)
),
Expand Down
2 changes: 1 addition & 1 deletion tests/savepoint/translate/translate_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def compute_parallel(self, inputs, communicator):
tile_rank=communicator.tile.rank,
)

quantity_factory = QuantityFactory.from_backend(
quantity_factory = QuantityFactory(
sizer, backend=self.stencil_config.compilation_config.backend
)
physics_state = PhysicsState.init_zeros(
Expand Down