wavyopen 0.4.4__tar.gz → 0.4.6__tar.gz

{wavyopen-0.4.4 → wavyopen-0.4.6}/.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu" ]
-        python-version: [ '3.10' ]
+        python-version: [ '3.14' ]
     steps:
       - uses: actions/checkout@v4
       - uses: conda-incubator/setup-miniconda@v3

{wavyopen-0.4.4 → wavyopen-0.4.6}/.github/workflows/python.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu", "macos"]
-        python-version: ['3.10', '3.11']
+        python-version: ['3.12', '3.14']
     env:
       COVERALLS_REPO_TOKEN: xIILGI4RaHRkMSqLgZN8taBLNMaMNrBzD
     steps:
@@ -37,7 +37,7 @@ jobs:
           pytest --junitxml=test-results/junit.xml --cov=wavy -v --log-cli-level=debug -m 'not need_credentials'
 
       - name: Upload to Coveralls
-        if: matrix.python-version == '3.11' && matrix.os == 'ubuntu'
+        if: matrix.python-version == '3.14' && matrix.os == 'ubuntu'
         run: |
           conda activate test
           coveralls
@@ -49,7 +49,7 @@ jobs:
           python -m build -vv
 
       - name: Upload wheels
-        if: matrix.python-version == '3.11' && matrix.os == 'ubuntu'
+        if: matrix.python-version == '3.14' && matrix.os == 'ubuntu'
         uses: actions/upload-artifact@v4
         with:
           name: wheels
@@ -66,7 +66,7 @@ jobs:
           name: wheels
       - uses: conda-incubator/setup-miniconda@v3
         with:
-          python-version: '3.11'
+          python-version: '3.14'
           miniforge-version: latest
           miniforge-variant: Miniforge3
       - name: Publish to PyPi

{wavyopen-0.4.4 → wavyopen-0.4.6}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: wavyopen
-Version: 0.4.4
+Version: 0.4.6
 Summary: A package for processing/calibrating/validating wave measurements and wave model output.
 Author-email: Patrik Bohlinger <patrikb@met.no>
 License-Expression: MIT
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 License-File: LICENSE
 Requires-Dist: matplotlib>=3.5
 Requires-Dist: numpy>=1.20

{wavyopen-0.4.4 → wavyopen-0.4.6}/docs/installation.rst

@@ -2,7 +2,7 @@ Installation and setup
 ======================
 
 Installation for regular use
----------------------------
+----------------------------
 For regular use **wavy** wavy can simply be installed via pip, conda, or mamba by installing the wavyopen package. So please choose between the following options:
 
 
@@ -34,6 +34,11 @@ When activated, you can use wavyopen in any directory of your computer. In case
 
    All code examples and tutorials will assume that you have installed wavy using conda or mamba. In case you still have, from older installations or the development installation described below, environmental variables in e.g. your .bashrc that attribute paths for wavy, please remove them before you follow the installation procedure above.
 
+Installation for WEkEO
+----------------------
+Please refer to the tutorial on WEkEO [:ref:`wekeo-label`].
+
+
 Installation for development
 ----------------------------
 Installing **wavy** can be done via conda. The steps are as follows:

wavyopen-0.4.6/docs/mozambique25.rst

