Merge branch 'master' into error_when_dt_too_high_precision

erikvansebille · web-flow · commit 2749bc89d23d · 2024-05-24T08:54:30.000+02:00
diff --git a/docs/environment_docs.yml b/docs/environment_docs.yml
@@ -23,7 +23,7 @@ dependencies:
   - nbval
   - scikit-learn
   - pykdtree
-  - zarr>=2.11.0
+  - zarr>=2.11.0,<2.18.0
 
   # Formatting
   - black
diff --git a/docs/examples/tutorial_parcels_structure.ipynb b/docs/examples/tutorial_parcels_structure.ipynb
@@ -450,7 +450,7 @@
    "source": [
     "### For more tutorials on MPI and parallelisation:\n",
     "\n",
-    "- [Optimising the partitioning of the particles with a user-defined `partition_function`](https://docs.oceanparcels.org/en/latest/examples/documentation_MPI.html#Optimising-the-partitioning-of-the-particles-with-a-user-defined-partition_function)\n",
+    "- [Optimising the partitioning of the particles with a user-defined partition function](https://docs.oceanparcels.org/en/latest/examples/documentation_MPI.html#Optimising-the-partitioning-of-the-particles-with-a-user-defined-partition_function)\n",
     "- [Future developments: load balancing](https://docs.oceanparcels.org/en/latest/examples/documentation_MPI.html#Future-developments:-load-balancing)"
    ]
   },
diff --git a/environment.yml b/environment.yml
@@ -25,7 +25,7 @@ dependencies:
   - nbval
   - scikit-learn
   - pykdtree
-  - zarr>=2.11.0
+  - zarr>=2.11.0,!=2.18.0
 
   # Formatting
   - black

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@`
`450`	`450`	`"source": [`
`451`	`451`	`"### For more tutorials on MPI and parallelisation:\n",`
`452`	`452`	`"\n",`
`453`		- "- [Optimising the partitioning of the particles with a user-defined `partition_function`](https://docs.oceanparcels.org/en/latest/examples/documentation_MPI.html#Optimising-the-partitioning-of-the-particles-with-a-user-defined-partition_function)\n",
	`453`	`+ "- [Optimising the partitioning of the particles with a user-defined partition function](https://docs.oceanparcels.org/en/latest/examples/documentation_MPI.html#Optimising-the-partitioning-of-the-particles-with-a-user-defined-partition_function)\n",`
`454`	`454`	`"- [Future developments: load balancing](https://docs.oceanparcels.org/en/latest/examples/documentation_MPI.html#Future-developments:-load-balancing)"`
`455`	`455`	`]`
`456`	`456`	`},`