diff --git a/docs/conf.py b/docs/conf.py
index 9af6eb0457..c900c10e27 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -43,6 +43,7 @@
"myst_parser",
"nbsphinx",
"numpydoc",
+ "sphinxcontrib.mermaid",
]
# Add any paths that contain templates here, relative to this directory.
@@ -207,6 +208,7 @@
"type": "fontawesome",
}
],
+ "announcement": "WARNING: This documentation is built for v4 of Parcels, which is unreleased and in active development. Use the version switcher in the bottom right to select your version of Parcels, or see stable docs.",
}
html_context = {
diff --git a/docs/index.rst b/docs/index.rst
index a943b9ec11..5e6b07026c 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,11 +1,6 @@
Parcels documentation
=====================
-.. danger::
-
- This documentation is built for v4 of Parcels, which is unreleased
- and in active development. Use the version switcher in the bottom
- right to select your version of Parcels.
Welcome to the documentation of Parcels. **Parcels** (Probably A Really Computationally Efficient Lagrangian Simulator) is a set of Python classes and methods to create customisable particle tracking simulations using output from Ocean Circulation models. Parcels can be used to track passive and active particulates such as water, plankton, `plastic `_ and `fish `_.
@@ -22,6 +17,7 @@ If you need more help with Parcels, try the `Discussions page on GitHub
+ v4
Installation
Tutorials & Documentation
API reference
diff --git a/docs/v4/api.md b/docs/v4/api.md
new file mode 100644
index 0000000000..63eed0704d
--- /dev/null
+++ b/docs/v4/api.md
@@ -0,0 +1,43 @@
+# API design document
+
+## Field data input
+
+Here is the proposed API for Field data ingestion into Parcels.
+
+```{mermaid}
+
+classDiagram
+ class Fieldset{
+ +List[Field] fields
+ }
+ class Field{
+ +xr.Dataset|xr.DataArray|ux.Dataset|ux.DataArray data
+ +parcels.Grid|ux.Grid grid
+ +Interpolator interpolator
+ +eval(t, z, y, x, particle=None, applyConversion=True)
+ }
+
+ class Interpolator{
+ +assert_is_compatible(Field)
+ +interpolate(Field, rid, t, z, y, x )
+ }
+
+
+ <> Interpolator
+
+ Fieldset ..> Field : depends on
+ Field ..> Interpolator : depends on
+ Interpolator <|.. ScalarInterpolator : Realization of
+ Interpolator <|.. VectorInterpolator : Realization of
+ Interpolator <|.. etc : Realization of
+```
+
+Here, important things to note are:
+
+- Interpolators (which would implement the `Interpolator` protocol) are responsible for the actual interpolation of the data, and performance considerations. There will be interpolation and indexing utilities that can be made available to the interpolators, allowing for code re-use.
+
+- In the `Field` class, not all combinations of `data`, `grid`, and `interpolator` will logically make sense (e.g., a `xr.DataArray` on a `ux.Grid`, or `ux.DataArray` on a `parcels.Grid`). It's up to the `Interpolator.assert_is_compatible(Field)` to define what is and is not compatible, and raise `ValueError` / `TypeError` on incompatible data types. The `.assert_is_compatible()` method also acts as developer documentation, defining clearly for the `.interpolate()` method what assumptions it is working on. The `.assert_is_compatible()` method should be lightweight as it will be called on `Field` initialisation.
+
+- The `grid` object, in the case of unstructured grids, will be the `Grid` class from UXarray. For structured `Grid`s, it will be an object similar to that of `xgcm.Grid` (note that it will be very different from the v3 `Grid` object hierarchy).
+
+- The `Field.eval` method takes as input the t,z,y,x spatio-temporal position as required arguments; the `particle` is optional and defaults to `None` and the `applyConversion` argument is optional and defaults to `True`. Initially, we will calculate the element index for a particle. As a future optimization, we could pass via the `particle` object a "cached" index value that could be used to bypass an index search. This will effectively provide `(ti,zi,yi,xi)` on a structured grid and `(ti,zi,fi)` on an unstructured grid (where `fi` is the lateral face id); within `eval` these indices will be `ravel`'ed to a single index that can be `unravel`'ed in the `interpolate` method. The `ravel`'ed index is referred to as `rid` in the `Field.Interpolator.interpolate` method. In the `interpolate` method, we envision that a user will benefit from knowing the nearest cell/index from the `ravel`'ed index (which can be `unravel`'ed) in addition the exact coordinate that we want to interpolate onto. This can permit calculation of interpolation weights using points in the neighborhood of `(t,z,y,x)`.
diff --git a/docs/v4/index.md b/docs/v4/index.md
new file mode 100644
index 0000000000..1c7fcb0604
--- /dev/null
+++ b/docs/v4/index.md
@@ -0,0 +1,13 @@
+# v4 development
+
+This is a central hub to discuss the development of v4. As development progresses, some of the pages mentioned here will be incorporated into the main documentation.
+
+You can think of this as a "living" document as we work towards the release of v4.
+
+Collaboration on v4 development is happening on the [Parcels v4 Project Board](https://github.com/orgs/OceanParcels/projects/5).
+
+```{toctree}
+
+api
+Parcels v4 Project Board
+```
diff --git a/environment.yml b/environment.yml
index 04eaad6b99..276acb0e2f 100644
--- a/environment.yml
+++ b/environment.yml
@@ -46,3 +46,4 @@ dependencies:
- pydata-sphinx-theme
- sphinx-autobuild
- myst-parser
+ - sphinxcontrib-mermaid