@@ -0,0 +1,169 @@
+Mozambique WEkEO workshop 2025
+==============================
+
+
+**wavy** installation on WEkEO
+#################################
+WEkEO (wekeo.copernicus.eu) provides a workspace where you can run scripts and Jupyter notebooks on a cloud for free. As such WEkEO is a great platform to try out **wavy** in a lightweight context. Here are some quick instructions on how to install **wavy** on WEkEO:
+
+Open a new command window on your WEkEO workspace and install python environment for wavyopen (with a python version >3.10 & <3.14):
+
+.. code-block:: bash
+
+   mamba create --name wavyopen python=3.12 --channel conda-forge
+   conda activate wavyopen
+   mamba install wavyopen
+
+.. note::
+   
+   For some reason on WEkEO you need to use **conda activate wavyopen**
+   instead of **mamba activate wavyopen**.
+
+Install jupiter kernel:
+
+.. code-block:: bash
+
+    mamba install -n wavyopen ipykernel
+
+Add it to jupyter:
+
+.. code-block:: bash
+
+   python -m ipykernel install --user --name wavyopen --display-name "Python (wavyopen)"
+
+Restart JupyterLab Kernel List and refresh your JupyterLab tab in WEkEO.
+Go to Kernel → Change Kernel, and you should see Python (wavyopen) in the list. Choose that one.
+
+
+**wavy** config files and environment
+########################################
+
+Working with **wavy** can be done in many ways but since one often has multiple, independent projects, it may make sense to follow a general workflow of creating a project directory, specifying your environment variables, preparing config files, creating scripts/notebooks. Let's go through each of these steps together:
+
+Create a project directory:
+
+   .. code::
+
+      mkdir ~/test_wavy
+      mkdir -p ~/test_wavy/config
+      mkdir -p ~/test_wavy/scripts
+      mkdir -p ~/test_wavy/data
+
+
+You can now almost proceed as usual but a minor hack needs to be made for setting your environmental variables in the invisible dot-file *.env* which is needed e.g. for the copernicus marine toolbox or to indicate the path to your config directory. To create an .env-file at the project root directory, first create a file called something visible like *envvis*.
+
+.. code::
+
+      cd ~/test_wavy
+      touch envvis
+
+Open the file and put in all information **wavy** needs like the path to your config directory:
+
+
+.. code-block:: bash
+
+    WAVY_CONFIG=
+
+
+For the use of copernicusmarine for e.g. downloading satellite data use:
+
+.. code-block:: bash
+
+    COPERNICUSMARINE_SERVICE_USERNAME=
+    COPERNICUSMARINE_SERVICE_PASSWORD=
+
+Then cp your envvis to .env, i.e.
+
+.. code-block:: bash
+
+   cp envvis .env
+
+to establish the invisible .env-file and voilà, everything should be in place.
+
+
+Downloading data satellite data
+##################################
+
+You will need to ammend your config scripts to efficiently use **wavy**. First you need to retrieve them. To do so activate wavyopen to use the command line wavy scripts:
+
+.. code-block:: bash
+
+   conda activate wavyopen
+
+For this tutorial we will need a config file for satellite retrieval and one for defining the regions. So go ahead and get them with:
+
+.. code-block:: bash
+
+      cd ~/test_wavy/config
+      wavyCFG --help
+      wavyCFG --path ./. --f satellite_cfg.yaml --t minimal
+      wavyCFG --path ./. --f region_cfg.yaml --t default
+
+Open satellite_cfg.yaml and ammend the paths for downloading (trgt_tmplt) and for wavy_input (src_tmplt). In my case the config file then looks like:
+
+.. code-block:: yaml
+
+    cmems_L3_NRT:
+        name: {s3a: s3a, s3b: s3b, c2: c2, j3: j3, h2b: h2b, h2c: h2c, al: al, cfo: cfo, s6a: s6a, swon: swon}
+        download:
+            copernicus:
+                dataset_id: cmems_obs-wave_glo_phy-swh_nrt_name-l3_PT1S
+                trgt_tmplt: '/home/jovyan/projects/test_wavy/data/sat/L3/name'
+                path_date_incr_unit: m
+                path_date_incr: 1
+                strsub: [name]
+                server: nrt.cmems-du.eu
+                time_incr: h
+        wavy_input:
+            src_tmplt: '/home/jovyan/projects/test_wavy/data/sat/L3/name'
+            fl_tmplt: null
+            strsub: [name]
+            path_date_incr_unit: m
+            path_date_incr: 1
+        reader: read_local_ncfiles
+        collector: get_remote_files_copernicusmarine
+        vardef: {Hs: VAVH, U: WIND_SPEED}
+        coords: null
+        misc: {processing_level: null, provider: null, obs_type: null}
+        tags: null
+
+**wavy** can now download satellite data executing in your command line. For a specific satellite mission you can use e.g.:
+
+.. code-block:: bash
+
+    wavyDownload --sd 20250101 --ed 20250103 --nID cmems_L3_NRT --name s3a
+
+or for all available missions:
+
+.. code-block:: bash
+
+    wavyDownload --sd 20250101 --ed 20250103 --nID cmems_L3_NRT --name all
+
+
+Process satellite data
+######################
+Now, you can start preparing python scripts or notebooks reading, processing, and plotting your data. This may look like:
+
+.. image:: ./mozambique_example_global_ipynb_crop.png
+
+Since **wavy** is quite verbose I added the line *%%capture captured_output* on top of some cells. If you like you can remove it to see what is going on under the hood. You can also introduce your custom region in region_cfg.yaml, for Mozambique choose e.g.:
+
+.. code-block:: yaml
+
+   rect:
+    mozambique: {llcrnrlon: 28.3, llcrnrlat: -27.8, urcrnrlon: 46, urcrnrlat: -10}
+
+Applied to the notebook this looks like:
+
+.. image:: ./mozambique_example_region_ipynb_crop.png
+
+
+The data you retrieved is stored in the respective objects *sco* and *mso*. You can explore the content by e.g.:
+
+.. image:: ./explore_retrieval.png
+
+.. note::
+   
+   For some reason on WEkEO you sometimes loose the name for your conda environment. In this case, type **conda env list** to find the environment you would like to use and activate it. An example is below:
+
+.. image:: ./ipynb_find_env.png

