foxes 1.2__py3-none-any.whl → 1.2.2__py3-none-any.whl

foxes/utils/__init__.py

@@ -5,7 +5,7 @@ General utilities.
 from .wind_dir import wd2uv, wd2wdvec, wdvec2wd, uv2wd, delta_wd
 from .pandas_utils import PandasFileHelper
 from .xarray_utils import write_nc
-from .subclasses import all_subclasses
+from .subclasses import all_subclasses, new_cls, new_instance
 from .dict import Dict
 from .factory import Factory, FDict, WakeKFactory
 from .data_book import DataBook
@@ -14,7 +14,6 @@ from .geopandas_utils import read_shp, shp2csv, read_shp_polygons, shp2geom2d
 from .load import import_module, load_module
 from .exec_python import exec_python
 from .regularize import sqrt_reg
-from .windrose_plot import TabWindroseAxes
 from .tab_files import read_tab_file
 from .random_xy import random_xy_square
 from .dev_utils import print_mem

foxes/utils/subclasses.py

@@ -19,3 +19,72 @@ def all_subclasses(cls):
     return set(cls.__subclasses__()).union(
         [s for c in cls.__subclasses__() for s in all_subclasses(c)]
     )
+
+
+def new_cls(base_cls, cls_name):
+    """
+    Run-time class selector.
+
+    Parameters
+    ----------
+    base_cls: object
+        The base class
+    cls_name: string
+        Name of the class
+
+    Returns
+    -------
+    cls: object
+        The derived class
+
+    :group: utils
+
+    """
+
+    if cls_name is None:
+        return None
+
+    allc = all_subclasses(base_cls)
+    found = cls_name in [scls.__name__ for scls in allc]
+
+    if found:
+        for scls in allc:
+            if scls.__name__ == cls_name:
+                return scls
+
+    else:
+        estr = "Class '{}' not found, available classes derived from '{}' are \n {}".format(
+            cls_name, base_cls.__name__, sorted([i.__name__ for i in allc])
+        )
+        raise KeyError(estr)
+
+
+def new_instance(base_cls, cls_name, *args, **kwargs):
+    """
+    Run-time factory.
+
+    Parameters
+    ----------
+    base_cls: object
+        The base class
+    cls_name: string
+        Name of the class
+    args: tuple, optional
+        Additional parameters for the constructor
+    kwargs: dict, optional
+        Additional parameters for the constructor
+
+    Returns
+    -------
+    obj: object
+        The instance of the derived class
+
+    :group: utils
+
+    """
+
+    cls = new_cls(base_cls, cls_name)
+    if cls is None:
+        return None
+    else:
+        return cls(*args, **kwargs)

