Merge pull request #36 from umr-lops/fix_issue_sept23

fix lib issues
umr-lops · Sep 13, 2023 · 4ff9664 · 4ff9664
2 parents 4e18633 + 12a802a
commit 4ff9664
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 646 deletions.
diff --git a/docs/examples/wind-inversion-from-grd.ipynb b/docs/examples/wind-inversion-from-grd.ipynb
@@ -5,20 +5,20 @@
    "id": "e578297a-d2dc-4cb4-b016-1181649d227b",
    "metadata": {},
    "source": [
-    "# Example of Wind inversion"
+    "## Example of Wind inversion"
    ]
   },
   {
    "cell_type": "markdown",
    "id": "fa19ad8e-ebaa-430e-bd91-c21d517e7e88",
    "metadata": {},
    "source": [
-    "## define a product GRD Sentinel-1"
+    "### define a product GRD Sentinel-1"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "ef483f15-4690-460b-b688-fa966bab8cd8",
    "metadata": {},
    "outputs": [],
@@ -28,21 +28,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "e04fa1b0-eb49-4e45-af0f-0be798e26f95",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'/tmp/S1A_IW_GRDH_1SDV_20170907T103020_20170907T103045_018268_01EB76_Z010.SAFE'"
-      ]
-     },
-     "execution_count": 2,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "input_file = xsar.get_test_file('S1A_IW_GRDH_1SDV_20170907T103020_20170907T103045_018268_01EB76_Z010.SAFE')\n",
     "input_file"
@@ -53,18 +42,17 @@
    "id": "f4886386-b19a-4c43-a790-192f4866a692",
    "metadata": {},
    "source": [
-    "# perform wind inversion"
+    "### perform wind inversion"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "id": "d3fda3a2-2ee6-4401-be8f-c0fab8344a49",
    "metadata": {},
    "outputs": [],
    "source": [
-    "from grdwindinversion.inversion import makeL2\n",
-    "from grdwindinversion.degrade import * \n",
+    "from grdwindinversion.inversion import makeL2 \n",
     "\n"
    ]
   },
@@ -73,23 +61,15 @@
    "id": "c8924754-34f5-4a27-a598-492022b3b3f5",
    "metadata": {},
    "source": [
-    "# define config file"
+    "### define config file"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "id": "f95ee426-0b46-4d39-ae90-241e8bbaa332",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "True\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import grdwindinversion\n",
     "import os\n",
@@ -100,7 +80,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": null,
    "id": "3cbe649d-44d7-4a7f-9041-137092a61e07",
    "metadata": {},
    "outputs": [],
@@ -110,48 +90,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "id": "27bc671b-d78c-4d70-b898-eac4093253e0",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "\u001b[0;31mSignature:\u001b[0m \u001b[0mmakeL2\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfilename\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mout_folder\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mconfig_path\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-       "\u001b[0;31mDocstring:\u001b[0m <no docstring>\n",
-       "\u001b[0;31mFile:\u001b[0m      ~/Documents/sources/grdwindinversion/grdwindinversion/inversion.py\n",
-       "\u001b[0;31mType:\u001b[0m      function"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
+   "outputs": [],
    "source": [
     "makeL2?"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": null,
    "id": "b90c78bb-8643-4d64-a463-28fcb68d9b38",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO:xsar.utils:BlockingActorProxy: Transparent proxy for from_dict\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "local variable 'map_model' referenced before assignment\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "out_file = makeL2(input_file,out_folder, config_path=config_file_s1)\n",
     "out_file"
@@ -160,9 +112,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "micromamba1",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "micromamba1"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -174,7 +126,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.9.15"
   }
  },
  "nbformat": 4,

diff --git a/docs/modules.rst b/docs/modules.rst
@@ -16,10 +16,6 @@ processing
 ==========
 
 
-
-.. automodule:: grdwindinversion.degrade
-    :members: createLowerResL2
-
 .. automodule:: grdwindinversion.inversion
     :members: getSensorMetaDataset, getOutputName2, makeL2
 

diff --git a/grdwindinversion/__init__.py b/grdwindinversion/__init__.py
@@ -1,4 +1,4 @@
-__all__ = ['degrade', 'inversion']
+__all__ = ['inversion']
 # try:
 #     from importlib import metadata
 # except ImportError: # for Python<3.8