Skip to content

Commit

Permalink
fix(annual): Enable Mirror materials to simulate in annual calculations
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswmackey committed Jul 14, 2022
1 parent 337095b commit d3fb827
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def radiance_parameters(self):

@property
def fixed_radiance_parameters(self):
return '-aa 0.0 -I -faf -ab 0 -dc 1.0 -dt 0.0 -dj 0.0 -dr 0'
return '-aa 0.0 -I -faf -ab 0 -dc 1.0 -dt 0.0 -dj 0.0'

@property
def sensor_count(self):
Expand Down Expand Up @@ -422,7 +422,7 @@ def output_artifacts(self):
}]


class _AnnualDaylightRayTracing_4ea8b907Orchestrator(luigi.WrapperTask):
class _AnnualDaylightRayTracing_ae044755Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
10 changes: 5 additions & 5 deletions lbt_recipes/annual_daylight/flow/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
import pathlib
from queenbee_local import QueenbeeTask
from queenbee_local import load_input_param as qb_load_input_param
from .dependencies.annual_daylight_ray_tracing import _AnnualDaylightRayTracing_4ea8b907Orchestrator as AnnualDaylightRayTracing_4ea8b907Workerbee
from .dependencies.annual_daylight_ray_tracing import _AnnualDaylightRayTracing_ae044755Orchestrator as AnnualDaylightRayTracing_ae044755Workerbee


