Physics use GridData #46
Conversation
| @@ -146,8 +151,20 @@ def __call__( | |||
| self._dt, | |||
| ) | |||
| # [TODO] needs a better solution to handle u_dt, v_dt quantity | |||
| u_dt_quantity = self.grid.make_quantity(u_dt) | |||
| v_dt_quantity = self.grid.make_quantity(v_dt) | |||
| u_dt_quantity = fv3gfs.util.Quantity( | |||
There was a problem hiding this comment.
Still a TODO for later but yeah, we should really not have to make a quantity to turn into a storage and then back into a quantity.
There was a problem hiding this comment.
This should go away when we have proper PhysicsState, and each variable has a quantity and storage.
| namelist, | ||
| comm: fv3gfs.util.CubedSphereCommunicator, | ||
| partitioner: TilePartitioner, | ||
| rank, |
There was a problem hiding this comment.
| rank, | |
| rank: int, |
| partitioner: TilePartitioner, | ||
| rank, | ||
| namelist, | ||
| grid_info, |
There was a problem hiding this comment.
For my reference, what is grid_info and why is it everywhere?
There was a problem hiding this comment.
This is the missing grid info that is currently provided by serialized data. We just haven't gotten around using MetricTerms in physics, will do that in a separate PR.
| self, | ||
| stencil_factory: StencilFactory, | ||
| partitioner: TilePartitioner, | ||
| rank, |
There was a problem hiding this comment.
| rank, | |
| rank: int, |
What's the type hint on namelist? It can't be Namelist since that will be owned by pace.driver.
There was a problem hiding this comment.
We need to make config classes for Physics, so this is the old global spec.namelist. Need another PR for this.
| ) | ||
| self._update_vwind_stencil = stencil_factory.from_origin_domain( | ||
| update_vwind_stencil, | ||
| origin=(self.grid.halo, self.grid.halo, 0), | ||
| domain=(self.grid.nic + 1, self.grid.njc, self.grid.npz), | ||
| origin=(grid_indexing.n_halo, grid_indexing.n_halo, 0), |
There was a problem hiding this comment.
So much indexing logic we have to do here! At least it gets cached since it's done on init.
| @@ -68,7 +68,9 @@ def compute(self, inputs): | |||
| inputs["va_t1"] = copy.deepcopy(storage) | |||
| inputs["omga"] = copy.deepcopy(storage) | |||
| physics_state = PhysicsState(**inputs) | |||
| microph = Microphysics(self.grid.stencil_factory, self.grid, spec.namelist) | |||
| microph = Microphysics( | |||
There was a problem hiding this comment.
nit: Might as well spell out microphysics?
| @@ -1,6 +1,7 @@ | |||
| import numpy as np | |||
|
|
|||
| import fv3core._config as spec | |||
| import pace.util as util | |||
There was a problem hiding this comment.
nit: it's a bit clearer to just import pace.util, there are a variety of things util means in our different modules.
In this PR, we replace the use of Grid in Physics with GridIndexing and GridData.
update_dwind_phys.py, references to missing Grid functions are added here since this is the only spot that uses them. E.g., global_to_local_1d