{foxes-1.2.dist-info → foxes-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 1.2
+Version: 1.2.2
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Jonas Schulte
 Maintainer: Jonas Schulte
@@ -54,7 +54,6 @@ Requires-Dist: pandas
 Requires-Dist: xarray
 Requires-Dist: scipy
 Requires-Dist: netcdf4
-Requires-Dist: windrose
 Requires-Dist: cycler
 Requires-Dist: tqdm
 Requires-Dist: pyyaml

{foxes-1.2.dist-info → foxes-1.2.2.dist-info}/RECORD

@@ -1,31 +1,31 @@
 docs/source/conf.py,sha256=72AHiaZYMAaEManz6F6WAN7TTfC01NfYlUzEWLDJVY4,12295
-examples/abl_states/run.py,sha256=_r74o2H8bZWE__faIQMlKOw_187MXh29femgLXhP8YM,4530
+examples/abl_states/run.py,sha256=U6_XnVmG_76z91vHS1rOH8YjPDpichqzP8v-sTPEmGs,4594
 examples/compare_rotors_pwakes/run.py,sha256=EAODYtY4ZMJnmon4OSBmUBOle41OqUwaCPY3t-RZKEY,6643
 examples/compare_wakes/run.py,sha256=WFn74BBkPNOStdBvKR3mN3kv34M7u-SAmWTwtgqxUqA,7355
 examples/dyn_wakes/run.py,sha256=ApJgpdppzI35wOVGxDO5i1XeOw0HLOiyJt2aUWc5b0I,8698
 examples/field_data_nc/run.py,sha256=bGC2KAKy2vqPvHtus93wEuxEFd_TZl1VZgyVU3CQFQI,3484
-examples/induction/run.py,sha256=FnfzFJj5i3xB8myje2U8j1Sj7UfHjHwaPfi9VOvyqts,6270
+examples/induction/run.py,sha256=eTxEdKJ_8MtYuxI0QNECqJ31x-zb9Zen5bUpwPtujPE,6334
 examples/multi_height/run.py,sha256=KsY5tN8z9QHitQQdxnTjHzPSPlYPn5pkcMskjd94D74,3288
 examples/power_mask/run.py,sha256=YK8RU0TLd7TgBJkPZQVrn8log-UQNZ7L3B3-yE8qu64,7584
-examples/random_timeseries/run.py,sha256=UMB8VQL3DlDoUO_zsU21e20o5fFtF2BOQNfq4BiBc-A,6130
-examples/scan_row/run.py,sha256=nWGm1M4yJzYaAoEe1PbxLCmQD6b34Xr2C-a4sCNUdmU,5700
-examples/sector_management/run.py,sha256=Lyu69rs4IxlBBPy2r3go8xHu443K-wV-AfbZVBZ7yb0,4368
+examples/random_timeseries/run.py,sha256=bo-fLF647mc97we30ci9klw23kXISk4KtCBxRc1lIqA,6106
+examples/scan_row/run.py,sha256=japzROlgEa71u2KYy03bQ8dBso-ejURUV3vZsg5m3AI,5844
+examples/sector_management/run.py,sha256=WQvrHqtC7_u6JvZfbRsVSb3SPYDjCp-ZJpC-nZsQf5M,4451
 examples/sequential/run.py,sha256=CnNGrHp9OzijuQ0GFRN5FWW-RR4h9UBHvu5S9U3j0ac,5974
-examples/single_state/run.py,sha256=zdtFG_GuXI1dUJO0mbEBVxXhQiOG4zZP6h25ySx1KJU,6093
+examples/single_state/run.py,sha256=MtqCJxkVZAOcAlu2BhJaq7AoOVAErgxbzHpmtmMs4As,6157
 examples/states_lookup_table/run.py,sha256=NE8Z_yOp7NWi8JHnxNoOUp6rF5Oq9dG5hWZA_7EXHuI,3916
 examples/streamline_wakes/run.py,sha256=MO-UPuQqG9P1pinTMZo9CSF8sYkcgJUrBy5HVtkKanI,4004
-examples/tab_file/run.py,sha256=eOr1oY_BuY77kXvvfy034D7TbVOROlAz72fSJ_BD4kE,4370
+examples/tab_file/run.py,sha256=rMyNBIG30vreOUWD9NgUA0yBfJbmWofmsDpcs2m8v-s,4364
 examples/timelines/run.py,sha256=mYD7-bVstuxdO-7qCL2sRiItrBP5vK8vsNE0qppLfpg,7557
-examples/timeseries/run.py,sha256=DE1ZjXJbh3AVZZ4tyjkHX21px2Z6g1fWpqSVTV1Gqbk,5329
-examples/timeseries_slurm/run.py,sha256=GE3diBIMmKkm82CFu6tSL80EnrDQXrl7ISh-mi1o_ew,5517
-examples/wind_rose/run.py,sha256=3x3ZC8xkvWHlv67R0ffmh-pzD8lpYosmSyUhXyqi3Tc,4239
-examples/yawed_wake/run.py,sha256=66gJBuIoYMswa53jNG3HHiehdgAAmTW0kez-kZ4kOT0,6102
+examples/timeseries/run.py,sha256=aCuEjWpwGXTeS1s9frOtAnpAHRnQoe4tu4Q0BHoPDys,5393
+examples/timeseries_slurm/run.py,sha256=j-tJlCVDMp1FiPnfNTPcJhwV_MCmsvwi_umNTaDEG_Q,5581
+examples/wind_rose/run.py,sha256=shKCX4-HOZwVBDrgnOaI0ycMpWLOBvhSw7SU_x7CzWo,4247
+examples/yawed_wake/run.py,sha256=V_02HSuHQufzwhnVNGsJoQQpTgMlYtuZZVIDEaLU4U4,6166
 foxes/__init__.py,sha256=V0D5TDEqDNgZCcqm8kHaQdOksc2eUG-mql9YTL6HREs,1124
 foxes/constants.py,sha256=pgVQknBMsKYMGCDWlFsNK0er9CiJBGmm_WzoSt6Dtic,3201
 foxes/variables.py,sha256=bNebCA8eToDPA2Wh6AqkNkzor98nS1JVVMhd8gfakKc,5035
 foxes/algorithms/__init__.py,sha256=gCr5DK2wXhAAJf8eylkevN8yiwPdEC-pqY_LgjKzMv8,249
 foxes/algorithms/downwind/__init__.py,sha256=lyygq5GMc6NAPmH0b0mhGeccWyuC8JTOEMZl-UlmE5M,53
-foxes/algorithms/downwind/downwind.py,sha256=gS40bw0LQCj0mOFTSZKJ560b6X5sAZVb6tOdunlrC2I,24963
+foxes/algorithms/downwind/downwind.py,sha256=9OS_uJwUhvu_L0zjPq4-GRW0mUMqBq2kNa3L9LtZH4o,25243
 foxes/algorithms/downwind/models/__init__.py,sha256=0ov8rjIQ02w3iB6yYCxaswPvHDlPM_8_di6xPh1TTkQ,300
 foxes/algorithms/downwind/models/farm_wakes_calc.py,sha256=IiO8_hhyT7aqPaMym2d__ZvwnjedoDgGj-x00muqOYg,5735
 foxes/algorithms/downwind/models/init_farm_data.py,sha256=KnDXy8NyStLXhQxeZsHMpds-lxisQu9BOBZeYtbJXLk,4108
@@ -40,34 +40,34 @@ foxes/algorithms/iterative/models/convergence.py,sha256=5fCeTMisYEhgvPRbLKMK0XYs
 foxes/algorithms/iterative/models/farm_wakes_calc.py,sha256=8xSDI9u5deiud80VKyFmXCOT_0THIKSIRPqnGK2wfr0,4946
 foxes/algorithms/iterative/models/urelax.py,sha256=412fHSpi_4MATE1qRzqcZDFff6iJpV1h3QIBL_7giQE,2076
 foxes/algorithms/sequential/__init__.py,sha256=2o05IH9XePnqxNEAn2Fr1qiCM6OooqmH2VtmdJXtK0c,94
-foxes/algorithms/sequential/sequential.py,sha256=W2il623cpL3bCyzY_sBgHiCqWaIuKO5tQ_joXY5W9B0,12389
+foxes/algorithms/sequential/sequential.py,sha256=9S6eIIWKCD69Q5Ev8IA5h32L9RCQY_jIspd6EDE9xHU,12388
 foxes/algorithms/sequential/models/__init__.py,sha256=OneaRLxMPzVWLKL9cR3JIYHojfzVX_CQaPv-LP6mCZI,69
 foxes/algorithms/sequential/models/plugin.py,sha256=HhCeHM_YoJRMXuZKa8rXUJZDhWf5rNl28_UfDLSGWvA,1330
 foxes/algorithms/sequential/models/seq_state.py,sha256=J1PorBVV5xZFWobHvCrGDCD-q7Egz_Op1p4PDiacBy0,3654
 foxes/config/__init__.py,sha256=zXNgamapDTZJrrjkP5VMexyQP6Nwz7yGh4eVx-7HATA,62
 foxes/config/config.py,sha256=LIBem9YTKit2xDp5W_lwxqGF2jOucMWcQExTLCmE0N0,2645
 foxes/core/__init__.py,sha256=3dOuKrFeSM6fCMxfLxTbzUsBPVTZiRp0sFhnibniBko,1021
-foxes/core/algorithm.py,sha256=4G-ig1kN0d_HIEF7baWmGy6kFUAHQLe6HY5aD0h5gOc,27069
-foxes/core/axial_induction_model.py,sha256=U7g8vmdKBS4xVYXVpD-uNDnKUnpFXccRTWB5LOPDGaY,498
+foxes/core/algorithm.py,sha256=wwI9KtncuW6gtS8UfCGbhZ88Ooj-WWZzsEu2_RIGXjA,27260
+foxes/core/axial_induction_model.py,sha256=sGbTHFMjEYKiVjElLP_SCRulKatcK0wsEXf30zty2Vc,1023
 foxes/core/data.py,sha256=21hSiLzrrAKKVXjFbIF7oska0bR5qPB2XmxYUraNeIg,21931
 foxes/core/data_calc_model.py,sha256=Hhl2ZapafsIvq5z_YWlGqB3kkF64txohU_MHlfHAvpk,1334
-foxes/core/engine.py,sha256=Rz_w1PVxMeQTOlE0h6MlYFM23mjwABflr9Y2yGfgdP0,20054
-foxes/core/farm_controller.py,sha256=GamnHy2RjjTPj7stS12QiYvS4FPS5INEQ51sGymkMNM,12842
+foxes/core/engine.py,sha256=lDaqIQz0C3INH9sX9AArnqZEYCvGrRLZiQ-WQ7G5vfg,19655
+foxes/core/farm_controller.py,sha256=JMb2XttmeZLZLWOgh6WABHtVUZMfWvv9tGxxVJ6bgGU,13364
 foxes/core/farm_data_model.py,sha256=uEhPjtyNZqZsVT_ySRg0MjpTWLZ6gg_Em-wmYmFDz8s,7383
 foxes/core/farm_model.py,sha256=ogFahCjC2dIBcjnCMmy0cTGulKTDA2ufFUzODf0-KnI,265
-foxes/core/ground_model.py,sha256=SmOfNfGwyFGLFxbwYWEDhxIRiseXjvQULPrGDhN37ds,6803
+foxes/core/ground_model.py,sha256=oRlgrTBAcYaIv8gf5BRccDBlz8GhmAMIlFiVnHt6sXQ,7311
 foxes/core/model.py,sha256=UgoT99BaBBNXKlhUDY87uGJ5WrJ5cpFDIhHcDDzWMvw,19660
-foxes/core/partial_wakes_model.py,sha256=iWbIoqZXwDeA43VbG_06PLmpS00pNPPaZUrUsHALxvk,5688
-foxes/core/point_data_model.py,sha256=frWXqv9kOwvsvgrdDUnP9AxCrd4BacrHTGMrqySJXnU,7066
-foxes/core/rotor_model.py,sha256=oOF6wu-SEya_id1zvFkXdmoxcYjYlbFKzTOV6RBqp74,13234
-foxes/core/states.py,sha256=otcz9VmlaFEJbVLVB4BBem5a66n927tCl_VM9L1YhH4,8764
+foxes/core/partial_wakes_model.py,sha256=L_Wz0U1ps0suw6la-O9xwngYO9HxfGI9wjMGlpARVjA,5413
+foxes/core/point_data_model.py,sha256=90AEIVHkmGP80RhptyPpQDA7wvOnZfF-0VD2dv3L718,7569
+foxes/core/rotor_model.py,sha256=vGKFv_FSjSlxBJQUpbsHGK_q6h3Zd6ow8TzxjSFS_mQ,12772
+foxes/core/states.py,sha256=4oqd_j42M9u91tghnmE89zf-QR5J2tINuBhlLq_Jt_0,8308
 foxes/core/turbine.py,sha256=P5qPKmV1qohZdAKW4lPiUerQkRDTxUOhsvBPQqy8mBo,3054
-foxes/core/turbine_model.py,sha256=IcsU848QNHbUhDN5oqd7VnVWKx_VM5UwRhlPsWK_njw,2049
-foxes/core/turbine_type.py,sha256=o1ILP_3BkbMxglKCmNtQiLTQYSRBdOANZoco01d1GTM,3635
-foxes/core/vertical_profile.py,sha256=pgjari78N2CHZOWnidQ_7KGsSs4lTFP9isn-w6e1Yro,1642
-foxes/core/wake_frame.py,sha256=3g5wCco5N176zYAtZuk3oJRa4UAKJFfVqFiJkFMQ4Z8,9741
-foxes/core/wake_model.py,sha256=2_JkeaiGR64tu0AoC70He1QqslysZRdjF2yELdl_HaE,8189
-foxes/core/wake_superposition.py,sha256=FKVMe2WpXgDmJbM-Sv1teEJLJs9dBZjajB9-r2LacLs,2812
+foxes/core/turbine_model.py,sha256=I-t-2lNVDaifg_cHEurqan9Ko9kcI1k-VEkKS_nyX-o,1585
+foxes/core/turbine_type.py,sha256=DbzDmSfSow7RPCyRlQ_WrzWJ7fPnIN0BBGVzWhhG8FU,3174
+foxes/core/vertical_profile.py,sha256=5fRmvTc-9afFDfaDLt2UY7xATK36o8Jq2hxATueuelw,1364
+foxes/core/wake_frame.py,sha256=h5yR2_dEVOvroAizhszexfYqDvU7E7TiFfETELMKkBs,9240
+foxes/core/wake_model.py,sha256=JYQ-J7Cz1D68eBfOlQamj_mlHyFeICHVgyOFlcNprbY,8170
+foxes/core/wake_superposition.py,sha256=4okhaQXDmcIOOrYiY2zzcxYy4lhw_IDQDBclXv4alrs,3324
 foxes/core/wind_farm.py,sha256=iYetYGFPaPz9Rh-2bLoeknOCiromXqlicZ4snRtSEIc,1755
 foxes/data/__init__.py,sha256=SJXiU6ynbvlhYyDg4mnwkBXyE5yWyI5QV_5HCfs1xf0,153
 foxes/data/parse.py,sha256=x71oWLyvVsMJ7XVL9VRQXZbflnTXqBaxyBdoMQdZExs,2947
@@ -109,20 +109,20 @@ foxes/input/farm_layout/from_random.py,sha256=6ZYKbdV6x11MbQRAHs5nVYBAG-1K295xsM
 foxes/input/farm_layout/grid.py,sha256=CsVIYfCPyznEhDLO_tsTxBPJ591x8l-axDg4M5yArg0,1492
 foxes/input/farm_layout/ring.py,sha256=ghfLkVVQciWDJJNqGs4jZVnM0XCII9ae3hAh9Wb4938,1455
 foxes/input/farm_layout/row.py,sha256=Bx9woFNkXbFXJg51GX2p2PbVgdxV3Ckxr-3TkB04PS4,1198
-foxes/input/states/__init__.py,sha256=Se7F2n3ZJZd6lsdwG0peIOJUKjoGPqKwfVI2gw1oHQY,564
-foxes/input/states/field_data_nc.py,sha256=l8zD2RLG8K2l8cm57RxVOesl9NOLay-YVc-Nz59TVDE,22682
+foxes/input/states/__init__.py,sha256=zLABJvqiQ6ZUVNYfWe1uuyQDJN83_AOS3se5NCilWRM,565
+foxes/input/states/field_data_nc.py,sha256=AzwbZAu1ZknZDDXukvH4kgavuj1_7lXPb4mfS37e6WA,23282
 foxes/input/states/multi_height.py,sha256=U7ZOEmrciVbrEdIXSywpcMbUGSxIpsbTDa-jEsB5wTo,23792
 foxes/input/states/one_point_flow.py,sha256=TuMYGSHz3nOwN3gdWxbQNRHzKmtVtV4AbnHTJ6dVceA,17787
-foxes/input/states/scan_ws.py,sha256=h_F8gTGEy7McLUu6t9mUxhWCsX4-FXMCfEIB6fYtz_c,6231
+foxes/input/states/scan.py,sha256=43CnJl-iRUbRrJCtu-u6Na5DDY19_184myD6ScMfcFA,6101
 foxes/input/states/single.py,sha256=jwcZ2quljXS9cDyYbf3wgvbYUe6umqNfyfvRdylYbC0,6137
 foxes/input/states/slice_data_nc.py,sha256=ojgT0PuHMEFe5t6AltfR8lj0Si4H4ZIQ7HjlLPhHfuM,21807
 foxes/input/states/states_table.py,sha256=-y0vYGQ_OVNQUPMgU99da2FVBDEUvNUMzHN0HHkEbFA,20447
 foxes/input/states/create/__init__.py,sha256=Ocqzmr9SOefeAvGX5DgawsPXfNdGzWOZ2ssvtqEmtAo,134
 foxes/input/states/create/random_abl_states.py,sha256=7KD1q8pF0IQcv-AYq6tqw7jEd3D3Q3xSqOoF5WxMReU,3411
 foxes/input/states/create/random_timeseries.py,sha256=gJpaQ4nEXxOjI4hp3xjNcVbCsmZUm-brXUxoqDb63WE,1266
-foxes/input/yaml/__init__.py,sha256=8f7J8Fn7Ni9r6BpeeISss-P5x3eTLI_p4DRq3rQNZT8,109
-foxes/input/yaml/dict.py,sha256=0EdMc6N7m5gcHgu-k4w6gcLO2liGg7WwwjQ-pkInpw0,6846
-foxes/input/yaml/yaml.py,sha256=7oPZnqa66SGtDBNWcWpB2A0tVRCdG5c_CshClku_rRc,2736
+foxes/input/yaml/__init__.py,sha256=1EIaXSaykZ3VnhXN_SgqnWkRLVkXsL_608_-f19Xk14,167
+foxes/input/yaml/dict.py,sha256=yHkw_x81ZKQ7BlCaTchoTDDAeakfr_zNdtXZgLGZ-B8,13607
+foxes/input/yaml/yaml.py,sha256=wVn6v-4g_Cz-MuNBJhVku9UXCIJrwd9fviLbvsokUcA,2704
 foxes/input/yaml/windio/__init__.py,sha256=h5zp7VDWYq7K4GVX91CkoEABhpYSTisFWiw-0YAq3eU,196
 foxes/input/yaml/windio/get_states.py,sha256=cl4ZMurwbUyZflaoC1TPdBc5VjS7s7zp4_FYp80hkX0,6081
 foxes/input/yaml/windio/read_attributes.py,sha256=ZcMaHTsD8IoF6AmIQ5imnQEnJ9oSuA_-kiOGklPIieQ,12830
@@ -224,15 +224,16 @@ foxes/models/wake_superpositions/ws_max.py,sha256=XzNbqa8bmkMwMkasnUml6x3j0-k4C5
 foxes/models/wake_superpositions/ws_pow.py,sha256=t2nAUjTK6hPstyGPNeJH9dqgbhOmQ91TXQPJDs1aDTw,9630
 foxes/models/wake_superpositions/ws_product.py,sha256=PGyz7CwMRR4T6R6IELugcdk0e3DCQYWejsgzgva820c,4635
 foxes/models/wake_superpositions/ws_quadratic.py,sha256=3pWDd-HSVD4_OKQ5YQaUX1RY1KZZu46Q1Xhvf9xp7Jc,9225
-foxes/output/__init__.py,sha256=HXIah5WbE_aBON9geFT_2IF2N1AQhlOPQro82I6OgUM,746
+foxes/output/__init__.py,sha256=qsHSwE_6ok0ucKZU0XhbvQ9uhBjDP12OkLBN8h5shEs,784
 foxes/output/animation.py,sha256=zljekg6k2DjqVaBw0OamB4i3eopi6g2j0a12B9hx7VQ,2637
 foxes/output/calc_points.py,sha256=paFBNUCbg0Vw-VKsvoXygQcq-T3y10IvcVmSUoHb5Do,4567
 foxes/output/farm_layout.py,sha256=tTE1Ioozh4wU0eMqIpdUd6VLtM_xmXRM_l4iX6-jiIU,11595
-foxes/output/farm_results_eval.py,sha256=Rddl6dg-WlYf0MCoKYFNuu9vmD9a6p10bF2zaFK6_y4,17729
+foxes/output/farm_results_eval.py,sha256=STGLAFqM06bO7SXcEo0APcmBWhLVo6VzENgqt4Q_JY4,18692
 foxes/output/grids.py,sha256=tjQjF3Q_OyI7iOUsbED_P625yDSvHGoIKbS4T_ZB8uI,22504
-foxes/output/output.py,sha256=XVG_R8Cs09B2JivXSVMPCvmR1QCPlyjmB1HIC89ktNs,3690
+foxes/output/output.py,sha256=1hrhKGbC8ODe4RRAl4G1BAMNY5aFWMfublUZJ6VQlNM,3249
+foxes/output/plt.py,sha256=6_4Zniv6iqVctNCbxFn2gMYE0aC0FqwNaaBJgIROlHI,356
 foxes/output/results_writer.py,sha256=zUlj7szylvudYmwLciD6TcStmv7gBcp4bE1xQQ5JL_s,5789
-foxes/output/rose_plot.py,sha256=HP3FoW_VmqB3wTjP2Ga4bKYRvAf9RVe0o4D99S-5AnA,11541
+foxes/output/rose_plot.py,sha256=WIkK3vY6yyu7rG8Myr8fiI6gPnXGLFh0AGnqsF99LHs,17712
 foxes/output/rotor_point_plots.py,sha256=KW4t_2lCSc90BzvJDT9xBOAe6JXWSc75UDu4tlK3Se0,3276
 foxes/output/round.py,sha256=s8YcXciCtaMY14SnG3ebYccyjQ2IEln256SwN9oJnPI,351
 foxes/output/slice_data.py,sha256=ubLrNxY3FKheYqMsygYbo3LeixVhrq5_sLzfaV6cYN0,33798
@@ -245,7 +246,7 @@ foxes/output/flow_plots_2d/get_fig.py,sha256=gGMOfzNCukq_l0FZLmi3zSBl0ANkQi2WoKa
 foxes/output/seq_plugins/__init__.py,sha256=d6Tl5NBVV4MaZwXtPgyxBXBnh7uCBFTbNzRU6IXCmQQ,110
 foxes/output/seq_plugins/seq_flow_ani_plugin.py,sha256=yAC-ZA_rkIOCHc1TN3uQYW0Z1CbxLTgP84Lrfr4D8cI,3654
 foxes/output/seq_plugins/seq_wake_debug_plugin.py,sha256=oAijRu9XRjUL9X4lZF-V6jqOfv8omokRp7YMkL1I2_M,3969
-foxes/utils/__init__.py,sha256=Zgz1_iDPb4okUwfcxaMRvXmn3D3jamslFfiU6wk2EEo,764
+foxes/utils/__init__.py,sha256=cVrVo5P9Ge-AxHAtc3_gMGmj1XL46xbfZY4okvIZNT8,744
 foxes/utils/cubic_roots.py,sha256=u2Pf-yHZ6EASpFONMfkv0mvldmd1E1VRZxj69YabDoc,3321
 foxes/utils/data_book.py,sha256=z96QUC9FI7mv1NEFJUkkTcxWqx5Fc9gPeyzPwbFbyoM,5301
 foxes/utils/dev_utils.py,sha256=6vryhcTg8lNXhtZOsQ0F8PTVpmUw250VNE-UyR0G70Y,1241
@@ -258,11 +259,10 @@ foxes/utils/pandas_helpers.py,sha256=Zk_PFTyKkJyeIc52K-KJ5Ab6Hv0PJw820vwPgnQmiko
 foxes/utils/pandas_utils.py,sha256=5r3RHjaGu-Vi7DGMBdCDxVeu9nZk46wtPlHRL4l_R_c,4630
 foxes/utils/random_xy.py,sha256=i0AZ04BLL6TxC3Lg1ZfwI_o4zJbHR6hm-BNd0Sydu_c,1376
 foxes/utils/regularize.py,sha256=OnJ88ZCSu289aLHgrOb96j1A9JVvg_7OjZ3lWZAnNHo,512
-foxes/utils/subclasses.py,sha256=bnlZaLgGjq9cQC9dvsxahUmLQQlSmmun35TjWYyX9CA,380
+foxes/utils/subclasses.py,sha256=wCfhuialpBOQOPMwNbaplkVmf60vR9AIkY_o3tdkgXI,1737
 foxes/utils/tab_files.py,sha256=H50IpLaqffJn9A51orCGc4fOhCOzoNUYDUKek4OAayU,1811
 foxes/utils/two_circles.py,sha256=xkj-SA_x-VXY7KtmSU4lcV4gFdplyhU3sBAC9vTdkF4,2810
 foxes/utils/wind_dir.py,sha256=6W0njWDvnIdOOjwqcMr64MW9ApjdtFA75blVUxirPMo,2823
-foxes/utils/windrose_plot.py,sha256=O9zLrDzQXIgKdBwzqNkusyA_rMshbk-8ybloIwt8vuY,4589
 foxes/utils/xarray_utils.py,sha256=zAapAWYzKEBiM4h1oABNd4MvVcz-aO1gkymmhG7_uBg,1570
 foxes/utils/abl/__init__.py,sha256=ijn-ubLLlqqH6tTAXFRmBAxJZmVBlTEmtx1cdCCtG4I,135
 foxes/utils/abl/neutral.py,sha256=E4DEhvXvw74BPrYr1MjQjeIaoz6ZOTWVlqScKflm-0M,1358
@@ -276,34 +276,34 @@ foxes/utils/geom2d/example_intersection.py,sha256=4e6sjpZEk_bNc462YvwKPzwxdV1B90
 foxes/utils/geom2d/example_union.py,sha256=BKfLt1mtQcSto-qExeMQkq8tQ6kfFXVJ93Cc7DhOal8,1750
 foxes/utils/geom2d/half_plane.py,sha256=kzZD6pkZxZ03MK9WAboWzXb5Ws5dWLQY9GIahD4D9mA,6167
 foxes/utils/geom2d/polygon.py,sha256=Xj7triA5Pe4-48sNSAvGxEXlQGptV161LUpKKCf3YOY,5535
-tests/0_consistency/iterative/test_iterative.py,sha256=3RH3MqhB2LV9Bz4zadzPSLuvnV33Cf0JzCQqINEXYaU,2632
-tests/0_consistency/partial_wakes/test_partial_wakes.py,sha256=a0u_Fw2XDqAAOp8lKNhkgXqWjUm292rFI-YIibSmnBs,2547
+tests/0_consistency/iterative/test_iterative.py,sha256=2hEMl9RyDORYMHYRioEpv2Qd8vWUzhkLHlCHuMsRUnk,2632
+tests/0_consistency/partial_wakes/test_partial_wakes.py,sha256=_c9B3CjIk7A9B0gdTkH4h6ftkBBIMCIxCtnqRV8swSI,2547
 tests/1_verification/flappy_0_6/PCt_files/test_PCt_files.py,sha256=QyY1pKWyScruAk_N6zfumU-hwv0Nsqrow3MDvEoOlGc,2749
 tests/1_verification/flappy_0_6/PCt_files/flappy/run.py,sha256=wJLKFOKVxOjmncYRarK5EK12HNjpWEUuu3EKgdq-Cvw,2165
 tests/1_verification/flappy_0_6/abl_states/test_abl_states.py,sha256=MQkh6KdA1PfsflAsUCCicEouwOd1j5V6tQHhW5SjX4A,2278
 tests/1_verification/flappy_0_6/abl_states/flappy/run.py,sha256=hnPSO_wqk9vYgwNNMWXb_UaYZOCnlwScVlfZl7rriV4,2058
 tests/1_verification/flappy_0_6/partial_top_hat/test_partial_top_hat.py,sha256=TWdY4qP47KM9L39SeytPsmUzFDD4YObRESXL5iXtiWg,2125
 tests/1_verification/flappy_0_6/partial_top_hat/flappy/run.py,sha256=NMtLneJLk6J1DXE59FZ1JAGlh-zBwegtCAq8nB-p13I,1993
-tests/1_verification/flappy_0_6/row_Jensen_linear_centre/test_row_Jensen_linear_centre.py,sha256=CbA2ZhoyKUtXZQbUEzDr1fDN718Ulmmxq01QrwmBt6c,2332
+tests/1_verification/flappy_0_6/row_Jensen_linear_centre/test_row_Jensen_linear_centre.py,sha256=RWEl9e_Wmr7fmdWwtWAQQVe_OD7VoQaR6z0_PJ_p4SQ,2412
 tests/1_verification/flappy_0_6/row_Jensen_linear_centre/flappy/run.py,sha256=xTBI8dssYiqy7WC0IlKonfHQVshUk2ROyCzmecW0hbI,2184
-tests/1_verification/flappy_0_6/row_Jensen_linear_tophat/test_row_Jensen_linear_tophat.py,sha256=HRdBcU0RNJeUEux6QhnNJxP0Q4mz4JudWzhpPrc1w3I,2371
+tests/1_verification/flappy_0_6/row_Jensen_linear_tophat/test_row_Jensen_linear_tophat.py,sha256=MAL8Au5g4ZURcx8lVZScJjRc2BBHr0ALz_XgGDxMlIA,2451
 tests/1_verification/flappy_0_6/row_Jensen_linear_tophat/flappy/run.py,sha256=uhWgRbEbmM5t_ZdcG1U_719eo_2idWfML04wjFQhYL0,2180
-tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2005/test_row_Jensen_linear_tophat_IECTI_2005.py,sha256=RNOliNVjN0ePpstE0-1OV92poUh8mpTvdVuRQrEYTi0,2896
+tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2005/test_row_Jensen_linear_tophat_IECTI_2005.py,sha256=oShokXyZWseHONSfbTzure4gXjUVQjZgICGXmtncApg,2978
 tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2005/flappy/run.py,sha256=84Vc_F4kZsluiPrKFX7WxWXKwfGZDNzW90npCsStJqQ,2259
-tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2019/test_row_Jensen_linear_tophat_IECTI_2019.py,sha256=_a7K2XI3FvoYbEDn8-_89kzoczrx-AhjSqR9-xQkyJ0,2896
+tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2019/test_row_Jensen_linear_tophat_IECTI_2019.py,sha256=LmhXuo-g7pUDZD7_U3xdbDv0Kzdz_gxv1P5kQ6SpUsg,2978
 tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2019/flappy/run.py,sha256=cPLIXymqdzu3zxB6-B3g3CU_oDhiYf-TlgWqossDjUw,2259
-tests/1_verification/flappy_0_6/row_Jensen_quadratic_centre/test_row_Jensen_quadratic_centre.py,sha256=2BimeDW0HSHuU5PDwlStpD4VYLzf8w6MvN92SQ0_7RA,2371
+tests/1_verification/flappy_0_6/row_Jensen_quadratic_centre/test_row_Jensen_quadratic_centre.py,sha256=SU8DWxbvgeP2vNNOpYgJ9cVK6wLlQ4NzMRry3W0VZFE,2451
 tests/1_verification/flappy_0_6/row_Jensen_quadratic_centre/flappy/run.py,sha256=u-LBBH_MVoqY4Gl__6_EuHUTXp7s-6xVU1OXkywrqrY,2187
 tests/1_verification/flappy_0_6_2/grid_rotors/test_grid_rotors.py,sha256=aaS_TRsix7snwt0DucCjHk_0uuHzWR8pmOVJcFIrMnM,3952
 tests/1_verification/flappy_0_6_2/grid_rotors/flappy/run.py,sha256=-TJAB5L9fj7UonqYILVH0i91PPD6KKd7bpJ2j0MDALk,2453
-tests/1_verification/flappy_0_6_2/row_Bastankhah_Crespo/test_row_Bastankhah_Crespo.py,sha256=7oCPhVpSQXDm_ABfPfAaRcUd8yYa6h7iSDxMDZKEY5Q,2901
+tests/1_verification/flappy_0_6_2/row_Bastankhah_Crespo/test_row_Bastankhah_Crespo.py,sha256=1b6_mIWvWwAMKnDN_t-oWHfDwpU7l8TJdyf-aydQgpc,2951
 tests/1_verification/flappy_0_6_2/row_Bastankhah_Crespo/flappy/run.py,sha256=nwIyn20ZyYHhCKcPCnm02zjwNKMRzr9t0U8TjKK61QU,2213
-tests/1_verification/flappy_0_6_2/row_Bastankhah_linear_centre/test_row_Bastankhah_linear_centre.py,sha256=rSeda6eN1ztb8eVKcA9CGfGCdteKazbki3qca2yNaCw,2508
+tests/1_verification/flappy_0_6_2/row_Bastankhah_linear_centre/test_row_Bastankhah_linear_centre.py,sha256=a7CQS-_Mnz3NynaTv1OY1CZ10iAqa7E3YxmkbDtoshw,2590
 tests/1_verification/flappy_0_6_2/row_Bastankhah_linear_centre/flappy/run.py,sha256=s6FbEdpiIdHYmdD8S85_NhLH-S3EOinXvw8RHmR2QOU,2122
 tests/3_examples/test_examples.py,sha256=rS2Dz04ktbS6v3TRDr96AkWGypr5u49jihqbEmGFmRU,694
-foxes-1.2.dist-info/LICENSE,sha256=bBCH6mYTPzSepk2s2UUZ3II_ZYXrn1bnSqB85-aZHxU,1071
-foxes-1.2.dist-info/METADATA,sha256=2aOrGLnVBR4JZ6c6z3cLRcDRZy98GecoXCk6p7wrMCU,8651
-foxes-1.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-foxes-1.2.dist-info/entry_points.txt,sha256=KuS44FRH5NnMw201A8Btr76eNRKr2UOoKHjejAsqKwE,123
-foxes-1.2.dist-info/top_level.txt,sha256=G7oHApEz5nc-iP__XsPcvjYe_NyXGmKMUMPHi3C3x6I,26
-foxes-1.2.dist-info/RECORD,,
+foxes-1.2.2.dist-info/LICENSE,sha256=bBCH6mYTPzSepk2s2UUZ3II_ZYXrn1bnSqB85-aZHxU,1071
+foxes-1.2.2.dist-info/METADATA,sha256=7dg2z1b6a9XZFlQCJRKBJ4sSfOkDAP4GJSGR8RLp7MA,8629
+foxes-1.2.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+foxes-1.2.2.dist-info/entry_points.txt,sha256=KuS44FRH5NnMw201A8Btr76eNRKr2UOoKHjejAsqKwE,123
+foxes-1.2.2.dist-info/top_level.txt,sha256=G7oHApEz5nc-iP__XsPcvjYe_NyXGmKMUMPHi3C3x6I,26
+foxes-1.2.2.dist-info/RECORD,,

tests/0_consistency/iterative/test_iterative.py

@@ -21,7 +21,7 @@ def test():
     lims = {FV.REWS: 5e-7, FV.P: 5e-4}
 
     base_results = None
-    with foxes.Engine.new("process", chunk_size_states=1000):
+    with foxes.Engine.new("threads", chunk_size_states=1000):
         for Algo, frame in cases:
             print(f"\nENTERING CASE {(Algo.__name__, frame)}\n")
 

tests/0_consistency/partial_wakes/test_partial_wakes.py

@@ -24,7 +24,7 @@ def test():
     ]
 
     base_results = None
-    with foxes.Engine.new("process", chunk_size_states=100):
+    with foxes.Engine.new("threads", chunk_size_states=100):
         for rotor, pwake, lim in cases:
             print(f"\nENTERING CASE {(rotor, pwake, lim)}\n")
 

tests/1_verification/flappy_0_6/row_Jensen_linear_centre/test_row_Jensen_linear_centre.py

@@ -23,8 +23,13 @@ def test():
     )
     mbook.turbine_types[ttype.name] = ttype
 
-    states = foxes.input.states.ScanWS(
-        ws_list=np.linspace(3.0, 30.0, n_s), wd=270.0, ti=0.08, rho=1.225
+    states = foxes.input.states.ScanStates(
+        {
+            FV.WS: np.linspace(3.0, 30.0, n_s),
+            FV.WD: [270],
+            FV.TI: [0.08],
+            FV.RHO: [1.225],
+        }
     )
 
     farm = foxes.WindFarm()

tests/1_verification/flappy_0_6/row_Jensen_linear_tophat/test_row_Jensen_linear_tophat.py

@@ -25,8 +25,13 @@ def test():
     )
     mbook.turbine_types[ttype.name] = ttype
 
-    states = foxes.input.states.ScanWS(
-        ws_list=np.linspace(3.0, 30.0, n_s), wd=270.0, ti=0.08, rho=1.225
+    states = foxes.input.states.ScanStates(
+        {
+            FV.WS: np.linspace(3.0, 30.0, n_s),
+            FV.WD: [270],
+            FV.TI: [0.08],
+            FV.RHO: [1.225],
+        }
     )
 
     farm = foxes.WindFarm()

tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2005/test_row_Jensen_linear_tophat_IECTI_2005.py

@@ -28,8 +28,13 @@ def test():
     )
     mbook.turbine_types[ttype.name] = ttype
 
