Skip to content

Commit

Permalink
fix(comfort): Re-export utci-comfort-map with correct air speed path
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikkelkp @chriswmackey
mikkelkp authored and chriswmackey committed Oct 21, 2024
1 parent 8c38ffb commit e78f4d2
Show file tree
Hide file tree
Showing 12 changed files with 126 additions and 126 deletions.
28 changes: 14 additions & 14 deletions lbt_recipes/utci_comfort_map/flow/dependencies/comfort_mapping_entry_point.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from utci-comfort-map:0.9.12.
This file is auto-generated from utci-comfort-map:0.9.15.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.
Expand Down Expand Up @@ -107,7 +107,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort epw air-speed-json weather.epw enclosure_info.json --multiply-by {multiply_by} --indoor-air-speed in_speed.txt --outdoor-air-speed out_speed.txt --run-period "{run_period}" --output-file air_speed.json'.format(multiply_by=self.multiply_by, run_period=self.run_period)
return 'ladybug-comfort epw air-speed-json weather.epw enclosure_info.json --multiply-by {multiply_by} --indoor-air-speed in_speed.txt --outdoor-air-speed out_speed.txt --run-period "{run_period}" --output-file air_speed.json'.format(run_period=self.run_period, multiply_by=self.multiply_by)

def output(self):
return {
Expand Down Expand Up @@ -142,7 +142,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.18.42'
return 'docker.io/ladybugtools/ladybug-comfort:0.18.46'

@property
def image_workdir(self):
Expand Down Expand Up @@ -217,7 +217,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort map air result.sql enclosure_info.json weather.epw --run-period "{run_period}" --{metric} --{output_format} --output-file air.csv'.format(output_format=self.output_format, metric=self.metric, run_period=self.run_period)
return 'ladybug-comfort map air result.sql enclosure_info.json weather.epw --run-period "{run_period}" --{metric} --{output_format} --output-file air.csv'.format(run_period=self.run_period, metric=self.metric, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -253,7 +253,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.18.42'
return 'docker.io/ladybugtools/ladybug-comfort:0.18.46'

@property
def image_workdir(self):
Expand Down Expand Up @@ -336,7 +336,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort map longwave-mrt result.sql view_factors.csv view_factors.mod enclosure_info.json weather.epw --run-period "{run_period}" --{output_format} --output-file longwave.csv'.format(output_format=self.output_format, run_period=self.run_period)
return 'ladybug-comfort map longwave-mrt result.sql view_factors.csv view_factors.mod enclosure_info.json weather.epw --run-period "{run_period}" --{output_format} --output-file longwave.csv'.format(run_period=self.run_period, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -373,7 +373,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.18.42'
return 'docker.io/ladybugtools/ladybug-comfort:0.18.46'

@property
def image_workdir(self):
Expand Down Expand Up @@ -448,7 +448,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort map air result.sql enclosure_info.json weather.epw --run-period "{run_period}" --{metric} --{output_format} --output-file air.csv'.format(output_format=self.output_format, metric=self.metric, run_period=self.run_period)
return 'ladybug-comfort map air result.sql enclosure_info.json weather.epw --run-period "{run_period}" --{metric} --{output_format} --output-file air.csv'.format(run_period=self.run_period, metric=self.metric, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -484,7 +484,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.18.42'
return 'docker.io/ladybugtools/ladybug-comfort:0.18.46'

@property
def image_workdir(self):
Expand Down Expand Up @@ -590,7 +590,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort map shortwave-mrt weather.epw indirect.ill direct.ill ref.ill sun-up-hours.txt --contributions dynamic --transmittance-contribs dyn_shade --trans-schedule-json trans_schedules.json --solarcal-par "{solarcal_par}" --run-period "{run_period}" --{indirect_is_total} --{output_format} --output-file shortwave.csv'.format(solarcal_par=self.solarcal_par, output_format=self.output_format, indirect_is_total=self.indirect_is_total, run_period=self.run_period)
return 'ladybug-comfort map shortwave-mrt weather.epw indirect.ill direct.ill ref.ill sun-up-hours.txt --contributions dynamic --transmittance-contribs dyn_shade --trans-schedule-json trans_schedules.json --solarcal-par "{solarcal_par}" --run-period "{run_period}" --{indirect_is_total} --{output_format} --output-file shortwave.csv'.format(solarcal_par=self.solarcal_par, run_period=self.run_period, output_format=self.output_format, indirect_is_total=self.indirect_is_total)

def output(self):
return {
Expand Down Expand Up @@ -631,7 +631,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.18.42'
return 'docker.io/ladybugtools/ladybug-comfort:0.18.46'

@property
def image_workdir(self):
Expand Down Expand Up @@ -783,7 +783,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.18.42'
return 'docker.io/ladybugtools/ladybug-comfort:0.18.46'

@property
def image_workdir(self):
Expand Down Expand Up @@ -911,14 +911,14 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.18.42'
return 'docker.io/ladybugtools/ladybug-comfort:0.18.46'

@property
def image_workdir(self):
return '/home/ladybugbot/run'


class _ComfortMappingEntryPoint_cbe7c10eOrchestrator(luigi.WrapperTask):
class _ComfortMappingEntryPoint_1f915e33Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
42 changes: 21 additions & 21 deletions lbt_recipes/utci_comfort_map/flow/dependencies/dependencies/shade_contrib_entry_point.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from utci-comfort-map:0.9.12.
This file is auto-generated from utci-comfort-map:0.9.15.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.
Expand Down Expand Up @@ -119,12 +119,12 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(radiance_parameters=self.radiance_parameters, sensor_count=self.sensor_count, output_format=self.output_format, conversion=self.conversion, header=self.header, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, conversion=self.conversion, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, sensor_count=self.sensor_count)

def output(self):
return {
'result_file': luigi.LocalTarget(
pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/direct_sky/{grid}.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix()
pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/direct_sky/{grid}.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix()
)
}

Expand All @@ -141,7 +141,7 @@ def output_artifacts(self):
return [
{
'name': 'result-file', 'from': 'results.ill',
'to': pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/direct_sky/{grid}.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix(),
'to': pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/direct_sky/{grid}.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix(),
'optional': False,
'type': 'file'
}]
Expand All @@ -161,7 +161,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.66.103'
return 'docker.io/ladybugtools/honeybee-radiance:1.66.106'

@property
def image_workdir(self):
Expand Down Expand Up @@ -252,12 +252,12 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scontrib scene.oct grid.pts suns.mod --{calculate_values} --sensor-count {sensor_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --output results.ill --order-by-{order_by} --{header}-header'.format(radiance_parameters=self.radiance_parameters, calculate_values=self.calculate_values, sensor_count=self.sensor_count, output_format=self.output_format, conversion=self.conversion, header=self.header, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by)
return 'honeybee-radiance dc scontrib scene.oct grid.pts suns.mod --{calculate_values} --sensor-count {sensor_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --output results.ill --order-by-{order_by} --{header}-header'.format(calculate_values=self.calculate_values, header=self.header, conversion=self.conversion, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, sensor_count=self.sensor_count)

def output(self):
return {
'result_file': luigi.LocalTarget(
pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/direct.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix()
pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/direct.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix()
)
}

Expand All @@ -273,7 +273,7 @@ def output_artifacts(self):
return [
{
'name': 'result-file', 'from': 'results.ill',
'to': pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/direct.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix(),
'to': pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/direct.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix(),
'optional': False,
'type': 'file'
}]
Expand All @@ -294,7 +294,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.66.103'
return 'docker.io/ladybugtools/honeybee-radiance:1.66.106'

@property
def image_workdir(self):
Expand Down Expand Up @@ -388,12 +388,12 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(radiance_parameters=self.radiance_parameters, sensor_count=self.sensor_count, output_format=self.output_format, conversion=self.conversion, header=self.header, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, conversion=self.conversion, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, sensor_count=self.sensor_count)

def output(self):
return {
'result_file': luigi.LocalTarget(
pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/reflected.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix()
pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/reflected.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix()
)
}

Expand All @@ -410,7 +410,7 @@ def output_artifacts(self):
return [
{
'name': 'result-file', 'from': 'results.ill',
'to': pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/reflected.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix(),
'to': pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/reflected.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix(),
'optional': False,
'type': 'file'
}]
Expand All @@ -430,7 +430,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.66.103'
return 'docker.io/ladybugtools/honeybee-radiance:1.66.106'

@property
def image_workdir(self):
Expand Down Expand Up @@ -520,12 +520,12 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(radiance_parameters=self.radiance_parameters, sensor_count=self.sensor_count, output_format=self.output_format, conversion=self.conversion, header=self.header, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, conversion=self.conversion, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, sensor_count=self.sensor_count)

def output(self):
return {
'result_file': luigi.LocalTarget(
pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/total_sky/{grid}.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix()
pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/total_sky/{grid}.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix()
)
}

Expand All @@ -542,7 +542,7 @@ def output_artifacts(self):
return [
{
'name': 'result-file', 'from': 'results.ill',
'to': pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/total_sky/{grid}.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix(),
'to': pathlib.Path(self.execution_folder, 'shd_trans/initial/{group}/total_sky/{grid}.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix(),
'optional': False,
'type': 'file'
}]
Expand All @@ -562,7 +562,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.66.103'
return 'docker.io/ladybugtools/honeybee-radiance:1.66.106'

@property
def image_workdir(self):
Expand Down Expand Up @@ -636,7 +636,7 @@ def requires(self):
def output(self):
return {
'results_file': luigi.LocalTarget(
pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/indirect.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix()
pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/indirect.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix()
)
}

Expand All @@ -651,7 +651,7 @@ def output_artifacts(self):
return [
{
'name': 'results-file', 'from': 'final.ill',
'to': pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/indirect.ill'.format(grid=self.grid, group=self.group)).resolve().as_posix(),
'to': pathlib.Path(self.execution_folder, 'shd_trans/final/{grid}/{group}/indirect.ill'.format(group=self.group, grid=self.grid)).resolve().as_posix(),
'optional': False,
'type': 'file'
}]
Expand All @@ -667,14 +667,14 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.66.103'
return 'docker.io/ladybugtools/honeybee-radiance:1.66.106'

@property
def image_workdir(self):
return '/home/ladybugbot/run'


class _ShadeContribEntryPoint_cbe7c10eOrchestrator(luigi.WrapperTask):
class _ShadeContribEntryPoint_1f915e33Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
8 changes: 4 additions & 4 deletions lbt_recipes/utci_comfort_map/flow/dependencies/dependencies/spherical_view_factor.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from utci-comfort-map:0.9.12.
This file is auto-generated from utci-comfort-map:0.9.15.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.
Expand Down Expand Up @@ -89,7 +89,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance-postprocess view-factor contrib scene.oct grid.pts scene.mod --ray-count {ray_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --name view_factor'.format(radiance_parameters=self.radiance_parameters, ray_count=self.ray_count, fixed_radiance_parameters=self.fixed_radiance_parameters)
return 'honeybee-radiance-postprocess view-factor contrib scene.oct grid.pts scene.mod --ray-count {ray_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --name view_factor'.format(fixed_radiance_parameters=self.fixed_radiance_parameters, radiance_parameters=self.radiance_parameters, ray_count=self.ray_count)

def output(self):
return {
Expand Down Expand Up @@ -125,14 +125,14 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance-postprocess:0.4.431'
return 'docker.io/ladybugtools/honeybee-radiance-postprocess:0.4.443'

@property
def image_workdir(self):
return '/home/ladybugbot/run'


class _SphericalViewFactor_cbe7c10eOrchestrator(luigi.WrapperTask):
class _SphericalViewFactor_1f915e33Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
Loading

0 comments on commit e78f4d2

Please sign in to comment.