Skip to content

Commit bcdeb79

Browse files
committed
fix(folder): Add function to return IES rad files and config pattern
1 parent 4bcb1b4 commit bcdeb79

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

honeybee_radiance_folder/folder.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ info_pattern = ^.*\.json$
2727
[IES]
2828
path = ies
2929
ies_pattern = ^.*\.ies$
30+
rad_pattern = ^(?!__.*__\.rad$).*\.rad$
3031

3132
[SCENE]
3233
path = scene

honeybee_radiance_folder/folder.py

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,25 @@ def scene_files(self, black_out=False, rel_path=True):
482482
)
483483
return self._match_files(modifier_files, geometry_files)
484484

485+
def ies_files(self, rel_path=True):
486+
"""Return list of RAD files in the IES folder matching rad_pattern.
487+
488+
Args:
489+
rel_path (str): Set rel_path to False for getting full path to files. By
490+
default the path is relative to study folder root.
491+
"""
492+
cfg = self._config['IES']
493+
pattern = cfg['rad_pattern']
494+
495+
if not pattern:
496+
return []
497+
498+
return self._find_files(
499+
self.ies_folder(full=True),
500+
pattern,
501+
rel_path
502+
)
503+
485504
def grid_files(self, rel_path=True, group=None):
486505
"""Return list of grid files."""
487506
cfg = self._config['GRID']
@@ -750,12 +769,12 @@ def octree_scene_mapping(self, exclude_static=True, phase=2, default_states=Fals
750769
scene_mapping = {
751770
'two_phase': two_phase
752771
}
753-
if phase == 3:
772+
elif phase == 3:
754773
scene_mapping = {
755774
'two_phase': two_phase,
756775
'three_phase': three_phase
757776
}
758-
if phase == 5:
777+
else:
759778
scene_mapping = {
760779
'two_phase': two_phase,
761780
'three_phase': three_phase,
@@ -855,12 +874,12 @@ def _update_dict(dict, key, value):
855874
grid_mapping = {
856875
'two_phase': two_phase
857876
}
858-
if phase == 3:
877+
elif phase == 3:
859878
grid_mapping = {
860879
'two_phase': two_phase,
861880
'three_phase': three_phase
862881
}
863-
if phase == 5:
882+
else:
864883
grid_mapping = {
865884
'two_phase': two_phase,
866885
'three_phase': three_phase,

0 commit comments

Comments
 (0)