From 183e8f0babb0d6dafcb34e50e3e74cee6a64c890 Mon Sep 17 00:00:00 2001 From: "Navid C. Constantinou" Date: Fri, 16 Feb 2024 10:44:48 +0200 Subject: [PATCH 1/4] reorder doc contents --- docs/index.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 0f3ad776..7b5c3008 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2,17 +2,21 @@ Regional MOM6 Documentation =========================== ``regional_mom6`` is a Python package for automatic generation of regional -configurations for the Modular Ocean Model 6 +configurations for the `Modular Ocean Model 6`_. + +Get the latest news at `CNN`_. + +.. _Modular Ocean Model 6: https://github.com/mom-ocean/MOM6 .. toctree:: :maxdepth: 1 :caption: Contents: installation - contributing - api demos - + api + contributing + Indices and tables ================== From cd9d36ee777c24cadc65f5df27a051c66693dedd Mon Sep 17 00:00:00 2001 From: "Navid C. Constantinou" Date: Fri, 16 Feb 2024 14:41:45 +0200 Subject: [PATCH 2/4] remove random sentence --- docs/index.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 7b5c3008..2c0144eb 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,8 +4,6 @@ Regional MOM6 Documentation ``regional_mom6`` is a Python package for automatic generation of regional configurations for the `Modular Ocean Model 6`_. -Get the latest news at `CNN`_. - .. _Modular Ocean Model 6: https://github.com/mom-ocean/MOM6 .. toctree:: From c51c66bc6a315179900f2f98c95ae2d50aee6546 Mon Sep 17 00:00:00 2001 From: "Navid C. Constantinou" Date: Tue, 20 Feb 2024 00:32:51 +0200 Subject: [PATCH 3/4] add xarray upper bound (#108) This fixes an incompatibility between xESMF and xarray --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2ab2bcb9..960156cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ dependencies = [ "netCDF4", "numpy>=1.17.0", "scipy>=1.2.0", - "xarray", + "xarray<2024.02.0", "xesmf>=0.8", "f90nml>=1.4.1", ] From c815d10d6c3b30ca8662a15ace6bb7a6331df8c7 Mon Sep 17 00:00:00 2001 From: "Navid C. Constantinou" Date: Tue, 20 Feb 2024 01:17:49 +0200 Subject: [PATCH 4/4] Remove unused imports (#104) * remove unused imports * Remove duplicated numpy import --------- Co-authored-by: Angus Gibson --- regional_mom6/regional_mom6.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/regional_mom6/regional_mom6.py b/regional_mom6/regional_mom6.py index 6a081c2e..e307c6ff 100644 --- a/regional_mom6/regional_mom6.py +++ b/regional_mom6/regional_mom6.py @@ -1,21 +1,18 @@ import numpy as np -from itertools import cycle from pathlib import Path import dask.array as da -import dask.bag as db -import numpy as np import xarray as xr import xesmf as xe import subprocess from scipy.ndimage import binary_fill_holes import netCDF4 -from dask.distributed import Client, worker_client from dask.diagnostics import ProgressBar import f90nml import datetime as dt import warnings import shutil import os + from .utils import vecdot warnings.filterwarnings("ignore")