From fe0e2150b006d32a600cf1538404f9abaa8963e3 Mon Sep 17 00:00:00 2001 From: RamiALBASHA Date: Wed, 5 Jul 2023 14:53:56 +0200 Subject: [PATCH 1/4] typo temperature unit in exchange.rst --- doc/exchange.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/exchange.rst b/doc/exchange.rst index f1f7474..7454e88 100644 --- a/doc/exchange.rst +++ b/doc/exchange.rst @@ -115,7 +115,7 @@ where :math:`\Delta H_d \ [kJ \ {mol}_{CO_2}^{-1}]` is deactivation energy of the Arrhenius functions, :math:`\Delta S \ [kJ \ K^{-1} \ {mol}_{CO_2}^{-1}]` is entropy term, :math:`R \ [kJ \ K^{-1} \ {mol}^{-1}]` is the ideal gas constant, and -:math:`T_{leaf} \ [^\circ C]` is leaf temperature. +:math:`T_{leaf} \ [K]` is leaf temperature. Finally, for :math:`\Gamma`, :math:`K_c`, and :math:`K_o` temperature dependency writes: From 84b14f28cff40aac1fa86cf11cd7dbaf64dfb556 Mon Sep 17 00:00:00 2001 From: RamiALBASHA Date: Wed, 5 Jul 2023 14:54:13 +0200 Subject: [PATCH 2/4] set plant_id as str --- src/hydroshoot/architecture.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hydroshoot/architecture.py b/src/hydroshoot/architecture.py index f377574..c4e368b 100644 --- a/src/hydroshoot/architecture.py +++ b/src/hydroshoot/architecture.py @@ -182,7 +182,7 @@ def vine_mtg(file_path): except: vid_diam = None - plant_id = int(plant_id) + plant_id = str(plant_id) if trunk_id in plant_base_identifier: baseXYZ = vid_position trunk_id = 0 From 6276297277d32e80cfc82d5bda899caf57ab4fa1 Mon Sep 17 00:00:00 2001 From: RamiALBASHA Date: Wed, 5 Jul 2023 14:54:54 +0200 Subject: [PATCH 3/4] bugfix python3 list(zip(...)) --- src/hydroshoot/irradiance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hydroshoot/irradiance.py b/src/hydroshoot/irradiance.py index 1835d6d..1f9dac3 100644 --- a/src/hydroshoot/irradiance.py +++ b/src/hydroshoot/irradiance.py @@ -231,7 +231,7 @@ def irradiance_distribution(meteo, geo_location, irradiance_unit, if rotation_angle != 0.: v_energy = [vec[0] for vec in source_cum] v_coord = [tuple(vector_rotation(vec[1], (0., 0., 1.), deg2rad(rotation_angle))) for vec in source_cum] - source_cum = zip(v_energy, v_coord) + source_cum = list(zip(v_energy, v_coord)) # Add Sun to an existing pgl.scene if sun2scene is not None: From c1fc33022ab488e801962ee18a242d6665a11354 Mon Sep 17 00:00:00 2001 From: RamiALBASHA Date: Wed, 5 Jul 2023 14:56:21 +0200 Subject: [PATCH 4/4] bump post --- src/hydroshoot/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hydroshoot/version.py b/src/hydroshoot/version.py index 2ed0cc4..5da0853 100644 --- a/src/hydroshoot/version.py +++ b/src/hydroshoot/version.py @@ -3,7 +3,7 @@ major = 5 minor = 2 -post = 1 +post = 2 __version__ = ".".join([str(s) for s in (major, minor, post)]) # #}