_default_inputs = { 'cpu_count': 50,
'grid_filter': '*',
'min_sensor_count': 1,
'min_sensor_count': 500,
'model': None,
'north': 0.0,
'params_folder': '__params',
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05',
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05 -dr 0',
'schedule': None,
'simulation_folder': '.',
'thresholds': '-t 300 -lt 100 -ut 3000',
Expand Down Expand Up @@ -156,7 +156,7 @@ def map_dag_inputs(self):
return inputs

def run(self):
yield [AnnualDaylightRayTracing_4ea8b907Workerbee(_input_params=self.map_dag_inputs)]
yield [AnnualDaylightRayTracing_ae044755Workerbee(_input_params=self.map_dag_inputs)]
done_file = pathlib.Path(self.execution_folder, 'annual_daylight_raytracing.done')
done_file.parent.mkdir(parents=True, exist_ok=True)
done_file.write_text('done!')
Expand Down Expand Up @@ -950,7 +950,7 @@ def output_parameters(self):
return [{'name': 'sensor-grids', 'from': 'output_folder/_info.json', 'to': pathlib.Path(self.params_folder, 'output_folder/_info.json').resolve().as_posix()}]


class _Main_4ea8b907Orchestrator(luigi.WrapperTask):
class _Main_ae044755Orchestrator(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/annual_daylight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "MetaData",
"annotations": {},
"name": "annual-daylight",
"tag": "0.8.14",
"tag": "0.8.21",
"app_version": null,
"keywords": [
"honeybee",
Expand Down Expand Up @@ -101,7 +101,7 @@
"annotations": {},
"name": "min-sensor-count",
"description": "The minimum number of sensors in each sensor grid after redistributing the sensors based on cpu_count. This value takes precedence over the cpu_count and can be used to ensure that the parallelization does not result in generating unnecessarily small sensor grids. The default value is set to 1, which means that the cpu_count is always respected.",
"default": 1,
"default": 500,
"alias": [
{
"type": "DAGIntegerInputAlias",
Expand Down Expand Up @@ -235,7 +235,7 @@
"annotations": {},
"name": "radiance-parameters",
"description": "The radiance parameters for ray tracing.",
"default": "-ab 2 -ad 5000 -lw 2e-05",
"default": "-ab 2 -ad 5000 -lw 2e-05 -dr 0",
"alias": [
{
"type": "DAGStringInputAlias",
Expand All @@ -246,7 +246,7 @@
"grasshopper"
],
"handler": [],
"default": "-ab 2 -ad 5000 -lw 2e-05",
"default": "-ab 2 -ad 5000 -lw 2e-05 -dr 0",
"required": false,
"spec": null
}
Expand Down
6 changes: 3 additions & 3 deletions lbt_recipes/annual_daylight/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

_recipe_default_inputs = { 'cpu_count': 50,
'grid_filter': '*',
'min_sensor_count': 1,
'min_sensor_count': 500,
'model': None,
'north': 0.0,
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05',
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05 -dr 0',
'schedule': None,
'thresholds': '-t 300 -lt 100 -ut 3000',
'wea': None}
Expand All @@ -39,7 +39,7 @@ class LetAnnualDaylightFly(luigi.WrapperTask):
_input_params = luigi.DictParameter()

def requires(self):
yield [annual_daylight_workerbee._Main_4ea8b907Orchestrator(_input_params=self._input_params)]
yield [annual_daylight_workerbee._Main_ae044755Orchestrator(_input_params=self._input_params)]


def start(project_folder, user_values, workers):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def radiance_parameters(self):

@property
def fixed_radiance_parameters(self):
return '-aa 0.0 -I -ab 0 -dc 1.0 -dt 0.0 -dj 0.0 -dr 0'
return '-aa 0.0 -I -ab 0 -dc 1.0 -dt 0.0 -dj 0.0'

@property
def sensor_count(self):
Expand Down Expand Up @@ -432,7 +432,7 @@ def output_artifacts(self):
}]


class _AnnualIrradianceRayTracing_cf993373Orchestrator(luigi.WrapperTask):
class _AnnualIrradianceRayTracing_2fafd374Orchestrator(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/annual_irradiance/flow/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import pathlib
from queenbee_local import QueenbeeTask
from queenbee_local import load_input_param as qb_load_input_param
from .dependencies.annual_irradiance_ray_tracing import _AnnualIrradianceRayTracing_cf993373Orchestrator as AnnualIrradianceRayTracing_cf993373Workerbee
from .dependencies.annual_irradiance_ray_tracing import _AnnualIrradianceRayTracing_2fafd374Orchestrator as AnnualIrradianceRayTracing_2fafd374Workerbee


_default_inputs = { 'cpu_count': 50,
Expand All @@ -27,7 +27,7 @@
'north': 0.0,
'output_type': 'solar',
'params_folder': '__params',
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05',
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05 -dr 0',
'simulation_folder': '.',
'timestep': 1,
'wea': None}
Expand Down Expand Up @@ -156,7 +156,7 @@ def map_dag_inputs(self):
return inputs

def run(self):
yield [AnnualIrradianceRayTracing_cf993373Workerbee(_input_params=self.map_dag_inputs)]
yield [AnnualIrradianceRayTracing_2fafd374Workerbee(_input_params=self.map_dag_inputs)]
done_file = pathlib.Path(self.execution_folder, 'annual_irradiance_raytracing.done')
done_file.parent.mkdir(parents=True, exist_ok=True)
done_file.write_text('done!')
Expand Down Expand Up @@ -1238,7 +1238,7 @@ def output_parameters(self):
return [{'name': 'sensor-grids', 'from': 'output_folder/_info.json', 'to': pathlib.Path(self.params_folder, 'output_folder/_info.json').resolve().as_posix()}]


class _Main_cf993373Orchestrator(luigi.WrapperTask):
class _Main_2fafd374Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
6 changes: 3 additions & 3 deletions lbt_recipes/annual_irradiance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "MetaData",
"annotations": {},
"name": "annual-irradiance",
"tag": "0.3.8",
"tag": "0.3.10",
"app_version": null,
"keywords": [
"honeybee",
Expand Down Expand Up @@ -274,7 +274,7 @@
"annotations": {},
"name": "radiance-parameters",
"description": "Radiance parameters for ray tracing.",
"default": "-ab 2 -ad 5000 -lw 2e-05",
"default": "-ab 2 -ad 5000 -lw 2e-05 -dr 0",
"alias": [
{
"type": "DAGStringInputAlias",
Expand All @@ -285,7 +285,7 @@
"grasshopper"
],
"handler": [],
"default": "-ab 2 -ad 5000 -lw 2e-05",
"default": "-ab 2 -ad 5000 -lw 2e-05 -dr 0",
"required": false,
"spec": null
}
Expand Down
4 changes: 2 additions & 2 deletions lbt_recipes/annual_irradiance/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
'model': None,
'north': 0.0,
'output_type': 'solar',
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05',
'radiance_parameters': '-ab 2 -ad 5000 -lw 2e-05 -dr 0',
'timestep': 1,
'wea': None}

Expand All @@ -39,7 +39,7 @@ class LetAnnualIrradianceFly(luigi.WrapperTask):
_input_params = luigi.DictParameter()

def requires(self):
yield [annual_irradiance_workerbee._Main_cf993373Orchestrator(_input_params=self._input_params)]
yield [annual_irradiance_workerbee._Main_2fafd374Orchestrator(_input_params=self._input_params)]


def start(project_folder, user_values, workers):
Expand Down

0 comments on commit d3fb827

Please sign in to comment.