diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3 2024-09-24 14.21.08.svg b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3 2024-09-24 14.21.08.svg index fbdc9ecc..11566270 100644 --- a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3 2024-09-24 14.21.08.svg +++ b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3 2024-09-24 14.21.08.svg @@ -1,4 +1,4 @@ - + @@ -10,4 +10,4 @@ - 1717013 ft floor-to-floor and 11 ft floor-to-ceilingThe South Wall is 35% windows.The North wall has a continuous rowof 5 ft high windows on each floor.There are no windows on the Eastand West walls.26 high44461820- 1710 = 27362248513*3 = 39ft high4446 * 0.65 = 2889.939-15 = 24 ft north24*224 = 537639*224 * (1-0.56)= 3843.8485*39 = 331515849.849265.918410813*3=39ft high184*39*0.58= 4162.08108*9=972184*9=16567762.0817999179*9=161199*9*2=1782179*39*0.51=3560.313 h-ft2F/Btu for windows = 0.3333333340 h-ft2F/Btu for the roof = 0.02525 h-ft2F/Btu for the opaque walls = 0.04Area (square feet)North...South...North...South...East ...Roof022,429Area (square feet)North...South...North...South...East ...Roof022,429Surface Area (square feet)North Windows 2,881South Windows 4,036North Opaque Walls 5,285South Opaque Walls 4,769East and West Walls 8,160Roof 22,429221145615678403876062556435896108960.018 Btu/(ft^3·°F)19,793Given a 4-story office building in the northern hemisphere with a flat roof determine the hourly average solar heat gain through the windows in January if the Solar Insolation is 812 BTU/(day-ft2).1. The dimensions of the building are 160 ft for North-South walls, 64 ft for East-West walls. 13 ft floor-to-floor and 11 ft floor-to-ceiling heights.2. The South wall is 57% windows. The North wall has a continuous 3 ft clearstory window on each floor. The East and West walls have no windows. Friday visit daniels uoft chinatown ago meet laura at ocad textile museumSaturday have koreans for early lunch, then toronto zoo til dinner time for youSunday light breakfast at hotel, we meet at tommy thompson park parking lot,maybe do cycling there then centre island, then go gyubee japanese grill thentalk show \ No newline at end of file + 1717013 ft floor-to-floor and 11 ft floor-to-ceilingThe South Wall is 35% windows.The North wall has a continuous rowof 5 ft high windows on each floor.There are no windows on the Eastand West walls.26 high44461820- 1710 = 27362248513*3 = 39ft high4446 * 0.65 = 2889.939-15 = 24 ft north24*224 = 537639*224 * (1-0.56)= 3843.8485*39 = 331515849.849265.918410813*3=39ft high184*39*0.58= 4162.08108*9=972184*9=16567762.0817999179*9=161199*9*2=1782179*39*0.51=3560.313 h-ft2F/Btu for windows = 0.3333333340 h-ft2F/Btu for the roof = 0.02525 h-ft2F/Btu for the opaque walls = 0.04Area (square feet)North...South...North...South...East ...Roof022,429Area (square feet)North...South...North...South...East ...Roof022,429Surface Area (square feet)North Windows 2,881South Windows 4,036North Opaque Walls 5,285South Opaque Walls 4,769East and West Walls 8,160Roof 22,429221145615678403876062556435896108960.018 Btu/(ft^3·°F)19,793Given a 4-story office building in the northern hemisphere with a flat roof determine the hourly average solar heat gain through the windows in January if the Solar Insolation is 812 BTU/(day-ft2).1. The dimensions of the building are 160 ft for North-South walls, 64 ft for East-West walls. 13 ft floor-to-floor and 11 ft floor-to-ceiling heights.2. The South wall is 57% windows. The North wall has a continuous 3 ft clearstory window on each floor. The East and West walls have no windows. Friday visit daniels uoft chinatown ago meet laura at ocad textile museumSaturday have koreans for early lunch, then toronto zoo til dinner time for youSunday light breakfast at hotel, we meet at tommy thompson park parking lot,maybe do cycling there then centre island, then go gyubee japanese grill thentalk show \ No newline at end of file diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3.md b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3.md index 010b579f..58e826d9 100644 --- a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3.md +++ b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/ARC2047H-Building_Science_Materials_and_Construction_3.md @@ -199,7 +199,7 @@ Excess = 19,121.0122 kJ - Q_i: Internal Heat Gain (Btu/h) = q_solar + q_internal - q_solar = Solar Insolation (BTU/(day-ft^2)) \* Surface Area South (ft^2) × 1d/24h - q_internal = A: Floor Area (ft2) × (q_people + q_equipment + q_lights) (Btu/(h·ft2)) - - UA_total: Heat Loss (Btu/(h\*oF)) = UA_envelope + UA_infiltration + - UA_total: Heat Loss (Btu/(h\*oF)) = UA_envelope + UA_infiltration ^6c9468 - UA_envelope = U-value × Area (ft^2) - U (Btu/(h\*ft^2\*^oF)) (W/m^2 ^oK) = 1 ÷ R - U = k: Conductivity ÷ Thickness @@ -263,7 +263,7 @@ Biogenic Carbon? ##### Lecture -- Cooling Loads +- Cooling Loads ^2de642 - **q_total: Total Heat Gain = q_sensible + q_latent** - **Tons of cooling** = q_total ÷ 12000 ^caf758 - Ton of cooling is the rate of heat transfer (power) @@ -329,7 +329,7 @@ Ventilation Factor = 11 - 1.5* ((11-16)/-5) = 9.5 > > qcross ventilation = V × 1.08 Btu·min/(ft3·°F·h) × ∆T q cross ventilation is in units of power (Btu/h) **Cooling via Cross Ventilation (Natural Ventilation)** -- q_ventilation (Btu/h) = V (cfm) × heat capacity of air (Btu·min/(ft3·°F·h)) × ∆T (°F) +- q_ventilation (Btu/h) = V (cfm) × heat capacity of air (Btu·min/(ft3·°F·h)) × ∆T (°F) ^bd2f04 - A unit of power - Requires openings on both sides and wind perpendicular to the opening surface - V: Volumetric flow rate (cfm cubic feet per minute) @@ -491,16 +491,384 @@ Annual Cost of Cooling = 222343 × 1224 × (1/20) × (0.22/1000) = 2993 #### Module 08 +[[./Attachments/2024+10+22+week+8+slides+v3 2024-10-22 14_37_23.pdf|2024+10+22+week+8+slides+v3 2024-10-22 14_37_23]] + +[[./Attachments/20241022 week 8 slides v3 2024-10-22 14_42_07.pdf|20241022 week 8 slides v3 2024-10-22 14_42_07]] + +[[./Attachments/ARC2047HF+HVAC+Distribution+Metric+Example 2024-10-22 14_29_56.pdf|ARC2047HF+HVAC+Distribution+Metric+Example 2024-10-22 14_29_56]] + +[[./Attachments/ARC2047HF+HW5+Solutions 2024-10-22 14_30_05.pdf|ARC2047HF+HW5+Solutions 2024-10-22 14_30_05]] + +[[./Attachments/ARC2047HF+HW6+-+Self+Study+-+HVAC+Distribution 2024-10-22 14_30_15.pdf|ARC2047HF+HW6+-+Self+Study+-+HVAC+Distribution 2024-10-22 14_30_15]] + +[[./Attachments/Week+8+Charts+and+Tables 2024-10-22 14_29_53.pdf|Week+8+Charts+and+Tables 2024-10-22 14_29_53]] + +##### Lecture + +HVAC Distribution +- + - Pressure in ducts measured in Pascal or inches of water + - 1 inch of water = 248.84 Pa +- Diameter at each section of duct, Circular vs. Rectangular vs. Rectangular With Insulation + - ==Critical Path: Duct Size and Shape== [[./Attachments/2024+10+22+week+8+slides+v3 2024-10-22 14_37_23.pdf#page=31&selection=0,34,0,34|(p.31)]] + - + - 2in of insulation on each surface + - Turning radius is usually twice the duct diameter + - Air Velocity (fpm) at each section of duct + - V_each = SUM($V_tributary) + - **Total pressure loss** of critical path (in. wtr.) = Critical path equivalent length (ft) × Friction Loss (in. wtr./100ft) + Loss at diffuser: 0.04 in. wtr. ^b2baf5 + - This needs to be **less than 0.5 inches of water** to maintain efficiency of the system. If the pressure loss is too high, we need to use a slower velocity than 350 fpm + - Critical Path equivalent length = Longest Equivalent Length ^2bf58f + - Equivalent Length (ft) = Duct Length + Equivalent Fitting Length + - None: +0ft + - Diffuser: +0ft + - Entry: +10ft + - 90° elbow: +35ft + - Count the final one too + - Include vertical duct from basement AHU + - Friction Loss (in. wtr/100ft) from Friction chart + - Air Velocity (fpm) + - Chosen from NC-25 + - Limited by shortest distance from AHU to openings + - V (cfm): Volumetric Flow Rate ^a2dc5f + - Is governed by the greater of cooling or heating loads + - [[ARC2047H-Building_Science_Materials_and_Construction_3#^2de642|q_cooling load (Btu/h | tons)]] + - q_heating load (Btu/h | tons) = [[ARC2047H-Building_Science_Materials_and_Construction_3#^6c9468|UA_total (Btu/h F)]] × ∆T + - ∆T = BPT - Design Dry Bulb Winter + - V_sum = Loads (ton) × V/ton + - V/ton + - Assume 400 V/ton + - q_1ton (Btu/h) = V/ton × Heat Capacity of Air (Btu·min/ft3·F·h) × ∆T + - 12000 = V/ton × 1.08 × ∆T_register + - ==Often the difference at the register is about 20°F. Due to losses along the length we can estimate the temperature difference at the air handler to be about 40% greater, 28°F== [[./Attachments/2024+10+22+week+8+slides+v3 2024-10-22 14_37_23.pdf#page=3&selection=30,0,36,2|(p.3)]] + - V_each = V_sum ÷ number of vent openings + +##### Lab + +1. For a given building located in Albany, New York the winter balance point temperature is 33.5F and the winter design temperature can be found in Table B.1 (see link below).  If the building has a UAtotal = of 3,753 Btu/(h*F), what volumetric flow rate of air is needed to adequately heat the building with a forced air system?  Provide your answer in cubic feet per minute as an integer.  Do not write units in your answer. + +![[./Attachments/Lab/Table B1 New York State.jpg|Table B1 New York State]] + +[[ARC2047H-Building_Science_Materials_and_Construction_3#^a2dc5f|^a2dc5f]] +T_delta = 33.5 - 2.2 = 31.3 +q = 3753 × 31.3 = 117,468.9 Btu +[[ARC2047H-Building_Science_Materials_and_Construction_3#^caf758|^caf758]] +q = 9.789075 tons +V = 9.789075 tons × 400 cfm/ton = 3916 cfm + +--- + +2. For a given building located in Albany, New York the winter heating load is 133,980 Btu/h and the summer cooling load is 183,819 Btu/h.  Determine the volumetric flow rate of air needed in a forced air system to work effectively.  Provide your answer in cubic feet per minute as an integer.  Do not write units in your answer. Note that this is for the entire building, not just one vent. + +V = 183819 ÷ 12000 × V/ton = 6127 + +--- + +3. For a given 3,000 ft2 building (three-story above ground with basement AHU) with the supply ductwork layout shown in the link below, find the average volumetric **flow rate of air per vent** opening if the summer cooling load for the building is 11,522 Btu/h and the winter heating load is 29,722 Btu/h.  Assume all vent opening are the same size and have the same flow rate.  Provide your answer in cubic feet per minute using one decimal place value.  Do not write units in your answer. + +![[./Attachments/Lab/lab riser diagram A C D E F blank.jpg|layout]] + +V = 29722 ÷ 12000 × 400 = 990.73 cfm +V_each = V ÷ 12 = 82.6 cfm + +--- + +4. For a given 3,000 ft2 building (three-story above ground with basement AHU) with the supply ductwork layout shown in the link below find the total equivalent length of the critical path ductwork if: +A = 5 feet +C = 8.4 feet +D = 15.9 feet +E = 10.4 feet +F = 10.6 feet  +Assume all terminal vent openings have an equal flow rate. Provide your answer in feet with one decimal place value. Do not write units in your answer. _It may be helpful to setup a table similar to the one used in the lecture._ + + +[[ARC2047H-Building_Science_Materials_and_Construction_3#^2bf58f|^2bf58f]] +Equivalent Length (ft) = Duct Length + Equivalent Fitting Length = 208.3 +Duct Length = A + B=6 + C + D + E + F + G=2= 58.3 +Equivalent Fitting Length = 10 + 35 + 35 + 35 + 35 = 150 + +--- + +5. For a given building the acoustic design of the HVAC system is desired to achieve NC-25 Background Levels. **What should the friction loss (in inches of water per 100 ft) be** for the supply duct work if the volumetric flow rate for the vent opening at the end of the critical path = 487 cfm?  See the acoustics table and friction chart links below.  Provide your answer in inches of water per 100 ft **using three decimal place values**.  Do not write units in your answer. + +![[./Attachments/Lab/acoustics.jpg|acoustics]] +![[./Attachments/Lab/friction loss chart ASHRAE 2021.jpg|chart]] +0.013 in. wtr./100ft + +--- + +6. For a given 3,000 ft2 building (three-story above ground with basement AHU) with the supply ductwork layout shown in the link below **find the pressure loss in the longest duct run** if: +friction loss = 0.074 inches water/100ft +loss at diffuser = 0.04 inches of water +A = 9.9 feet +C = 8.2 feet +D = 10 feet +E = 10.6 feet +F = 10.2 feet  +Assume all terminal vent openings have an equal flow rate. Provide your answer in inches of water with three decimal place values.  Do not write units in your answer. + + +Equivalent Length (ft) = Duct Length + Equivalent Fitting Length = 206.9 +Duct Length = A + B=6 + C + D + E + F + G=2= 56.9 +Equivalent Fitting Length = 10 + 35 + 35 + 35 + 35 = 150 + +[[ARC2047H-Building_Science_Materials_and_Construction_3#^b2baf5|^b2baf5]] +Pressure Loss = Critical path equivalent length (ft) × Friction Loss (in. wtr./100ft) + Loss at diffuser: 0.04 in. wtr. = 206.9 × 0.074 ÷ 100 + 0.04 = 0.193 + +--- + +7. For a given 3,000 ft2 building (three-story above ground with basement AHU) with the supply ductwork [[./Attachments/Lab/lab riser diagram A C D E F blank.jpg|layout]] shown in the link below, use the friction loss [[./Attachments/Lab/friction loss chart ASHRAE 2021.jpg|chart]] to **determine the velocity of air for duct C** if the volume of air flow at each vent opening is 85 cfm. Use 0.024 inches of water/100ft as the friction loss for the ductwork.  Provide your answer in feet per minute as an integer.  Do not use units in your answer. + +85 × 3 = 255 cfm +fpm @ 255 cfm @ 0.024 in. wtr./100ft ~= 390 fpm + +--- + +8. For a given 3,000 ft2 building (three-story above ground with basement AHU) with the supply ductwork [[./Attachments/Lab/lab riser diagram A C D E F blank.jpg|layout]] shown in the link below, use the friction loss [[./Attachments/Lab/friction loss chart ASHRAE 2021.jpg|chart]] to **determine the velocity of air for duct B** if the volume of air flow at each vent opening is 174 cfm. Use 0.028 inches of water/100ft as the friction loss for the ductwork.  Provide your answer in feet per minute as an integer.  Do not use units in your answer. + +174 × 6 = 1044 cfm +fpm @ 1044 cfm @ 0.028 in. wtr./100ft ~= 590 fpm + +--- + +9. For a given 3,000 ft2 building (three-story above ground with basement AHU) with the supply ductwork [[./Attachments/Lab/lab riser diagram A C D E F blank.jpg|layout]] shown in the link below, use the friction loss [[./Attachments/Lab/friction loss chart ASHRAE 2021.jpg|chart]] to **determine the clear inside diameter for duct A** if the volume of air flow at each vent opening is 170 cfm. Use 0.025 inches of water/100ft as the friction loss for the ductwork.  Provide your answer in inches within one decimal place value.  Do not use units in your answer.  Note that duct A is the vertical duct between the AHU and ducts B.  Assume duct A is round. + +170 × 12 = 2040 cfm +diameter @ 2040 cfm @ 0.025 in. wtr./100ft ~= 23.9 in + +--- + +10. For a given 3,000 ft2 building (three-story above ground with basement AHU) with the supply ductwork [[./Attachments/Lab/lab riser diagram A C D E F blank.jpg|layout]] shown in the link below, use the friction loss [[./Attachments/Lab/friction loss chart ASHRAE 2021.jpg|chart]] to **determine the minimum outside diameter for duct D** if the volume of air flow at each vent opening is 80 cfm. Use 0.044 inches of water/100ft as the friction loss for the ductwork.  Assume 2-inch-thick insulation lining the inside of the duct. Provide your answer in inches within one decimal place value.  Do not use units in your answer.  Assume duct D is round. + +80 × 3 = 240 cfm +diameter @ 240 cfm @ 0.044 in/. wtr./100ft ~= 9.5 in + +9.5 + 2 × 2 = 13.5 in + + #### Module 09 +##### Lecture + +- EUI: Energy Use Intensity + - Annual kWh/m2 kBtu/ft2 + - Site EUI + - Source EUI - How much is put into the source + - Canadian Commercial Office 2018 had annual site EUI of 275 kWh/mw + - **Space heating 55% - 25%** + - Auxiliary Equipment 14% + - Lighting 11% + - Water heating 8% + - Auxiliary motors 7% + - **Space cooling 4% - 9%** + - Street lighting 1% + - **Space conditioning** + - Non-space conditioning - 110 kWh/m2, nearly identical between Canada and US + - Bullitt Center +- Solar doesn’t work above 4 storeys +- daylight factor 1 not so good, usually aim for daylight factor of 2, extra points for 4 +- Comparison of EUI CHART FROM LECTURE +- Refrigirator + - PV = nRT + - P: Pressure + - V: Volume + - n: Amount of Substance + - R: Gas Constant + - T: Temperature + - High pressure side + - Compressor + - Condenser coil: rejects heat + - Narrow diameter + - Vapor > liquid + - Low pressure side + - Expansion valve + - Evaporator coil: absorbs heat + - Larger diameter + - Vapor & liquid > Vapor + - Mechanical energy to sensible + - COP = 3 + - Far more heat is harvested than generated from burning + - Bi-directional Valve + + + ### Q4 #### Module 10 +[[./Attachments/2024 11 05 week 10 slides EUI and Refrigeration - No LAB.pdf|2024 11 05 week 10 slides EUI and Refrigeration - No LAB]] + #### Module 11 +##### Lecture +[[./Attachments/2024 11 12 week 11 slides v3.pdf|2024 11 12 week 11 slides v3]] + +[[./Attachments/Example of lab submission for Site Visit.pdf|Example of lab submission for Site Visit]] + +[[./Attachments/Panasonic 380W panel.pdf|Panasonic 380W panel]] + +[[./Attachments/toronto green standard.pdf|toronto green standard]] + +> [!PDF|]+ [[./Attachments/2024 11 12 week 11 slides v3.pdf#page=5&selection=2,0,8,27|p.5]] +> Previously we calculated the annual Cost of Cooling as: +> Annual Cooling Cost = Cooling Load × CLH × 1/SEER × cost of electricity +> Thus, the Annual Electricity for Cooling = Cooling Load × CLH × 1/SEER + + +- EUI conversion ^6f8382 + - ==Energy Use Intensity (EUI): 1 kWh = 3412 Btu== [[./Attachments/2024 11 12 week 11 slides v3.pdf#page=6&selection=0,27,2,16|(p.6)]] + - ==1 m 2 = 10.764 ft== [[./Attachments/2024 11 12 week 11 slides v3.pdf#page=6&selection=4,0,9,0|(p.6)]] + - TEUI: Annual Total Energy Use Intensity + - Average 275 + - TGS Office Tier 1-3: 130, 100, 65 + - TEDI: Annual Thermal Energy Demand Intensity Space Conditioning ÷ Area (kWh/m2/yr) + - Must be below 40. + - Average 162 + - TGS Office Tier 1-3: 30, 22, 15 + - Toronto Green Standard + - TEUI - TEDI = Annual Non-Thermal Energy EUI + - Size renewable **Energy** (kWh/yr) budget using TGS +- Renewable energies + - Solar + - Solar panels + - 1 Peak Sun Hour = 1000 W/m2 + - Maximize Peak sun hour = 4.64 (hours/day) at 35-degree tilt south in Toronto + - ![[./Attachments/2024 11 12 week 11 slides v3.pdf#page=16&rect=59,47,956,387|p.16]] + - Most typical configuration is flat or 10 EW or 5 S degrees because of Peak Sun Hours ÷ m2 + - 35 S casts shadows on the next one + - commonly spaced to allow maintenance ^9c0982 + - 5 S spaced 11 inches (0.28 m) + - 10 EW spaced 9 inches (0.23 m) + - Maintainence corridor 4 feet + - Alternatively raised up but must account for costs + - 20-25% efficiency + - 70-80% of original efficiency over 25 years + - Manufacturers + - Panasonic + - **Estimated annual energy production** = Annual kWh × 1000 W/kW = NumberOfPanel × W/panel × PSH × 365 d/yr × LF ^e4bdcc + - Loss Factor =~ 0.8 + - Actual efficiency, wiring, maintenance, inverter + - /#panel always round up or down + - Roof and then site mounted (no shadows, no trees, no buildings around, sometimes on top of parking garage) + - Total cost based on total rated power + - $2.5 ÷ W roof mounted + - $4.25 ÷ W site mounted + - Geothermal + - Hydro + - Wind + - 20 times the building size to do something +- ==Absorption Refrigeration Cycle== ([[./Attachments/2024 11 12 week 11 slides v3.pdf#page=26&selection=0,0,0,30|p.26]]) + - Differs from ==Compressive Refrigeration Cycle== ([[./Attachments/2024 11 05 week 10 slides EUI and Refrigeration - No LAB.pdf#page=13&selection=0,0,0,31|p.13]]) and ==Heat Pump== ([[./Attachments/2024 11 05 week 10 slides EUI and Refrigeration - No LAB.pdf#page=19&selection=0,9,0,9|p.19]]) + - Effective in large scale cooling load of 10 tons + + - Refrigerant + - Water + Lithium Bromide ==stays above 0°C== ([[./Attachments/2024 11 12 week 11 slides v3.pdf#page=26&selection=5,44,5,59|p.26]]) + - Water + Ammonia, less damaging leak ==can cycle below 0°C== ([[./Attachments/2024 11 12 week 11 slides v3.pdf#page=26&selection=7,50,7,69|p.26]]) + - ![[./Attachments/2024 11 12 week 11 slides v3.pdf#page=26&rect=193,18,776,373|p.26]] + - Vapour is attracted by the strongly concentrated desiccant solution in the absorber chamber after evaporating via absorbing energy in the evaporator chamber from the building closed loop cooling load (13C > 7C) + - Heated solution evaporates hot water vapour from the generator chamber (desorber) (could be solar or geo heated) is attracted to the cooler condenser chamber which is usually paired with a chilling tower to reject heat (29C) to outside, with the left over concentrated desiccant solution pumped back into absorber chamber and the condensed chill water pumped into the evaporator chamber + +##### Lab + +1. For a Commercial Retail project located in Toronto with 8,894 m2 of indoor floor space and aiming to meet the Toronto Green Standard Tier 2 Energy Use Intensity (see link below), what is the maximum Annual Total Site Energy that the project could use. Provide you answer in kWh as an integer.  Do not write units in your answer. + +TGS Retail T2 TEUI: 90 kWh/m2 +8894 × 90 = 800460 kWh + +2. If the cooling load for a project is expected to be 26 tons, and the project has an expected annual Cooling Load Hours of 1,934 hours, with a Air Handling Unit rated at SEER=15.5 btu/h per W, what is the annual electricity for cooling? Provide your answer in kWh as an integer.  Do not write units in your answer. + +[[ARC2047H-Building_Science_Materials_and_Construction_3#^caf758|^caf758]] + +![[ARC2047H-Building_Science_Materials_and_Construction_3#^8fe61e|^8fe61e]] + +Cooling Load = 26 × 12000 = 312000 Btu/h +312000 Btu/h × 1934 h × (1/15.5 W/Btu/h) = 38,929,548 Wk = 38930 kWh + + +3. For a given office building in Toronto: + the annual heat needed is expected to be 182,168,661 Btu + the annual electricity for cooling is expected to be 13,593 kWh + The indoor floor area of the project is 2,109 m2 + What is the expected Thermal Energy Demand Intensity? Provide your answer in kWh/m2/year with one decimal place.  Do not write units in your answer. + +[[ARC2047H-Building_Science_Materials_and_Construction_3#^6f8382|^6f8382]] +182,168,661 Btu ÷ 3412 = 53,390.58 kWh +(53390.58 + 13593) ÷ 2109 = 31.8 kWh/m2/yr + + +4. For a given office building project in Toronto, the building has: + Annual Heating Energy Needed = 10,608 kWh + Annual Electricity for Cooling = 19,454 kWh + Indoor Floor Area = 1,650 m2 + Using the Toronto Green Standard Tier 3 to estimate Non-Thermal EUI calculate the expect total annual energy use in kWh as an integer.  Do not write units in your answer. + +TGS Office T3 + TEUI: 65 kWh/m2 + TEDI: 15 kWh/m2 +(65-15) * 1650 m2 + (10608 + 19454) = 112562 kWh + + +5. A solar panel has a length of 1.9 meters and width of 0.9 meters. These panels are intended to be used on a building in Toronto that has a unobstructed rectangular flat roof with an area of 2,397 m2. + According to the process used in the lecture, when using an 10 degree East-West layout, approximately how many solar panels can fit on the roof? Provide your answer as an integer. Do not write units in your answer. + +[[ARC2047H-Building_Science_Materials_and_Construction_3#^9c0982|^9c0982]] +2397 m2 ÷ (1.9 m × (0.9 m + 0.23 m ÷ 2)) = 1242 + + +6. For a given building in North America with the following parameters: + EUI = 189 kWh/m2/yr + Indoor floor area = 2,614 m2 + Peak sun hours for 5 degree south layout = 3.86 + System Loss Factor = 0.72 + Using the PV panel shown in the link below determine the number of panels needed if using a 5 degree south layout.  Provide your answer as an integer. Do not write units in your answer. + +HIT Power 235S + Rated Power (Pmax) 235 W + Cell Efficiency 21.1% + +[[ARC2047H-Building_Science_Materials_and_Construction_3#^e4bdcc|^e4bdcc]] +Annual kWh × 1000 W/kW = Panels × W/panel × PSH × 365 d/yr × LF +Panels = 189 kWh/m2/yr × 2614 m2 * 1000 W/kW / 0.72 / 365 d/yr / 3.86 h/d / 235 W/panel =/ 2073 + + +7. For a given building in Toronto with an unobstructed flat rectangular roof area of 461 m2, it has been determined that the building needs 514 PV panels rated at 400W to reach net zero site energy. The panels will be mounted in a 5 degree south facing layout.  The panels have dimensions of 1.76 meters in length and 1.15 meters in width.  It is expected that some panels will have to be site mounted as there is limited roof area compared to the PV needs.  Using the same process as shown in the lecture determine the minimum number of site mounted panels that will be needed.  Provide your answer as an integer.  Do not write units in your answer. + +514 - (461 m2 / (1.76 * (1.15 + 0.28) m2/panel)) =/ 331 panels + +8. Please enter the effective area per PV panel from question 7.  Provide your answer in square meters with two decimal values.  Do not write units in your answer. + This question is only used for assigning partial credit in the event that you do not enter the correct answer for Question 7.  When Quercus auto-grades this question it will most likely score this question as incorrect. This question will be manually graded if you do not get the correct answer for Question 7. + +2.27 m2/panel + + +9. For a given project in Ontario the costs of installing PV panels for a commercial project are: + $2.35 per W installed for roof mounted + $4.4 per W installed for site mounted + + The total number of PV panels needed for the project using a 10 degree East-West facing layout is 705 panels. The unobstructed rectangular flat roof of the project has an area of 959 m2. The panels have a dimension of 1.65 meters in length and 1.15 meters in width. Each panel has a rated power of 301 Watts.  The project will maximize the amount of roof mounted PV panels and minimize the amount of site mounted PV panels. Using the same process as shown in the lecture **determine the total cost** for the PV array.  Provide your answer in dollars as an integer.  Do not write units in your answer. + +1.65 * (1.15 + 0.23 / 2) = 2.08725 m2/panel +705 - 959 m2 / 2.08725 m2/panel = 459 panels roof +705 - 459 = 246 panels site +(459 * 2.35 + 246 * 4.4) panel-$/W * 301 W/panel = 650,476 $ + + +10. Please enter the effective area per PV panel from question 9.  Provide your answer in square meters with two decimal values.  Do not write units in your answer. + +2.09 m2/panel + +11. Please enter the number of site mounted panels needed in Question 9.  Provide your answer as an integer.  Do not write units in your answer. + +246 panels site + + #### Module 12 +Net Zero PV tour, sign up +Lab due next day 10AM + +Fonts larger than 12 (refer to font sizing daily page ![[../../../../2024-11-09#Font guideline|2024-11-09]]) +Show all faces of PV to reconcile amount of space required + ## Projects @@ -515,20 +883,7 @@ Annual Cost of Cooling = 222343 × 1224 × (1/20) × (0.22/1000) = 2993 ## Tagged `#Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3` -
Evaluation Error: eval@[native code]
-@
-asyncEvalInContext@
-@
-render@
-onload@
-@capacitor://localhost/app.js:1:1171666
-@
-executeJs@
-@
-dataviewJS@
-@
-convertDataviewQueries@
-@
+ ## Course Brief code:: ARC2047HF diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024 11 05 week 10 slides EUI and Refrigeration - No LAB.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024 11 05 week 10 slides EUI and Refrigeration - No LAB.pdf new file mode 100644 index 00000000..0e215918 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024 11 05 week 10 slides EUI and Refrigeration - No LAB.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024 11 12 week 11 slides v3.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024 11 12 week 11 slides v3.pdf new file mode 100644 index 00000000..dca85cc5 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024 11 12 week 11 slides v3.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024+10+22+week+8+slides+v3 2024-10-22 14_37_23.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024+10+22+week+8+slides+v3 2024-10-22 14_37_23.pdf new file mode 100644 index 00000000..08f22ad7 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/2024+10+22+week+8+slides+v3 2024-10-22 14_37_23.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/20241022 week 8 slides v3 2024-10-22 14_42_07.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/20241022 week 8 slides v3 2024-10-22 14_42_07.pdf new file mode 100644 index 00000000..70d42c0c Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/20241022 week 8 slides v3 2024-10-22 14_42_07.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HVAC+Distribution+Metric+Example 2024-10-22 14_29_56.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HVAC+Distribution+Metric+Example 2024-10-22 14_29_56.pdf new file mode 100644 index 00000000..9a2b62c5 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HVAC+Distribution+Metric+Example 2024-10-22 14_29_56.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HW5+Solutions 2024-10-22 14_30_05.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HW5+Solutions 2024-10-22 14_30_05.pdf new file mode 100644 index 00000000..402f222e Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HW5+Solutions 2024-10-22 14_30_05.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HW6+-+Self+Study+-+HVAC+Distribution 2024-10-22 14_30_15.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HW6+-+Self+Study+-+HVAC+Distribution 2024-10-22 14_30_15.pdf new file mode 100644 index 00000000..dc655b1a Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/ARC2047HF+HW6+-+Self+Study+-+HVAC+Distribution 2024-10-22 14_30_15.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Example of lab submission for Site Visit.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Example of lab submission for Site Visit.pdf new file mode 100644 index 00000000..ba6a85a0 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Example of lab submission for Site Visit.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/Table B1 New York State.jpg b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/Table B1 New York State.jpg new file mode 100644 index 00000000..65c36eae Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/Table B1 New York State.jpg differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/acoustics.jpg b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/acoustics.jpg new file mode 100644 index 00000000..5fef1477 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/acoustics.jpg differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/friction loss chart ASHRAE 2021.jpg b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/friction loss chart ASHRAE 2021.jpg new file mode 100644 index 00000000..448702c7 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/friction loss chart ASHRAE 2021.jpg differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/lab riser diagram A C D E F blank.jpg b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/lab riser diagram A C D E F blank.jpg new file mode 100644 index 00000000..f36085a0 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Lab/lab riser diagram A C D E F blank.jpg differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Panasonic 380W panel.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Panasonic 380W panel.pdf new file mode 100644 index 00000000..7a1b8691 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Panasonic 380W panel.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Week+8+Charts+and+Tables 2024-10-22 14_29_53.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Week+8+Charts+and+Tables 2024-10-22 14_29_53.pdf new file mode 100644 index 00000000..63d1a804 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/Week+8+Charts+and+Tables 2024-10-22 14_29_53.pdf differ diff --git a/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/toronto green standard.pdf b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/toronto green standard.pdf new file mode 100644 index 00000000..8c95a113 Binary files /dev/null and b/content/Courses/2024/ARC2047H-Building_Science_Materials_and_Construction_3/Attachments/toronto green standard.pdf differ diff --git a/content/Wiki/ComfyUI.md b/content/Wiki/ComfyUI.md new file mode 100644 index 00000000..0532d600 --- /dev/null +++ b/content/Wiki/ComfyUI.md @@ -0,0 +1,63 @@ +--- +tags: + - wiki +share: true +--- + +# ComfyUI Manager + +## Custom Nodes Manager + +| ID | Title | +| ---- | -------------------------------------------------------------------------------------------------------- | +| 1 | [**ComfyUI-Manager**](https://github.com/ltdrdata/ComfyUI-Manager) | +| 2 | [**ComfyUI Impact Pack**](https://github.com/ltdrdata/ComfyUI-Impact-Pack) | +| 8 | [**ComfyUI's ControlNet Auxiliary Preprocessors**](https://github.com/Fannovel16/comfyui_controlnet_aux) | +| 52 | [**ComfyUI-GGUF**](https://github.com/city96/ComfyUI-GGUF) | +| 60 | [**ComfyUI WD 1.4 Tagger**](https://github.com/pythongosssss/ComfyUI-WD14-Tagger) | +| 61 | [**pythongosssss/ComfyUI-Custom-Scripts**](https://github.com/pythongosssss/ComfyUI-Custom-Scripts) | +| 112 | [**ComfyMath**](https://github.com/evanspearman/ComfyMath) | +| 146 | [**ComfyUI-Logic**](https://github.com/theUpsider/ComfyUI-Logic) | +| 172 | [**rgthree's ComfyUI Nodes**](https://github.com/rgthree/rgthree-comfy) | +| 198 | [**Recommended Resolution Calculator**](https://github.com/marhensa/sdxl-recommended-res-calc) | +| 237 | [**ComfyUI Essentials**](https://github.com/cubiq/ComfyUI_essentials) | +| 244 | [**Use Everywhere (UE Nodes)**](https://github.com/chrisgoringe/cg-use-everywhere) | +| 267 | [**ComfyUI-DepthAnythingV2**](https://github.com/kijai/ComfyUI-DepthAnythingV2) | +| 285 | [**Save Image Extended for ComfyUI**](https://github.com/audioscavenger/save-image-extended-comfyui) | +| 342 | [**Image Resize for ComfyUI**](https://github.com/palant/image-resize-comfyui) | +| 433 | [**ComfyUI Easy Use**](https://github.com/yolain/ComfyUI-Easy-Use) | +| 492 | [**Crystools**](https://github.com/crystian/ComfyUI-Crystools) | +| 1014 | [**img2txt-comfyui-nodes**](https://github.com/christian-byrne/img2txt-comfyui-nodes) | +| 1294 | [**x-flux-comfyui**](https://github.com/XLabs-AI/x-flux-comfyui) | +| 1304 | [**ControlAltAI Nodes**](https://github.com/gseth/ControlAltAI-Nodes) | +| 1309 | [**ComfyUI-eesahesNodes**](https://github.com/EeroHeikkinen/ComfyUI-eesahesNodes) | + +## Module Manager + +| ID | Title | +| --- | ----------------------------------------------------------------------------------------------------------------------- | +| 1 | [**TAEF1 Decoder**](https://github.com/madebyollin/taesd) | +| 2 | [**TAEF1 Encoder**](https://github.com/madebyollin/taesd) | +| 3 | [**TAESD3 Decoder**](https://github.com/madebyollin/taesd) | +| 4 | [**TAESD3 Encoder**](https://github.com/madebyollin/taesd) | +| 5 | [**TAESDXL Decoder**](https://github.com/madebyollin/taesd) | +| 6 | [**TAESDXL Encoder**](https://github.com/madebyollin/taesd) | +| 7 | [**TAESD Decoder**](https://github.com/madebyollin/taesd) | +| 8 | [**TAESD Encoder**](https://github.com/madebyollin/taesd) | +| 9 | [**RealESRGAN x2**](https://huggingface.co/ai-forever/Real-ESRGAN) | +| 10 | [**RealESRGAN x4**](https://huggingface.co/ai-forever/Real-ESRGAN) | +| 13 | [**4x-AnimeSharp**](https://huggingface.co/Kim2091/AnimeSharp/) | +| 14 | [**4x-UltraSharp**](https://huggingface.co/Kim2091/UltraSharp/) | +| 16 | [**8x_NMKD-Superscale_150000_G**](https://huggingface.co/uwg/upscaler) | +| 88 | [**city96/t5-v1_1-xxl-encoder-Q8_0.gguf**](https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf) | +| 135 | [**CLIPVision model (openai/clip-vit-large)**](https://huggingface.co/openai/clip-vit-large-patch14) | +| 171 | [**ViT-B SAM model**](https://github.com/facebookresearch/segment-anything#model-checkpoints) | +| 175 | [**face_yolov8m (bbox)**](https://huggingface.co/Bingsu/adetailer/tree/main) | +| 180 | [**hand_yolov8s (bbox)**](https://huggingface.co/Bingsu/adetailer/tree/main) | +| 181 | [**person_yolov8m (segm)**](https://huggingface.co/Bingsu/adetailer/tree/main) | +| 315 | [**Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro**](https://huggingface.co/Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro) | +| 316 | [**Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro (fp8_e4m3fn) by Kijai**](https://huggingface.co/Kijai/flux-fp8) | +| 357 | [**kijai/FLUX.1 [dev] Diffusion model (float8_e4m3fn)**](https://huggingface.co/Kijai/flux-fp8) | +| 358 | [**Comfy Org/FLUX.1 [dev] Checkpoint model (fp8)**](https://huggingface.co/Comfy-Org/flux1-dev/tree/main) | +| 370 | [**city96/flux1-dev-Q8_0.gguf**](https://huggingface.co/city96/FLUX.1-dev-gguf) | +| 383 | [**ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]**](https://huggingface.co/zer0int) | diff --git a/content/Wiki/Rhino.md b/content/Wiki/Rhino.md index 04490fe5..ce6ccaa9 100644 --- a/content/Wiki/Rhino.md +++ b/content/Wiki/Rhino.md @@ -5,32 +5,40 @@ share: true --- ### Keyboard -| Key | Command Macro | -| --- | ----------------------------------------------------------------------------------------------- | -| F1 | ! _PointsOn | -| F2 | ! _PointsOff | -| F3 | '_DisableOsnap _Toggle | -| F4 | '_Snap | -| F5 | ! _GumballAlignment _Cycle | -| F6 | ! _Camera _Toggle | -| F7 | noecho -_Grid _ShowGrid _ShowGridAxes _Enter -_RunScript (Rhino.Print "Grid Display Toggled.") | -| F8 | noecho PrintDisplay _State _Toggle _Enter -_RunScript (Rhino.Print "PrintDisplay Toggled.") | -| F9 | ! _CommandHistory | -| F10 | ! _DocumentProperties | -| F11 | '_Help | -| F12 | '_DigClick | +| Key | Command Macro | +| --- | --------------------------------------------------------------------------------------------------------------------------------- | +| F1 | ! _PointsOn | +| F2 | ! _PointsOff | +| F3 | '_DisableOsnap _Toggle | +| F4 | '_Snap | +| F5 | ! _GumballAlignment _Cycle | +| F6 | ! _Camera _Toggle | +| F7 | noecho -_Grid _ShowGrid _ShowGridAxes _Enter -_RunScript (Rhino.Print "Grid Display Toggled.") | +| F8 | noecho _PrintDisplay _State _Toggle _Color _Display _Scale 10000 _Enter _Enter -_RunScript (Rhino.Print "PrintDisplay Toggled.") | +| F9 | ! _CommandHistory | +| F10 | ! _DocumentProperties | +| F11 | '_Help | +| F12 | '_DigClick | ### Aliases -| Alias | Command Macro | -| ----- | ---------------------------- | -| MV | ! _Move _Pause _Vertical=Yes | -| SC | Scale | -| S1 | Scale1D | -| S2 | Scale2D | -| RO | Rotate | -| R3 | Rotate3D | +| Alias | Command Macro | +| ----- | ----------------------- | +| B2 | '_Boolean2Objects | +| BD | '_BooleanDifference | +| BI | '_BooleanIntersection | +| BS | '_BooleanSplit | +| BU | '_BooleanUnion | +| COi | '_Copy _Inplace | +| CB | ! \_CurveBoolean | +| MV | ! _Move _Vertical=Yes | +| SC | '_Scale | +| S1 | '_Scale1D | +| S2 | '_Scale2D | +| RO | '_Rotate | +| R3 | '_Rotate3D | +| RB | '\_RebuildCrvNonUniform | ### Package Manager: diff --git a/package-lock.json b/package-lock.json index 615c4261..5e4bec67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "github-slugger": "^2.0.0", "globby": "^14.0.2", "gray-matter": "^4.0.3", - "hast-util-to-html": "^9.0.1", + "hast-util-to-html": "^9.0.3", "hast-util-to-jsx-runtime": "^2.3.0", "hast-util-to-string": "^3.0.0", "is-absolute-url": "^4.0.1", @@ -41,7 +41,7 @@ "rehype-citation": "^2.1.1", "rehype-katex": "^7.0.1", "rehype-mathjax": "^6.0.0", - "rehype-pretty-code": "^0.13.2", + "rehype-pretty-code": "^0.14.0", "rehype-raw": "^7.0.0", "rehype-slug": "^6.0.0", "remark": "^15.0.1", @@ -54,7 +54,7 @@ "remark-smartypants": "^3.0.2", "rfdc": "^1.4.1", "rimraf": "^6.0.1", - "serve-handler": "^6.1.5", + "serve-handler": "^6.1.6", "shiki": "^1.16.3", "source-map-support": "^0.5.21", "to-vfile": "^8.0.0", @@ -2557,14 +2557,6 @@ "node": ">=8.6.0" } }, - "node_modules/fast-url-parser": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", - "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==", - "dependencies": { - "punycode": "^1.3.2" - } - }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", @@ -2942,15 +2934,14 @@ } }, "node_modules/hast-util-to-html": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.1.tgz", - "integrity": "sha512-hZOofyZANbyWo+9RP75xIDV/gq+OUKx+T46IlwERnKmfpwp81XBFbT9mi26ws+SJchA4RVUQwIBJpqEOBhMzEQ==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.3.tgz", + "integrity": "sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==", "dependencies": { "@types/hast": "^3.0.0", "@types/unist": "^3.0.0", "ccount": "^2.0.0", "comma-separated-tokens": "^2.0.0", - "hast-util-raw": "^9.0.0", "hast-util-whitespace": "^3.0.0", "html-void-elements": "^3.0.0", "mdast-util-to-hast": "^13.0.0", @@ -4788,9 +4779,9 @@ } }, "node_modules/path-to-regexp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz", - "integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz", + "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==" }, "node_modules/path-type": { "version": "5.0.0", @@ -4820,9 +4811,10 @@ } }, "node_modules/preact": { - "version": "10.23.2", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.23.2.tgz", - "integrity": "sha512-kKYfePf9rzKnxOAKDpsWhg/ysrHPqT+yQ7UW4JjdnqjFIeNUnNcEJvhuA8fDenxAGWzUqtd51DfVg7xp/8T9NA==", + "version": "10.25.0", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.25.0.tgz", + "integrity": "sha512-6bYnzlLxXV3OSpUxLdaxBmE7PMOu0aR3pG6lryK/0jmvcDFPlcXGQAt5DpK3RITWiDrfYZRI0druyaK/S9kYLg==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/preact" @@ -4884,11 +4876,6 @@ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" }, - "node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" - }, "node_modules/querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", @@ -5033,15 +5020,15 @@ } }, "node_modules/rehype-pretty-code": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/rehype-pretty-code/-/rehype-pretty-code-0.13.2.tgz", - "integrity": "sha512-F+PaFMscfJOcSHcR2b//+hk/0jT56hmGDqXcVD6VC9j0CUSGiqv8YxaWUyhR7qEIRRSbzAVxx+0uxzk+akXs+w==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/rehype-pretty-code/-/rehype-pretty-code-0.14.0.tgz", + "integrity": "sha512-hBeKF/Wkkf3zyUS8lal9RCUuhypDWLQc+h9UrP9Pav25FUm/AQAVh4m5gdvJxh4Oz+U+xKvdsV01p1LdvsZTiQ==", "dependencies": { "@types/hast": "^3.0.4", "hast-util-to-string": "^3.0.0", "parse-numeric-range": "^1.3.0", "rehype-parse": "^9.0.0", - "unified": "^11.0.4", + "unified": "^11.0.5", "unist-util-visit": "^5.0.0" }, "engines": { @@ -5828,17 +5815,16 @@ } }, "node_modules/serve-handler": { - "version": "6.1.5", - "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz", - "integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==", + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.6.tgz", + "integrity": "sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==", "dependencies": { "bytes": "3.0.0", "content-disposition": "0.5.2", - "fast-url-parser": "1.1.3", "mime-types": "2.1.18", "minimatch": "3.1.2", "path-is-inside": "1.0.2", - "path-to-regexp": "2.2.1", + "path-to-regexp": "3.3.0", "range-parser": "1.2.0" } }, diff --git a/package.json b/package.json index dca1258c..c2ecd24c 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "github-slugger": "^2.0.0", "globby": "^14.0.2", "gray-matter": "^4.0.3", - "hast-util-to-html": "^9.0.1", + "hast-util-to-html": "^9.0.3", "hast-util-to-jsx-runtime": "^2.3.0", "hast-util-to-string": "^3.0.0", "is-absolute-url": "^4.0.1", @@ -68,7 +68,7 @@ "rehype-citation": "^2.1.1", "rehype-katex": "^7.0.1", "rehype-mathjax": "^6.0.0", - "rehype-pretty-code": "^0.13.2", + "rehype-pretty-code": "^0.14.0", "rehype-raw": "^7.0.0", "rehype-slug": "^6.0.0", "remark": "^15.0.1", @@ -81,7 +81,7 @@ "remark-smartypants": "^3.0.2", "rfdc": "^1.4.1", "rimraf": "^6.0.1", - "serve-handler": "^6.1.5", + "serve-handler": "^6.1.6", "shiki": "^1.16.3", "source-map-support": "^0.5.21", "to-vfile": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef3ea2d2..7e6cb19e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,8 +48,8 @@ importers: specifier: ^4.0.3 version: 4.0.3 hast-util-to-html: - specifier: ^9.0.1 - version: 9.0.2 + specifier: ^9.0.3 + version: 9.0.3 hast-util-to-jsx-runtime: specifier: ^2.3.0 version: 2.3.0 @@ -78,8 +78,8 @@ importers: specifier: ^0.4.5 version: 0.4.5 preact: - specifier: ^10.23.2 - version: 10.23.2 + specifier: ^10.25.0 + version: 10.25.0 preact-render-to-string: specifier: ^6.5.11 version: 6.5.11(preact@10.23.2) @@ -105,8 +105,8 @@ importers: specifier: ^6.0.0 version: 6.0.0 rehype-pretty-code: - specifier: ^0.13.2 - version: 0.13.2(shiki@1.16.3) + specifier: ^0.14.0 + version: 0.14.0(shiki@1.16.3) rehype-raw: specifier: ^7.0.0 version: 7.0.0 @@ -144,8 +144,8 @@ importers: specifier: ^6.0.1 version: 6.0.1 serve-handler: - specifier: ^6.1.5 - version: 6.1.5 + specifier: ^6.1.6 + version: 6.1.6 shiki: specifier: ^1.16.3 version: 1.16.3 @@ -1130,9 +1130,6 @@ packages: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} - fast-url-parser@1.1.3: - resolution: {integrity: sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==} - fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} @@ -1228,8 +1225,8 @@ packages: hast-util-raw@9.0.4: resolution: {integrity: sha512-LHE65TD2YiNsHD3YuXcKPHXPLuYh/gjp12mOfU8jxSrm1f/yJpsb0F/KKljS6U9LJoP0Ux+tCe8iJ2AsPzTdgA==} - hast-util-to-html@9.0.2: - resolution: {integrity: sha512-RP5wNpj5nm1Z8cloDv4Sl4RS8jH5HYa0v93YB6Wb4poEzgMo/dAAL0KcT4974dCjcNG5pkLqTImeFHHCwwfY3g==} + hast-util-to-html@9.0.3: + resolution: {integrity: sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==} hast-util-to-jsx-runtime@2.3.0: resolution: {integrity: sha512-H/y0+IWPdsLLS738P8tDnrQ8Z+dj12zQQ6WC11TIM21C8WFVoIxcqWXf2H3hiTVZjF1AWqoimGwrTWecWrnmRQ==} @@ -1699,8 +1696,8 @@ packages: resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==} engines: {node: 20 || >=22} - path-to-regexp@2.2.1: - resolution: {integrity: sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==} + path-to-regexp@3.3.0: + resolution: {integrity: sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==} path-type@5.0.0: resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==} @@ -1718,8 +1715,8 @@ packages: peerDependencies: preact: '>=10' - preact@10.23.2: - resolution: {integrity: sha512-kKYfePf9rzKnxOAKDpsWhg/ysrHPqT+yQ7UW4JjdnqjFIeNUnNcEJvhuA8fDenxAGWzUqtd51DfVg7xp/8T9NA==} + preact@10.25.0: + resolution: {integrity: sha512-6bYnzlLxXV3OSpUxLdaxBmE7PMOu0aR3pG6lryK/0jmvcDFPlcXGQAt5DpK3RITWiDrfYZRI0druyaK/S9kYLg==} prettier@3.3.3: resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} @@ -1740,9 +1737,6 @@ packages: psl@1.9.0: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} - punycode@1.4.1: - resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} - punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -1786,8 +1780,8 @@ packages: rehype-parse@9.0.0: resolution: {integrity: sha512-WG7nfvmWWkCR++KEkZevZb/uw41E8TsH4DsY9UxsTbIXCVGbAs4S+r8FrQ+OtH5EEQAs+5UxKC42VinkmpA1Yw==} - rehype-pretty-code@0.13.2: - resolution: {integrity: sha512-F+PaFMscfJOcSHcR2b//+hk/0jT56hmGDqXcVD6VC9j0CUSGiqv8YxaWUyhR7qEIRRSbzAVxx+0uxzk+akXs+w==} + rehype-pretty-code@0.14.0: + resolution: {integrity: sha512-hBeKF/Wkkf3zyUS8lal9RCUuhypDWLQc+h9UrP9Pav25FUm/AQAVh4m5gdvJxh4Oz+U+xKvdsV01p1LdvsZTiQ==} engines: {node: '>=18'} peerDependencies: shiki: ^1.3.0 @@ -2021,8 +2015,8 @@ packages: resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==} engines: {node: '>=4'} - serve-handler@6.1.5: - resolution: {integrity: sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==} + serve-handler@6.1.6: + resolution: {integrity: sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==} shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} @@ -3134,10 +3128,6 @@ snapshots: merge2: 1.4.1 micromatch: 4.0.8 - fast-url-parser@1.1.3: - dependencies: - punycode: 1.4.1 - fastq@1.17.1: dependencies: reusify: 1.0.4 @@ -3280,7 +3270,7 @@ snapshots: web-namespaces: 2.0.1 zwitch: 2.0.4 - hast-util-to-html@9.0.2: + hast-util-to-html@9.0.3: dependencies: '@types/hast': 3.0.4 '@types/unist': 3.0.3 @@ -4011,7 +4001,7 @@ snapshots: lru-cache: 11.0.0 minipass: 7.1.2 - path-to-regexp@2.2.1: {} + path-to-regexp@3.3.0: {} path-type@5.0.0: {} @@ -4021,9 +4011,9 @@ snapshots: preact-render-to-string@6.5.11(preact@10.23.2): dependencies: - preact: 10.23.2 + preact: 10.25.0 - preact@10.23.2: {} + preact@10.25.0: {} prettier@3.3.3: {} @@ -4035,8 +4025,6 @@ snapshots: psl@1.9.0: {} - punycode@1.4.1: {} - punycode@2.3.1: {} querystringify@2.2.0: {} @@ -4115,7 +4103,7 @@ snapshots: hast-util-from-html: 2.0.2 unified: 11.0.5 - rehype-pretty-code@0.13.2(shiki@1.16.3): + rehype-pretty-code@0.14.0(shiki@1.16.3): dependencies: '@types/hast': 3.0.4 hast-util-to-string: 3.0.0 @@ -4372,15 +4360,14 @@ snapshots: extend-shallow: 2.0.1 kind-of: 6.0.3 - serve-handler@6.1.5: + serve-handler@6.1.6: dependencies: bytes: 3.0.0 content-disposition: 0.5.2 - fast-url-parser: 1.1.3 mime-types: 2.1.18 minimatch: 3.1.2 path-is-inside: 1.0.2 - path-to-regexp: 2.2.1 + path-to-regexp: 3.3.0 range-parser: 1.2.0 shebang-command@2.0.0: