erge branch 'issue-#26'

meom-group · Nov 7, 2023 · 40cb600 · 40cb600
2 parents f64d444 + c7f25e7
commit 40cb600
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/jaxparrow/tools/__init__.py b/jaxparrow/tools/__init__.py
@@ -1,4 +1,4 @@
-from .tools import compute_coriolis_factor, compute_derivative, compute_spatial_step
+from .tools import compute_coriolis_factor, compute_spatial_step
 from . import tools
 
-__all__ = ["compute_coriolis_factor", "compute_derivative", "compute_spatial_step", "tools"]
+__all__ = ["compute_coriolis_factor", "compute_spatial_step", "tools"]
diff --git a/jaxparrow/tools/tools.py b/jaxparrow/tools/tools.py
@@ -12,7 +12,7 @@
 GRAVITY = 9.81
 P0 = np.pi / 180
 
-__all__ = ["compute_coriolis_factor", "compute_derivative", "compute_spatial_step"]
+__all__ = ["compute_coriolis_factor", "compute_spatial_step"]
 
 
 # =============================================================================

diff --git a/notebooks/alboran_sea.ipynb b/notebooks/alboran_sea.ipynb
@@ -6,8 +6,8 @@
    "id": "5c55152f",
    "metadata": {
     "ExecuteTime": {
-     "end_time": "2023-11-06T15:27:31.340126Z",
-     "start_time": "2023-11-06T15:27:29.665130Z"
+     "end_time": "2023-11-07T05:12:05.132292Z",
+     "start_time": "2023-11-07T05:12:03.296372Z"
     }
    },
    "outputs": [],
@@ -20,7 +20,7 @@
     "import numpy.ma as ma\n",
     "import xarray as xr\n",
     "\n",
-    "from jaxparrow.tools import compute_coriolis_factor, compute_derivative, compute_spatial_step\n",
+    "from jaxparrow.tools import compute_coriolis_factor, compute_spatial_step\n",
     "from jaxparrow import cyclogeostrophy, geostrophy\n",
     "\n",
     "%reload_ext autoreload\n",
@@ -29,7 +29,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 3,
    "outputs": [],
    "source": [
     "# utility functions\n",
@@ -40,6 +40,7 @@
     "    return true - estimate\n",
     "\n",
     "\n",
+    "from jaxparrow.tools.tools import compute_derivative\n",
     "def compute_norm_vorticity(u: np.ndarray, v: np.ndarray, dy_u: np.ndarray, dx_v: np.ndarray, \n",
     "                           mask: np.ndarray, f: np.ndarray) -> np.ma.masked_array:\n",
     "    du_dy = compute_derivative(u, dy_u, axis=0)\n",
@@ -49,8 +50,8 @@
    "metadata": {
     "collapsed": false,
     "ExecuteTime": {
-     "end_time": "2023-11-06T15:27:31.360491Z",
-     "start_time": "2023-11-06T15:27:31.343321Z"
+     "end_time": "2023-11-07T05:12:36.638398Z",
+     "start_time": "2023-11-07T05:12:36.315662Z"
     }
    },
    "id": "2c973169ddf279c2"

diff --git a/notebooks/alboran_sea/alboran_sea.md b/notebooks/alboran_sea/alboran_sea.md
@@ -9,7 +9,7 @@ import numpy as np
 import numpy.ma as ma
 import xarray as xr
 
-from jaxparrow.tools import compute_coriolis_factor, compute_derivative, compute_spatial_step
+from jaxparrow.tools import compute_coriolis_factor, compute_spatial_step
 from jaxparrow import cyclogeostrophy, geostrophy
 ```
 
@@ -22,6 +22,7 @@ def dist(true: np.ndarray, estimate: np.ndarray) -> np.ndarray:
     return true - estimate
 
 
+from jaxparrow.tools.tools import compute_derivative
 def compute_norm_vorticity(u: np.ndarray, v: np.ndarray, dy_u: np.ndarray, dx_v: np.ndarray, 
                            mask: np.ndarray, f: np.ndarray) -> np.ma.masked_array:
     du_dy = compute_derivative(u, dy_u, axis=0)