From 2ece54a4ec4a77761af14040ad996cd939558806 Mon Sep 17 00:00:00 2001 From: Douglas Greenshields Date: Thu, 27 Feb 2025 16:39:15 +0000 Subject: [PATCH] correct building up non appliance elec demand in fhs wrapper Co-Authored-By: Korinna Pinakoulakis <7438240+kpinakula@users.noreply.github.com> Co-Authored-By: Rachel Howell <98879818+rachowell@users.noreply.github.com> --- .../future_homes_standard.rs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/wrappers/future_homes_standard/future_homes_standard.rs b/src/wrappers/future_homes_standard/future_homes_standard.rs index d837e17..20dcfaf 100644 --- a/src/wrappers/future_homes_standard/future_homes_standard.rs +++ b/src/wrappers/future_homes_standard/future_homes_standard.rs @@ -2394,9 +2394,20 @@ fn sim_24h(input: &mut InputForProcessing, sim_settings: SimSettings) -> anyhow: let mut non_appliance_electricity_demand = vec![]; for i in 0..min_demand_length { for (name, user) in electricity_users { - let name = ApplianceKey::try_from(name.as_str())?; - if !input.appliances_contain_key(&name) { - non_appliance_electricity_demand[i] += user[i]; + let name = ApplianceKey::try_from(name.as_str()); + let do_increment = match name { + Ok(name) => !input.appliances_contain_key(&name), + Err(_) => true, + }; + if do_increment { + non_appliance_electricity_demand.insert( + i, + non_appliance_electricity_demand + .get(i) + .unwrap_or(&0.) + .clone() + + user[i], + ); } } } @@ -3119,7 +3130,7 @@ fn create_cooling(input: &mut InputForProcessing) -> anyhow::Result<()> { _ => unreachable!(), } } - + if let Some(advanced_start) = input.advanced_start_for_space_cool_system(&space_cool_system)? {