-    states = foxes.input.states.ScanWS(
-        ws_list=np.linspace(6.0, 16.0, n_s), wd=wd, ti=ti, rho=1.225
+    states = foxes.input.states.ScanStates(
+        {
+            FV.WS: np.linspace(6.0, 16.0, n_s),
+            FV.WD: [wd],
+            FV.TI: [ti],
+            FV.RHO: [1.225],
+        }
     )
 
     farm = foxes.WindFarm()

tests/1_verification/flappy_0_6/row_Jensen_linear_tophat_IECTI2019/test_row_Jensen_linear_tophat_IECTI_2019.py

@@ -28,8 +28,13 @@ def test():
     )
     mbook.turbine_types[ttype.name] = ttype
 
-    states = foxes.input.states.ScanWS(
-        ws_list=np.linspace(6.0, 16.0, n_s), wd=wd, ti=ti, rho=1.225
+    states = foxes.input.states.ScanStates(
+        {
+            FV.WS: np.linspace(6.0, 16.0, n_s),
+            FV.WD: [wd],
+            FV.TI: [ti],
+            FV.RHO: [1.225],
+        }
     )
 
     farm = foxes.WindFarm()

tests/1_verification/flappy_0_6/row_Jensen_quadratic_centre/test_row_Jensen_quadratic_centre.py

@@ -25,8 +25,13 @@ def test():
     )
     mbook.turbine_types[ttype.name] = ttype
 
