Update app/internal_loads.py

app/internal_loads.py

@@ -28,39 +28,203 @@ LOAD_TYPES = ["Occupancy", "Lighting", "Equipment", "Other"]
 SCHEDULE_TYPES = ["Continuous", "Day/Night", "Custom"]
 DAYS_OF_WEEK = ["Weekday", "Weekend"]
 
-# Default occupancy densities by building type (m² per person)
+# Building types with categories for display
+BUILDING_TYPES = [
+    "Residential - Single-Family Detached",
+    "Residential - Single-Family Attached",
+    "Residential - Multifamily (Low-rise and High-rise)",
+    "Residential - Dormitories",
+    "Residential - Hotels and Motels",
+    "Commercial/Retail - Strip Mall",
+    "Commercial/Retail - Enclosed Mall",
+    "Commercial/Retail - Department Store",
+    "Commercial/Retail - Supermarket",
+    "Commercial/Retail - Convenience Store",
+    "Commercial/Retail - Fast Food Restaurant",
+    "Commercial/Retail - Full-Service Restaurant",
+    "Office - Small Office (<10,000 ft²)",
+    "Office - Medium Office (≈50,000 ft²)",
+    "Office - Large Office (>100,000 ft²)",
+    "Office - Call Centre",
+    "Educational - Primary School",
+    "Educational - Secondary School",
+    "Educational - University/College Classroom",
+    "Educational - Lecture Hall",
+    "Educational - Laboratory",
+    "Educational - Library",
+    "Healthcare - Hospital (Inpatient)",
+    "Healthcare - Outpatient Clinic/Medical Office",
+    "Healthcare - Nursing Home/Aged Care",
+    "Assembly - Auditorium",
+    "Assembly - Theatre/Performing Arts",
+    "Assembly - Convention Centre",
+    "Assembly - Gymnasium/Sports Arena",
+    "Assembly - Religious Building",
+    "Industrial - Light Manufacturing",
+    "Industrial - Heavy Manufacturing",
+    "Industrial - Warehouse (Unconditioned or Semi-conditioned)",
+    "Industrial - Data Centre/Server Room",
+    "Public and Institutional - Courthouse",
+    "Public and Institutional - Police Station",
+    "Public and Institutional - Fire Station",
+    "Public and Institutional - Post Office",
+    "Public and Institutional - Museum",
+    "Lodging - Hotel (Full-Service, Midscale, or Economy)",
+    "Lodging - Motel",
+    "Lodging - Resort",
+    "Transportation - Airport Terminal",
+    "Transportation - Train/Bus Station",
+    "Transportation - Car Park (Enclosed)",
+    "Other"
+]
+
+# Default occupancy density by building type (m² per person)
 DEFAULT_OCCUPANCY_DENSITIES = {
-    "Office": 10.0,
-    "Retail": 5.0,
-    "Residential": 20.0,
-    "Educational": 4.0,
-    "Healthcare": 8.0,
-    "Industrial": 15.0,
-    "Hospitality": 3.0,
+    "Residential - Single-Family Detached": 40.0,
+    "Residential - Single-Family Attached": 30.0,
+    "Residential - Multifamily (Low-rise and High-rise)": 20.0,
+    "Residential - Dormitories": 10.0,
+    "Residential - Hotels and Motels": 15.0,
+    "Commercial/Retail - Strip Mall": 5.0,
+    "Commercial/Retail - Enclosed Mall": 4.0,
+    "Commercial/Retail - Department Store": 5.0,
+    "Commercial/Retail - Supermarket": 6.0,
+    "Commercial/Retail - Convenience Store": 5.0,
+    "Commercial/Retail - Fast Food Restaurant": 3.0,
+    "Commercial/Retail - Full-Service Restaurant": 2.5,
+    "Office - Small Office (<10,000 ft²)": 10.0,
+    "Office - Medium Office (≈50,000 ft²)": 10.0,
+    "Office - Large Office (>100,000 ft²)": 10.0,
+    "Office - Call Centre": 6.0,
+    "Educational - Primary School": 4.0,
+    "Educational - Secondary School": 4.0,
+    "Educational - University/College Classroom": 3.5,
+    "Educational - Lecture Hall": 2.0,
+    "Educational - Laboratory": 8.0,
+    "Educational - Library": 5.0,
+    "Healthcare - Hospital (Inpatient)": 8.0,
+    "Healthcare - Outpatient Clinic/Medical Office": 7.0,
+    "Healthcare - Nursing Home/Aged Care": 10.0,
+    "Assembly - Auditorium": 2.0,
+    "Assembly - Theatre/Performing Arts": 2.0,
+    "Assembly - Convention Centre": 3.0,
+    "Assembly - Gymnasium/Sports Arena": 4.0,
+    "Assembly - Religious Building": 3.0,
+    "Industrial - Light Manufacturing": 15.0,
+    "Industrial - Heavy Manufacturing": 20.0,
+    "Industrial - Warehouse (Unconditioned or Semi-conditioned)": 25.0,
+    "Industrial - Data Centre/Server Room": 10.0,
+    "Public and Institutional - Courthouse": 5.0,
+    "Public and Institutional - Police Station": 8.0,
+    "Public and Institutional - Fire Station": 10.0,
+    "Public and Institutional - Post Office": 6.0,
+    "Public and Institutional - Museum": 5.0,
+    "Lodging - Hotel (Full-Service, Midscale, or Economy)": 15.0,
+    "Lodging - Motel": 15.0,
+    "Lodging - Resort": 12.0,
+    "Transportation - Airport Terminal": 3.0,
+    "Transportation - Train/Bus Station": 3.0,
+    "Transportation - Car Park (Enclosed)": 20.0,
     "Other": 10.0
 }
 