wavyopen-0.4.6/docs/tanzania25.rst

@@ -0,0 +1,169 @@
+Tanzania WEkEO workshop 2025
+============================
+
+
+**wavy** installation on WEkEO
+#################################
+WEkEO (wekeo.copernicus.eu) provides a workspace where you can run scripts and Jupyter notebooks on a cloud for free. As such WEkEO is a great platform to try out **wavy** in a lightweight context. Here are some quick instructions on how to install **wavy** on WEkEO:
+
+Open a new command window on your WEkEO workspace and install python environment for wavyopen (with a python version >3.10 & <3.14):
+
+.. code-block:: bash
+
+   mamba create --name wavyopen python=3.12 --channel conda-forge
+   conda activate wavyopen
+   mamba install wavyopen
+
+.. note::
+   
+   For some reason on WEkEO you need to use **conda activate wavyopen**
+   instead of **mamba activate wavyopen**.
+
+Install jupiter kernel:
+
+.. code-block:: bash
+
+    mamba install -n wavyopen ipykernel
+
+Add it to jupyter:
+
+.. code-block:: bash
+
+   python -m ipykernel install --user --name wavyopen --display-name "Python (wavyopen)"
+
+Restart JupyterLab Kernel List and refresh your JupyterLab tab in WEkEO.
+Go to Kernel → Change Kernel, and you should see Python (wavyopen) in the list. Choose that one.
+
+
+**wavy** config files and environment
+########################################
+
+Working with **wavy** can be done in many ways but since one often has multiple, independent projects, it may make sense to follow a general workflow of creating a project directory, specifying your environment variables, preparing config files, creating scripts/notebooks. Let's go through each of these steps together:
+
+Create a project directory:
+
+   .. code::
+
+      mkdir ~/test_wavy
+      mkdir -p ~/test_wavy/config
+      mkdir -p ~/test_wavy/scripts
+      mkdir -p ~/test_wavy/data
+
+
+You can now almost proceed as usual but a minor hack needs to be made for setting your environmental variables in the invisible dot-file *.env* which is needed e.g. for the copernicus marine toolbox or to indicate the path to your config directory. To create an .env-file at the project root directory, first create a file called something visible like *envvis*.
+
+.. code::
+
+      cd ~/test_wavy
+      touch envvis
+
+Open the file and put in all information **wavy** needs like the path to your config directory:
+
+
+.. code-block:: bash
+
+    WAVY_CONFIG=
+
+
+For the use of copernicusmarine for e.g. downloading satellite data use:
+
+.. code-block:: bash
+
+    COPERNICUSMARINE_SERVICE_USERNAME=
+    COPERNICUSMARINE_SERVICE_PASSWORD=
+
+Then cp your envvis to .env, i.e.
+
+.. code-block:: bash
+
+   cp envvis .env
+
+to establish the invisible .env-file and voilà, everything should be in place.
+
+
+Downloading data satellite data
+##################################
+
+You will need to ammend your config scripts to efficiently use **wavy**. First you need to retrieve them. To do so activate wavyopen to use the command line wavy scripts:
+
+.. code-block:: bash
+
+   conda activate wavyopen
+
+For this tutorial we will need a config file for satellite retrieval and one for defining the regions. So go ahead and get them with:
+
+.. code-block:: bash
+
+      cd ~/test_wavy/config
+      wavyCFG --help
+      wavyCFG --path ./. --f satellite_cfg.yaml --t minimal
+      wavyCFG --path ./. --f region_cfg.yaml --t default
+
+Open satellite_cfg.yaml and ammend the paths for downloading (trgt_tmplt) and for wavy_input (src_tmplt). In my case the config file then looks like:
+
+.. code-block:: yaml
+
+    cmems_L3_NRT:
+        name: {s3a: s3a, s3b: s3b, c2: c2, j3: j3, h2b: h2b, h2c: h2c, al: al, cfo: cfo, s6a: s6a, swon: swon}
+        download:
+            copernicus:
+                dataset_id: cmems_obs-wave_glo_phy-swh_nrt_name-l3_PT1S
+                trgt_tmplt: '/home/jovyan/projects/test_wavy/data/sat/L3/name'
+                path_date_incr_unit: m
+                path_date_incr: 1
+                strsub: [name]
+                server: nrt.cmems-du.eu
+                time_incr: h
+        wavy_input:
+            src_tmplt: '/home/jovyan/projects/test_wavy/data/sat/L3/name'
+            fl_tmplt: null
+            strsub: [name]
+            path_date_incr_unit: m
+            path_date_incr: 1
+        reader: read_local_ncfiles
+        collector: get_remote_files_copernicusmarine
+        vardef: {Hs: VAVH, U: WIND_SPEED}
+        coords: null
+        misc: {processing_level: null, provider: null, obs_type: null}
+        tags: null
+
+**wavy** can now download satellite data executing in your command line. For a specific satellite mission you can use e.g.:
+
+.. code-block:: bash
+
+    wavyDownload --sd 20250101 --ed 20250103 --nID cmems_L3_NRT --name s3a
+
+or for all available missions:
+
+.. code-block:: bash
+
+    wavyDownload --sd 20250101 --ed 20250103 --nID cmems_L3_NRT --name all
+
+
+Process satellite data
+######################
+Now, you can start preparing python scripts or notebooks reading, processing, and plotting your data. This may look like:
+
+.. image:: ./tanzania_example_global_ipynb_crop.png
+
+Since **wavy** is quite verbose I added the line *%%capture captured_output* on top of some cells. If you like you can remove it to see what is going on under the hood. You can also introduce your custom region in region_cfg.yaml, for Tanzania choose e.g.:
+
+.. code-block:: yaml
+
+   rect:
+    tanzania: {llcrnrlon: 38.0, llcrnrlat: -15.0, urcrnrlon: 50, urcrnrlat: 0}
+
+Applied to the notebook this looks like:
+
+.. image:: ./tanzania_example_regional_ipynb_crop.png
+
+
+The data you retrieved is stored in the respective objects *sco* and *mso*. You can explore the content by e.g.:
+
+.. image:: ./explore_retrieval.png
+
+.. note::
+   
+   For some reason on WEkEO you sometimes loose the name for your conda environment. In this case, type **conda env list** to find the environment you would like to use and activate it. An example is below:
+
+.. image:: ./ipynb_find_env.png