-    states = foxes.input.states.ScanWS(
-        ws_list=np.linspace(3.0, 30.0, n_s), wd=270.0, ti=0.08, rho=1.225
+    states = foxes.input.states.ScanStates(
+        {
+            FV.WS: np.linspace(3.0, 30.0, n_s),
+            FV.WD: [270],
+            FV.TI: [0.08],
+            FV.RHO: [1.225],
+        }
     )
 
     farm = foxes.WindFarm()

tests/1_verification/flappy_0_6_2/row_Bastankhah_Crespo/test_row_Bastankhah_Crespo.py

@@ -5,7 +5,6 @@ import inspect
 
 import foxes
 import foxes.variables as FV
-from foxes.config import config
 
 thisdir = Path(inspect.getfile(inspect.currentframe())).parent
 
@@ -35,8 +34,13 @@ def test():
         superposition="ti_max", induction="Betz"
     )
 
-    states = foxes.input.states.ScanWS(
-        ws_list=np.linspace(6.0, 16.0, n_s), wd=wd, ti=ti, rho=1.225
+    states = foxes.input.states.ScanStates(
+        {
+            FV.WS: np.linspace(6.0, 16.0, n_s),
+            FV.WD: [wd],
+            FV.TI: [ti],
+            FV.RHO: [1.225],
+        }
     )
 
     farm = foxes.WindFarm()

tests/1_verification/flappy_0_6_2/row_Bastankhah_linear_centre/test_row_Bastankhah_linear_centre.py

@@ -32,8 +32,13 @@ def test():
         sbeta_factor=0.25, superposition="ws_linear", induction="Betz"
     )
 
