Merge pull request #157 from rcjackson/parallel_scipy

Fix issues with adding the units and long name to output wind fields

Author: rcjackson

pydda/__init__.py

@@ -12,7 +12,7 @@
 from . import constraints
 from . import io
 
-__version__ = "2.4.0"
+__version__ = "2.4.1"
 
 print("Welcome to PyDDA %s" % __version__)
 print("If you are using PyDDA in your publications, please cite:")

pydda/retrieval/wind_retrieve.py

@@ -748,17 +748,20 @@ def loss_and_gradient(x):
 
     u_field = {}
     u_field["standard_name"] = "u_wind"
-    u_field["long_name"] = "meridional component of wind velocity"
+    u_field["long_name"] = "zonal component of wind velocity"
+    u_field["units"] = "m/s"
     u_field["min_bca"] = min_bca
     u_field["max_bca"] = max_bca
     v_field = {}
     v_field["standard_name"] = "v_wind"
-    v_field["long_name"] = "zonal component of wind velocity"
+    v_field["long_name"] = "meridional component of wind velocity"
+    v_field["units"] = "m/s"
     v_field["min_bca"] = min_bca
     v_field["max_bca"] = max_bca
     w_field = {}
     w_field["standard_name"] = "w_wind"
     w_field["long_name"] = "vertical component of wind velocity"
+    w_field["units"] = "m/s"
     w_field["min_bca"] = min_bca
     w_field["max_bca"] = max_bca
 
@@ -1270,17 +1273,20 @@ def _get_dd_wind_field_tensorflow(
 
     u_field = {}
     u_field["standard_name"] = "u_wind"
-    u_field["long_name"] = "meridional component of wind velocity"
+    u_field["long_name"] = "zonal component of wind velocity"
+    u_field["units"] = "m/s"
     u_field["min_bca"] = min_bca
     u_field["max_bca"] = max_bca
     v_field = {}
     v_field["standard_name"] = "v_wind"
-    v_field["long_name"] = "zonal component of wind velocity"
+    v_field["long_name"] = "meridional component of wind velocity"
+    v_field["units"] = "m/s"
     v_field["min_bca"] = min_bca
     v_field["max_bca"] = max_bca
     w_field = {}
     w_field["standard_name"] = "w_wind"
     w_field["long_name"] = "vertical component of wind velocity"
+    w_field["units"] = "m/s"
     w_field["min_bca"] = min_bca
     w_field["max_bca"] = max_bca
 

setup.py

@@ -42,7 +42,7 @@
 PLATFORMS = "Linux, Windows, OSX"
 MAJOR = 2
 MINOR = 4
-MICRO = 0
+MICRO = 1
 
 # SCRIPTS = glob.glob('scripts/*')
 # TEST_SUITE = 'nose.collector'