-# Default lighting power densities by building type (W/m²)
+# Default lighting power density by building type (W/m²)
 DEFAULT_LIGHTING_DENSITIES = {
-    "Office": 12.0,
-    "Retail": 18.0,
-    "Residential": 8.0,
-    "Educational": 15.0,
-    "Healthcare": 15.0,
-    "Industrial": 13.0,
-    "Hospitality": 14.0,
+    "Residential - Single-Family Detached": 8.0,
+    "Residential - Single-Family Attached": 8.0,
+    "Residential - Multifamily (Low-rise and High-rise)": 8.0,
+    "Residential - Dormitories": 10.0,
+    "Residential - Hotels and Motels": 12.0,
+    "Commercial/Retail - Strip Mall": 15.0,
+    "Commercial/Retail - Enclosed Mall": 18.0,
+    "Commercial/Retail - Department Store": 16.0,
+    "Commercial/Retail - Supermarket": 18.0,
+    "Commercial/Retail - Convenience Store": 20.0,
+    "Commercial/Retail - Fast Food Restaurant": 14.0,
+    "Commercial/Retail - Full-Service Restaurant": 14.0,
+    "Office - Small Office (<10,000 ft²)": 12.0,
+    "Office - Medium Office (≈50,000 ft²)": 12.0,
+    "Office - Large Office (>100,000 ft²)": 12.0,
+    "Office - Call Centre": 13.0,
+    "Educational - Primary School": 14.0,
+    "Educational - Secondary School": 14.0,
+    "Educational - University/College Classroom": 14.0,
+    "Educational - Lecture Hall": 15.0,
+    "Educational - Laboratory": 16.0,
+    "Educational - Library": 13.0,
+    "Healthcare - Hospital (Inpatient)": 15.0,
+    "Healthcare - Outpatient Clinic/Medical Office": 14.0,
+    "Healthcare - Nursing Home/Aged Care": 13.0,
+    "Assembly - Auditorium": 12.0,
+    "Assembly - Theatre/Performing Arts": 12.0,
+    "Assembly - Convention Centre": 14.0,
+    "Assembly - Gymnasium/Sports Arena": 15.0,
+    "Assembly - Religious Building": 12.0,
+    "Industrial - Light Manufacturing": 13.0,
+    "Industrial - Heavy Manufacturing": 13.0,
+    "Industrial - Warehouse (Unconditioned or Semi-conditioned)": 10.0,
+    "Industrial - Data Centre/Server Room": 15.0,
+    "Public and Institutional - Courthouse": 14.0,
+    "Public and Institutional - Police Station": 13.0,
+    "Public and Institutional - Fire Station": 13.0,
+    "Public and Institutional - Post Office": 14.0,
+    "Public and Institutional - Museum": 15.0,
+    "Lodging - Hotel (Full-Service, Midscale, or Economy)": 12.0,
+    "Lodging - Motel": 12.0,
+    "Lodging - Resort": 12.0,
+    "Transportation - Airport Terminal": 14.0,
+    "Transportation - Train/Bus Station": 14.0,
+    "Transportation - Car Park (Enclosed)": 8.0,
     "Other": 12.0
 }
 