-    states = foxes.input.states.ScanWS(
-        ws_list=np.linspace(6.0, 16.0, n_s), wd=wd, ti=ti, rho=1.225
+    states = foxes.input.states.ScanStates(
+        {
+            FV.WS: np.linspace(6.0, 16.0, n_s),
+            FV.WD: [wd],
+            FV.TI: [ti],
+            FV.RHO: [1.225],
+        }
     )
 
     farm = foxes.WindFarm()

foxes/utils/windrose_plot.py

@@ -1,152 +0,0 @@
-import numpy as np
-import pandas as pd
-import matplotlib.pyplot as plt
-from windrose import WindroseAxes
-
-FIGSIZE_DEFAULT = (8, 8)
-DPI_DEFAULT = 80
-
-
-class TabWindroseAxes(WindroseAxes):
-    """
-    A derivate of the wind rose axes that runs
-    on stochastic data (bins with weights) instead
-    of time series data
-
-    :group: utils
-
-    """
-
-    @staticmethod
-    def from_ax(
-        ax=None,
-        fig=None,
-        figsize=None,
-        rect=None,
-        *args,
-        **kwargs,
-    ):
-        """
-        Return a WindroseAxes object for the figure `fig`.
-        """
-        if ax is None:
-            if fig is None:
-                fig = plt.figure(
-                    figsize=FIGSIZE_DEFAULT if figsize is None else figsize,
-                    dpi=DPI_DEFAULT,
-                    facecolor="w",
-                    edgecolor="w",
-                )
-            if rect is None:
-                rect = [0.1, 0.1, 0.8, 0.8]
-            ax = TabWindroseAxes(fig, rect, *args, **kwargs)
-            fig.add_axes(ax)
-            return ax
-        else:
-            return ax
-
-    def _init_plot(self, direction, var, **kwargs):
-
-        # self.clear()
-        kwargs.pop("zorder", None)
-        weights = kwargs.pop("weights")
-
-        # Init of the bins array if not set
-        if "bin_min_var" in kwargs:
-            bins = list(kwargs.pop("bin_min_var"))
-            bins.append(max(kwargs.pop("bin_max_var")))
-        else:
-            bins = kwargs.pop("bins", None)
-            if bins is None:
-                bins = np.linspace(np.min(var), np.max(var), 6)
-            if isinstance(bins, int):
-                bins = np.linspace(np.min(var), np.max(var), bins)
-            bins = np.asarray(bins).tolist()
-        nbins = len(bins)
-        bins.append(np.inf)
-
-        # Sets the colors table based on the colormap or the "colors" argument
-        colors = kwargs.pop("colors", None)
-        cmap = kwargs.pop("cmap", None)
-        if colors is not None:
-            if isinstance(colors, str):
-                colors = [colors] * nbins
-            if isinstance(colors, (tuple, list)):
-                if len(colors) != nbins:
-                    raise ValueError("colors and bins must have same length")
-        else:
-            if cmap is None:
-                cmap = plt.get_cmap()
-            colors = self._colors(cmap, nbins)
-
-        if "bin_min_dir" in kwargs:
-            angles = 90 - np.sort(np.unique(direction))
-            angles[angles > 180] -= 360
-            angles *= np.pi / 180
-
-            dir_min = kwargs.pop("bin_min_dir")
-            dir_edges = np.mod(dir_min, 360.0).tolist()
-
-            dir_bins = dir_min.copy().tolist()
-            if dir_bins[0] < 0:
-                dir_bins.append(360 + dir_bins[0])
-                dir_bins[0] = 0
-                dir_bins.append(360 + dir_bins[1])
-
-            nsector = len(angles)
-
-        else:
-            nsector = kwargs.pop("nsector", None)
-            if nsector is None:
-                nsector = 16
-            angles = np.arange(0, -2 * np.pi, -2 * np.pi / nsector) + np.pi / 2
-
-            angle = 360.0 / nsector
-            dir_bins = np.arange(-angle / 2, 360.0 + angle, angle, dtype=float)
-            dir_edges = dir_bins.tolist()
-
-            dir_edges.pop(-1)
-            dir_edges[0] = dir_edges.pop(-1)
-            dir_bins[0] = 0.0
-
-        table = np.histogram2d(
-            x=var, y=direction, bins=[bins, dir_bins], density=False, weights=weights
-        )[0]
-        table[:, 0] = table[:, 0] + table[:, -1]
-        table = table[:, :-1]
-
-        self._info["dir"], self._info["bins"], self._info["table"] = (
-            dir_edges,
-            bins,
-            table,
-        )
-        return bins, nbins, nsector, colors, angles, kwargs
-
-    def legend(self, loc="upper right", *args, **kwargs):
-        return super().legend(loc, *args, **kwargs)
-
-
-if __name__ == "__main__":
-
-    import numpy as np
-    import pandas as pd
-    from foxes import StaticData, STATES
-
-    sdata = StaticData()
-    fpath = sdata.get_file_path(STATES, "wind_rose_bremen.csv")
-    print(fpath)
-    data = pd.read_csv(fpath, index_col=0)
-    print(data)
-
-    wd = data["wd"].to_numpy()
-    ws = data["ws"].to_numpy()
-    weights = data["weight"].to_numpy()
-
-    ax = TabWindroseAxes.from_ax()
-    # ax.contourf(wd, ws, weights=weights, bins=[0,3,8,13], cmap=plt.cm.Blues)
-    # ax.contour(wd, ws, weights=weights, bins=[0,3,8,13], colors='black')
-    ax.bar(
-        wd, ws, weights=weights, bins=[0, 3, 5, 8, 10, 13, 16, 20], cmap=plt.cm.Blues
-    )
-    ax.set_legend()
-    plt.show()