honeybee-radiance-postprocess 0.4.568__py3-none-any.whl → 0.4.577__py3-none-any.whl

honeybee_radiance_postprocess/cli/well.py

@@ -83,7 +83,7 @@ def well_daylight_vis(output_folder):
     metric_info_dict = {
         'L01': {
             'type': 'VisualizationMetaData',
-            'data_type': GenericType('sDA200,40%', '').to_dict(),
+            'data_type': GenericType('sDA150,50%', '').to_dict(),
             'unit': '',
             'legend_parameters': pass_fail_lpar.to_dict()
         },

honeybee_radiance_postprocess/well/well.py

@@ -227,6 +227,56 @@ def well_annual_daylight(
     if not grid_areas:
         grid_areas = [None] * len(grids_info)
 
+    well_version = {
+        'Version': 'WELL v2, Q2 2025',
+        'L01': {
+            'IES LM-83': {
+                'Method': 'IES LM-83',
+                'sda_target_illuminance': 150,
+                'sda_occupancy': 50,
+                'sda_threshold': 30
+            },
+            'EN 17037': {
+                'Method': 'EN 17037',
+                'target_illuminance': 200,
+                'daylit_hours': 50,
+                'sda_threshold': 30
+            }
+        },
+        'L06': {
+            'Tier 1': {
+                'IES LM-83': {
+                    'Method': 'IES LM-83',
+                    'sda_target_illuminance': 300,
+                    'sda_occupancy': 50,
+                    'sda_threshold': 55
+                },
+                'EN 17037': {
+                    'Method': 'EN 17037',
+                    'target_illuminance': 300,
+                    'daylit_hours': 50,
+                    'sda_threshold': 50
+                }
+            },
+            'Tier 2': {
+                'IES LM-83': {
+                    'Method': 'IES LM-83',
+                    'sda_target_illuminance': 300,
+                    'sda_occupancy': 50,
+                    'sda_threshold': 75
+                },
+                'EN 17037': {
+                    'Method': 'EN 17037',
+                    'target_illuminance': 300,
+                    'minimum_illuminance': 100,
+                    'daylit_hours': 50,
+                    'sda_target_threshold': 50,
+                    'sda_minimum_threshold': 95
+                }
+            }
+        }
+    }
+
     # spatial daylight autonomy
     l06_da_grids = []
     l06_pass_sda_grids = []
@@ -291,17 +341,17 @@ def well_annual_daylight(
         array_blinds_up = sum(arrays_blinds_up)
         array_blinds_down = sum(arrays_blinds_down)
         # calculate da per grid
-        da_grid = da_array2d(array, total_occ=total_occ, threshold=200)
+        da_grid = da_array2d(array, total_occ=total_occ, threshold=well_version['L01']['IES LM-83']['sda_target_illuminance'])
 
         l01_da_grids.append(da_grid)
         da_blinds_up_grid = da_array2d(
-            array_blinds_up, total_occ=total_occ, threshold=200)
+            array_blinds_up, total_occ=total_occ, threshold=well_version['L01']['IES LM-83']['sda_target_illuminance'])
         da_blinds_down_grid = da_array2d(
-            array_blinds_down, total_occ=total_occ, threshold=200)
+            array_blinds_down, total_occ=total_occ, threshold=well_version['L01']['IES LM-83']['sda_target_illuminance'])
         # calculate sda per grid
-        l01_pass_sda_grids.append(da_grid >= 40)
-        l01_pass_sda_blinds_up_grids.append(da_blinds_up_grid >= 40)
-        l01_pass_sda_blinds_down_grids.append(da_blinds_down_grid >= 40)
+        l01_pass_sda_grids.append(da_grid >= well_version['L01']['IES LM-83']['sda_occupancy'])
+        l01_pass_sda_blinds_up_grids.append(da_blinds_up_grid >= well_version['L01']['IES LM-83']['sda_occupancy'])
+        l01_pass_sda_blinds_down_grids.append(da_blinds_down_grid >= well_version['L01']['IES LM-83']['sda_occupancy'])
 
     # create summaries for all grids and each grid individually
     l06_ies_lm_summary, l06_ies_lm_summary_grid = _well_summary(
@@ -341,8 +391,8 @@ def well_annual_daylight(
         if np.any(array):
             array = np.apply_along_axis(
                 filter_array, 1, array, occ_mask)
-        l01_grid_da_target = da_array2d(array, total_occ=4380, threshold=200)
-        l01_combined_da_target.append(l01_grid_da_target >= 50)
+        l01_grid_da_target = da_array2d(array, total_occ=4380, threshold=well_version['L01']['EN 17037']['target_illuminance'])
+        l01_combined_da_target.append(l01_grid_da_target >= well_version['L01']['EN 17037']['daylit_hours'])
 
     l06_combined_sda_target_illuminance = np.concatenate(l06_combined_da_target).mean() * 100
     l06_combined_sda_minimum_illuminance = np.concatenate(l06_combined_da_minimum).mean() * 100
@@ -382,7 +432,7 @@ def well_annual_daylight(
             else:
                 l06_ies_lm_summary['credits'] = 'Exemplary performance'
 
-        if l01_ies_lm_summary['sda'] >= 30:
+        if l01_ies_lm_summary['sda'] >= well_version['L01']['IES LM-83']['sda_threshold']:
             l01_well_summary_ies_lm['comply'] = True
         else:
             l01_well_summary_ies_lm['comply'] = False
@@ -506,4 +556,7 @@ def well_annual_daylight(
     well_summary_file = sub_folder.joinpath('l01_well_summary.json')
     well_summary_file.write_text(json.dumps(l01_well_summary, indent=2))
 
+    well_version_file = sub_folder.joinpath('well_version.json')
+    well_version_file.write_text(json.dumps(well_version, indent=2))
+
     return (l06_well_summary, l01_well_summary, states_schedule, fail_to_comply, grids_info)

{honeybee_radiance_postprocess-0.4.568.dist-info → honeybee_radiance_postprocess-0.4.577.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-radiance-postprocess
-Version: 0.4.568
+Version: 0.4.577
 Summary: Postprocessing of Radiance results and matrices
 Home-page: https://github.com/ladybug-tools/honeybee-radiance-postprocess
 Author: Ladybug Tools
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-radiance==1.66.204
+Requires-Dist: honeybee-radiance==1.66.211
 Requires-Dist: numpy<2.0.0
 Dynamic: author
 Dynamic: author-email

{honeybee_radiance_postprocess-0.4.568.dist-info → honeybee_radiance_postprocess-0.4.577.dist-info}/RECORD

@@ -29,7 +29,7 @@ honeybee_radiance_postprocess/cli/translate.py,sha256=W3G5aBN7pGx5sX3VoV1xZM6HL0
 honeybee_radiance_postprocess/cli/two_phase.py,sha256=njkWBRxOqdRSp0JxLloWTGWmKruyONetgnIbjXhrrXw,8393
 honeybee_radiance_postprocess/cli/util.py,sha256=Be9cGmYhcV2W37ma6SgQPCWCpWLLLlroxRYN_l58kY0,4077
 honeybee_radiance_postprocess/cli/viewfactor.py,sha256=RJ0ai9ykhdryYOgYkY9tAim9MhXPD1gVAR3Js9UaEgE,5380
-honeybee_radiance_postprocess/cli/well.py,sha256=wWz-aWon4E_tLar0mepolW8WJdk6hF869wZPZSkbNrE,3772
+honeybee_radiance_postprocess/cli/well.py,sha256=ABEp7qlNZdNgoGnJuLGt53kpfUr2ptT7XZsLLKcbfS8,3772
 honeybee_radiance_postprocess/ies/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
 honeybee_radiance_postprocess/ies/lm.py,sha256=6oT4XzWwr6njKRBjY0xL9TzBqQUAeQLwzen57BHOp4E,9746
 honeybee_radiance_postprocess/ies/lm_schedule.py,sha256=nZlORbRQvPiA8VeRfh7ML8cMAYUxmHOgsNCxAHuOr18,10042
@@ -41,10 +41,10 @@ honeybee_radiance_postprocess/results/annual_daylight.py,sha256=ulv8kZvS6UkhCjaX
 honeybee_radiance_postprocess/results/annual_irradiance.py,sha256=nA1VubesNDtRxgXpHSZxFMV67XxUntIHIu5H9qtDBSk,8483
 honeybee_radiance_postprocess/results/results.py,sha256=twfOF_ZNflxujWqpzigz4_pZ1vcSpF8cQxWIy7ajt0Y,56378
 honeybee_radiance_postprocess/well/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
-honeybee_radiance_postprocess/well/well.py,sha256=KO0BOs4-P_PnsGFfasoz1xgaNac4zqOQ9JqTjmMapuU,22598
-honeybee_radiance_postprocess-0.4.568.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.568.dist-info/METADATA,sha256=Q-ETDrGRes9BNQFdahmJjg0VOPWiTi_srPG80nvYn_I,2575
-honeybee_radiance_postprocess-0.4.568.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-honeybee_radiance_postprocess-0.4.568.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.568.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.568.dist-info/RECORD,,
+honeybee_radiance_postprocess/well/well.py,sha256=FzxaLo3IdlvFZZ1UtblBk9zsKl_EfsCKIcAgfucq-nE,24762
+honeybee_radiance_postprocess-0.4.577.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.577.dist-info/METADATA,sha256=-vQMR1wlZenF4L8yyXfDspj1GzmFjpZRMMsxXQexGbE,2575
+honeybee_radiance_postprocess-0.4.577.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+honeybee_radiance_postprocess-0.4.577.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.577.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.577.dist-info/RECORD,,