{wavyopen-0.4.4 → wavyopen-0.4.6}/docs/tutorials_WEkEO.rst

@@ -1,13 +1,14 @@
+.. _wekeo-label:
 **wavy** on WEkEO
 #################
 
-WEkEO (wekeo.copernicus.eu) provides a workspace where you can run scripts and Jupyter notebooks on a cloud for free. As such WEkEO is a great platform to try out wavy in a lightweight context. Here are some quick instructions on how to install **wavy** on WEkEO:
+WEkEO (wekeo.copernicus.eu) provides a workspace where you can run scripts and Jupyter notebooks on a cloud for free. As such WEkEO is a great platform to try out **wavy** in a lightweight context. Here are some quick instructions on how to install **wavy** on WEkEO:
 
-Open a new command window on your WEkEO workspace and install python environment for wavyopen:
+Open a new command window on your WEkEO workspace and install python environment for wavyopen (with a python version >3.10 & <3.14):
 
 .. code-block:: bash
 
-   mamba create --name wavyopen --channel=conda-forge
+   mamba create --name wavyopen python=3.12 --channel conda-forge
    conda activate wavyopen
    mamba install wavyopen
 
@@ -29,7 +30,7 @@ Add it to jupyter:
    python -m ipykernel install --user --name wavyopen --display-name "Python (wavyopen)"
 
 Restart JupyterLab Kernel List and refresh your JupyterLab tab in WEkEO.
-Go to Kernel → Change Kernel, and you should see Python (wavyopen) in the list.
+Go to Kernel → Change Kernel, and you should see Python (wavyopen) in the list, choose this one.
 
 Create a project directory and the usual setup with config, data, and scripts. Now, you can almost proceed as usual but a minor hack needs to be made for the invisible dot-files.
 
@@ -112,3 +113,8 @@ In the Jupyter notebook on WEkEO it may be beneficial to tune down the quite ver
 .. code-block:: bash
 
    %%capture captured_output
+
+
+.. note::
+   
+   For some reason on WEkEO the wavyopen conda environment looses its name and you cannot activate simply by **conda activate wavyopen**. In this case please query the conda environments and activate the correct one without a name like:

