From 8a78eba8b3b0036d3d41922466bd39ebbbc4dd87 Mon Sep 17 00:00:00 2001 From: Chris Mackey Date: Wed, 2 Feb 2022 17:40:44 -0500 Subject: [PATCH] fix(inputs): Use file for clo, met and air speed instead of string --- pollination/pmv_comfort_map/_comfort.py | 24 +++++++++++------------ pollination/pmv_comfort_map/entry.py | 26 ++++++++++++------------- requirements.txt | 6 +++--- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pollination/pmv_comfort_map/_comfort.py b/pollination/pmv_comfort_map/_comfort.py index 466b2cf..c9a5a3a 100644 --- a/pollination/pmv_comfort_map/_comfort.py +++ b/pollination/pmv_comfort_map/_comfort.py @@ -74,22 +74,22 @@ class ComfortMappingEntryPoint(DAG): 'the simulation will be annual.', default='' ) - air_speed = Inputs.str( - description='A single number for air speed in m/s or a string of a JSON array ' - 'with numbers that align with the result-sql reporting period. This ' - 'will be used for all indoor comfort evaluation.', default='0.1' + air_speed = Inputs.file( + description='A CSV file containing a single number for air speed in m/s or ' + 'several rows of air speeds that align with the length of the run period.', + optional=True ) - met_rate = Inputs.str( - description='A single number for metabolic rate in met or a string of a ' - 'JSON array with numbers that align with the result-sql reporting period.', - default='1.1' + met_rate = Inputs.file( + description='A CSV file containing a single number for metabolic rate in met ' + 'or several rows of met values that align with the length of the run period.', + optional=True ) - clo_value = Inputs.str( - description='A single number for clothing level in clo or a string of a JSON ' - 'array with numbers that align with the result-sql reporting period.', - default='0.7' + clo_value = Inputs.file( + description='A CSV file containing a single number for clothing level in clo ' + 'or several rows of clo values that align with the length of the run period.', + optional=True ) solarcal_parameters = Inputs.str( diff --git a/pollination/pmv_comfort_map/entry.py b/pollination/pmv_comfort_map/entry.py index af47fde..bfd940f 100644 --- a/pollination/pmv_comfort_map/entry.py +++ b/pollination/pmv_comfort_map/entry.py @@ -103,23 +103,23 @@ class PmvComfortMapEntryPoint(DAG): spec={'type': 'string', 'enum': ['write-op-map', 'write-set-map']} ) - air_speed = Inputs.str( - description='A single number for air speed in m/s or a string of a JSON array ' - 'with numbers that align with run period. This ' - 'will be used for all indoor comfort evaluation.', default='0.1', - alias=air_speed_input + air_speed = Inputs.file( + description='A CSV file containing a single number for air speed in m/s or ' + 'several rows of air speeds that align with the length of the run period. This ' + 'will be used for all indoor comfort evaluation.', extensions=['txt', 'csv'], + optional=True, alias=air_speed_input ) - met_rate = Inputs.str( - description='A single number for metabolic rate in met or a string of a ' - 'JSON array with numbers that align with the result-sql reporting period.', - default='1.1', alias=met_rate_input + met_rate = Inputs.file( + description='A CSV file containing a single number for metabolic rate in met ' + 'or several rows of met values that align with the length of the run period.', + extensions=['txt', 'csv'], optional=True, alias=met_rate_input ) - clo_value = Inputs.str( - description='A single number for clothing level in clo or a string of a JSON ' - 'array with numbers that align with the result-sql reporting period.', - default='0.7', alias=clo_value_input + clo_value = Inputs.file( + description='A CSV file containing a single number for clothing level in clo ' + 'or several rows of clo values that align with the length of the run period.', + extensions=['txt', 'csv'], optional=True, alias=clo_value_input ) solarcal_parameters = Inputs.str( diff --git a/requirements.txt b/requirements.txt index fed6c16..73bc459 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pollination-ladybug==0.2.1 -pollination-ladybug-comfort==0.3.2 +pollination-ladybug-comfort==0.3.6 pollination-honeybee-radiance==0.16.6 -pollination-honeybee-energy==0.3.21 +pollination-honeybee-energy==0.3.22 pollination-lbt-honeybee==0.1.8 -pollination-alias==0.10.0 +pollination-alias==0.10.3 pollination-path==0.3.0