-# Default equipment power densities by building type (W/m²)
+# Default equipment power density by building type (W/m²)
 DEFAULT_EQUIPMENT_DENSITIES = {
-    "Office": 15.0,
-    "Retail": 10.0,
-    "Residential": 5.0,
-    "Educational": 8.0,
-    "Healthcare": 20.0,
-    "Industrial": 25.0,
-    "Hospitality": 10.0,
+    "Residential - Single-Family Detached": 5.0,
+    "Residential - Single-Family Attached": 5.0,
+    "Residential - Multifamily (Low-rise and High-rise)": 5.0,
+    "Residential - Dormitories": 8.0,
+    "Residential - Hotels and Motels": 10.0,
+    "Commercial/Retail - Strip Mall": 10.0,
+    "Commercial/Retail - Enclosed Mall": 12.0,
+    "Commercial/Retail - Department Store": 12.0,
+    "Commercial/Retail - Supermarket": 15.0,
+    "Commercial/Retail - Convenience Store": 15.0,
+    "Commercial/Retail - Fast Food Restaurant": 20.0,
+    "Commercial/Retail - Full-Service Restaurant": 25.0,
+    "Office - Small Office (<10,000 ft²)": 15.0,
+    "Office - Medium Office (≈50,000 ft²)": 15.0,
+    "Office - Large Office (>100,000 ft²)": 15.0,
+    "Office - Call Centre": 20.0,
+    "Educational - Primary School": 8.0,
+    "Educational - Secondary School": 8.0,
+    "Educational - University/College Classroom": 10.0,
+    "Educational - Lecture Hall": 10.0,
+    "Educational - Laboratory": 20.0,
+    "Educational - Library": 10.0,
+    "Healthcare - Hospital (Inpatient)": 20.0,
+    "Healthcare - Outpatient Clinic/Medical Office": 15.0,
+    "Healthcare - Nursing Home/Aged Care": 12.0,
+    "Assembly - Auditorium": 8.0,
+    "Assembly - Theatre/Performing Arts": 8.0,
+    "Assembly - Convention Centre": 10.0,
+    "Assembly - Gymnasium/Sports Arena": 10.0,
+    "Assembly - Religious Building": 8.0,
+    "Industrial - Light Manufacturing": 20.0,
+    "Industrial - Heavy Manufacturing": 25.0,
+    "Industrial - Warehouse (Unconditioned or Semi-conditioned)": 8.0,
+    "Industrial - Data Centre/Server Room": 50.0,
+    "Public and Institutional - Courthouse": 12.0,
+    "Public and Institutional - Police Station": 15.0,
+    "Public and Institutional - Fire Station": 15.0,
+    "Public and Institutional - Post Office": 12.0,
+    "Public and Institutional - Museum": 10.0,
+    "Lodging - Hotel (Full-Service, Midscale, or Economy)": 10.0,
+    "Lodging - Motel": 10.0,
+    "Lodging - Resort": 12.0,
+    "Transportation - Airport Terminal": 12.0,
+    "Transportation - Train/Bus Station": 12.0,
+    "Transportation - Car Park (Enclosed)": 5.0,
     "Other": 12.0
 }
 
@@ -882,6 +1046,5 @@ def display_internal_loads_help():
     * The summary section shows the combined effect of all internal loads.
     """)
 
-
 BUILDING_TYPES = list(DEFAULT_OCCUPANCY_DENSITIES.keys())