{wavyopen-0.4.4 → wavyopen-0.4.6}/docs/workshops.rst

@@ -17,3 +17,5 @@ Workshops and show cases
    vietnam25
    mozambique23
    mozambique24
+   mozambique25
+   tanzania25

{wavyopen-0.4.4 → wavyopen-0.4.6}/environment.yml

@@ -2,7 +2,7 @@ name: wavy
 channels:
   - conda-forge
 dependencies:
-  - python>=3.10
+  - python>=3.12
   - matplotlib>=3.5
   - numpy>=1.20
   - scipy>=1.9

{wavyopen-0.4.4 → wavyopen-0.4.6}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wavyopen"
-requires-python = ">=3.10"
-version = "0.4.4"
+requires-python = ">=3.12"
+version = "0.4.6"
 description = "A package for processing/calibrating/validating wave measurements and wave model output."
 license = "MIT"
 license-files = ["LICENSE"]
@@ -62,3 +62,12 @@ extension-pkg-whitelist="netCDF4,numpy,scipy,roaring_landmask"
 disable = "all"
 enable = "F,unreachable,duplicate-key,unnecessary-semicolon,global-variable-not-assigned,unused-variable,unused-wildcard-import,binary-op-exception,bad-format-string,anomalous-backslash-in-string,bad-open-mode,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0107,E0108,E0110,E0111,E0112,E0113,E0114,E0115,E0116,E0117,E0118,E0202,E0203,E0211,E0213,E0236,E0237,E0238,E0239,E0240,E0241,E0301,E0302,E0303,E0401,E0402,E0601,E0602,E0603,E0604,E0611,E0632,E0633,E0701,E0702,E0703,E0704,E0710,E0711,E0712,E1003,E1101,E1102,E1111,E1120,E1121,E1123,E1124,E1125,E1126,E1127,E1128,E1129,E1130,E1131,E1132,E1133,E1134,E1135,E1137,E1138,E1139,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701"
 
+[tool.setuptools.packages.find]
+include = ["wavy"]
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+"your_package_name" = ["config/*.yaml*"]  # Include all .py files in the config directory
+

{wavyopen-0.4.4 → wavyopen-0.4.6}/tests/test_filtermod.py

@@ -4,9 +4,7 @@ import yaml
 import numpy as np
 import os
 from copy import deepcopy
-from wavy.insitu_module import insitu_class as ic
-from wavy.satellite_module import satellite_class as sc
-
+from wavy import ic, sc, ms
 
 def test_filter_runmean(test_data):
     varalias = 'Hs'  # default
@@ -144,3 +142,57 @@ def test_filter_distance_to_coast(test_data):
     assert len(flst) >= 47
     assert type(sco.vars == 'xarray.core.dataset.Dataset')
     assert not 'error' in vars(sco).keys()
+
+def test_filter_landMask_ms(test_data):
+    sd = "2022-2-1 12"
+    ed = "2022-2-1 12"
+    name = ['s3a','s3b']
+    varalias = 'Hs'
+
+    # init multisat_object
+    mso = ms(sd=sd,
+         ed=ed, 
+         name=name,
+         varalias = varalias, 
+         path = [str(test_data/"L3/s3a"),
+                 str(test_data/"L3/s3b")])
+    # read data
+    mso = mso.filter_landMask()
+    assert mso.__class__.__name__ == 'multisat_class'
+    # compare number of available variables
+    vlst = list(vars(mso).keys())
+    assert len(vlst) == 18
+    # compare number of available functions
+    dlst = dir(mso)
+    flst = [n for n in dlst if n not in vlst if '__' not in n]
+    assert len(flst) >= 27
+    assert type(mso.vars == 'xarray.core.dataset.Dataset')
+    assert not 'error' in vars(mso).keys()
+
+def test_filter_distance_to_coast_ms(test_data):
+    sd = "2022-2-1 12"
+    ed = "2022-2-1 12"
+    name = ['s3a','s3b']
+    varalias = 'Hs'
+
+    # init multisat_object
+    mso = ms(sd=sd,
+         ed=ed, 
+         name=name,
+         varalias = varalias, 
+         path = [str(test_data/"L3/s3a"),
+                 str(test_data/"L3/s3b")])
+    # read data
+    mso = mso.filter_distance_to_coast(llim=50000, ulim=1000000)
+    assert mso.__class__.__name__ == 'multisat_class'
+    # compare number of available variables
+    vlst = list(vars(mso).keys())
+    assert len(vlst) == 17
+    # compare number of available functions
+    dlst = dir(mso)
+    flst = [n for n in dlst if n not in vlst if '__' not in n]
+    assert len(flst) >= 27
+    assert type(mso.vars == 'xarray.core.dataset.Dataset')
+    assert not 'error' in vars(mso).keys()
+     
+

wavyopen-0.4.6/tests/test_multisat.py

@@ -0,0 +1,27 @@
+import pytest
+from wavy import ms
+
+def test_multisat(test_data):
+    sd = "2022-2-1 12"
+    ed = "2022-2-1 12"
+    name = ['s3a','s3b']
+    varalias = 'Hs'
+
+    # init multisat_object
+    mso = ms(sd=sd,
+         ed=ed, 	
+         name=name,
+         varalias = varalias, 
+         path = [str(test_data/"L3/s3a"),
+                 str(test_data/"L3/s3b")])
+    # read data
+    assert mso.__class__.__name__ == 'multisat_class'
+    # compare number of available variables
+    vlst = list(vars(mso).keys())
+    assert len(vlst) == 17
+    # compare number of available functions
+    dlst = dir(mso)
+    flst = [n for n in dlst if n not in vlst if '__' not in n]
+    assert len(flst) >= 27
+    assert type(mso.vars == 'xarray.core.dataset.Dataset')
+    assert not 'error' in vars(mso).keys()

{wavyopen-0.4.4 → wavyopen-0.4.6}/wavy/ais_module.py

@@ -46,7 +46,7 @@ def get_AIS_data(bbox, sd=None, ed=None, minspeed=0.5):
     data = "-d '" + str(dict_data).replace("'", '"') + "'"
 
     curl_request = curl_com + url_req + head_1 + head_2 + head_3 + data
-
+   
     # get result content of curl request
     stream = os.popen(curl_request)
     output = stream.read()
@@ -56,7 +56,7 @@ def get_AIS_data(bbox, sd=None, ed=None, minspeed=0.5):
         data=dict_output["data"],
         columns=["mmsi", "datetime", "lon",
                  "lat", "x1", "x2", "x3", "x4",
-                 "x5", "x6"])
+                 "x5", "x6", "x7", "x8"])
 
     # Get ship info
     unique_mmsi = [int(mm) for mm in df_request["mmsi"].unique()]

{wavyopen-0.4.4 → wavyopen-0.4.6}/wavy/collocation_module.py

@@ -258,14 +258,19 @@ class collocation_class(qls):
     '''
 
     def __init__(self, oco=None, model=None, poi=None,
-    distlim=None, leadtime=None, **kwargs):
+    distlim=None, leadtime=None, varalias=None, **kwargs):
         print('# ----- ')
         print(" ### Initializing collocation_class object ###")
         print(" ")
         # make clones to prevent overwriting
-        self.varalias = oco.varalias
-        self.varalias_obs = oco.varalias
-        self.varalias_mod = kwargs.get('varalias', oco.varalias)
+        if varalias==None:
+            if isinstance(oco.varalias,str):
+                varalias = oco.varalias
+            else: 
+                varalias = oco.varalias[0]
+        self.varalias = varalias
+        self.varalias_obs = varalias
+        self.varalias_mod = kwargs.get('varalias_mod', varalias)
         self.model = model
         self.leadtime = leadtime
         self.oco = oco
@@ -274,7 +279,7 @@ class collocation_class(qls):
         self.obstype = str(type(oco))[8:-2]
         self.stdvarname = oco.stdvarname
         self.region = oco.region
-        self.units = variable_def[self.varalias].get('units')
+        self.units = variable_def[varalias].get('units')
         self.sd = oco.sd
         self.ed = oco.ed
         self.twin = kwargs.get('twin', oco.twin)
@@ -529,8 +534,8 @@ class collocation_class(qls):
                     tmp_dict['time'] = self.oco.vars['time'].values[idx]
                     tmp_dict['lats'] = self.oco.vars['lats'].values[idx]
                     tmp_dict['lons'] = self.oco.vars['lons'].values[idx]
-                    tmp_dict[self.oco.varalias] = \
-                        self.oco.vars[self.oco.varalias].values[idx]
+                    tmp_dict[self.varalias] = \
+                        self.oco.vars[self.varalias].values[idx]
                     mco = mc(sd=fc_date[i], ed=fc_date[i], nID=self.model,
                              leadtime=self.leadtime, varalias=self.varalias_mod,
                              **kwargs)