Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes to Scouts Loads Summary Measure #133

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open

Fixes to Scouts Loads Summary Measure #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
81bbed5
fixes to the load summary measure
mdahlhausen Oct 31, 2023
a71e0a4
Merge branch 'main' into fix/scout_loads_summary
mdahlhausen Mar 6, 2024
13925a6
switch to space lookup for enduse meters
mdahlhausen Mar 6, 2024
e082ddc
remove tests from ci
eringold Mar 12, 2024
940d7cc
Merge branch 'main' into fix/scout_loads_summary
mdahlhausen Mar 13, 2024
a6f472e
Merge branch 'fix/scout_loads_summary' of https://github.com/NREL/Com…
mdahlhausen Mar 13, 2024
6bd0b70
test model updates
eringold Jul 11, 2024
19f98f8
add debug support to test
eringold Jul 12, 2024
1ec6ab3
use nonsolar RTS
eringold Jul 12, 2024
f472716
window transmitted solar uses space name
eringold Jul 12, 2024
8e02107
use energy variables
eringold Jul 12, 2024
df82e74
fix internal mass not being subtracted
eringold Jul 12, 2024
1fafc9b
is redistribution happening correctly?
eringold Jul 12, 2024
6ce0ba9
temp debug helpers
eringold Jul 12, 2024
0361e23
marginal performance improvements
eringold Jul 16, 2024
6096a0a
test troubleshooting switches
eringold Jul 16, 2024
50e4306
add internal surface gains to external surfaces, dont subtract
eringold Jul 16, 2024
074f2a9
Merge branch 'main' of https://github.com/NREL/ComStock into fix/scou…
eringold Jul 16, 2024
7bc2899
postprocess load components data
eringold Jul 24, 2024
4a46d10
Energy meter updates
mdahlhausen Jul 24, 2024
44b9057
add gas equipment
mdahlhausen Jul 24, 2024
635b0bf
Merge branch 'fix/scout_loads_summary' of https://github.com/NREL/Com…
eringold Jul 25, 2024
ca5c7a6
add natural gas equipment meters
mdahlhausen Jul 25, 2024
b2d2563
add supply gas quipment
eringold Jul 26, 2024
8c4bd4c
add weighted load component cols to long
eringold Jul 26, 2024
ed81200
test flags
eringold Jul 31, 2024
77fa214
avoid double counting by apportioning load based on total heating+coo…
eringold Jul 31, 2024
92836a3
Merge branch 'fix/scout_loads_summary' of https://github.com/NREL/Com…
eringold Jul 31, 2024
2d6edd0
add comstock measure tests
eringold Aug 4, 2024
7ffeeeb
enable district heating fuel metering
eringold Aug 14, 2024
092becc
minor update to loads reporting
eringold Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions measures/scout_loads_summary/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ ReportingMeasure
**Required:** true,
**Model Dependent:** false

### Enable extra variables for debugging zone loads

**Name:** debug_mode,
**Type:** Boolean,
**Units:** ,
**Required:** true,
**Model Dependent:** false




173 changes: 131 additions & 42 deletions measures/scout_loads_summary/measure.rb
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 62 additions & 8 deletions measures/scout_loads_summary/measure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>scout_loads_summary</name>
<uid>10373121-03aa-4e48-a9ea-e51b4c09f771</uid>
<version_id>4875183e-e850-4912-9538-950527eb5ac8</version_id>
<version_modified>2023-10-16T20:22:23Z</version_modified>
<version_id>af0f40d8-038a-4f02-8960-c1672b61c92a</version_id>
<version_modified>2024-03-06T20:32:42Z</version_modified>
<xml_checksum>72C8354A</xml_checksum>
<class_name>ScoutLoadsSummary</class_name>
<display_name>Scout Loads Summary</display_name>
Expand Down Expand Up @@ -47,6 +47,24 @@
</choice>
</choices>
</argument>
<argument>
<name>debug_mode</name>
<display_name>Enable extra variables for debugging zone loads</display_name>
<type>Boolean</type>
<required>true</required>
<model_dependent>false</model_dependent>
<default_value>false</default_value>
<choices>
<choice>
<value>true</value>
<display_name>true</display_name>
</choice>
<choice>
<value>false</value>
<display_name>false</display_name>
</choice>
</choices>
</argument>
</arguments>
<outputs />
<provenances />
Expand Down Expand Up @@ -136,7 +154,7 @@
<filename>README.md</filename>
<filetype>md</filetype>
<usage_type>readme</usage_type>
<checksum>880D4307</checksum>
<checksum>86149F94</checksum>
</file>
<file>
<filename>README.md.erb</filename>
Expand All @@ -153,19 +171,19 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>91F6529D</checksum>
<checksum>BC4835CE</checksum>
</file>
<file>
<filename>os_lib_heat_transfer.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>106661D8</checksum>
<checksum>D265452E</checksum>
</file>
<file>
<filename>os_lib_scout_buildingmeters.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>2EA6644A</checksum>
<checksum>26923569</checksum>
</file>
<file>
<filename>os_lib_scout_hvac.rb</filename>
Expand All @@ -177,7 +195,7 @@
<filename>os_lib_scout_meters.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>4A6F3A84</checksum>
<checksum>2351F994</checksum>
</file>
<file>
<filename>os_lib_sql_file.rb</filename>
Expand All @@ -201,7 +219,13 @@
<filename>Measure_Test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>82E86DF3</checksum>
<checksum>61186A24</checksum>
</file>
<file>
<filename>Restaurant_5B.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>AF2065EC</checksum>
</file>
<file>
<filename>SCn.osm</filename>
Expand All @@ -221,6 +245,12 @@
<usage_type>test</usage_type>
<checksum>BDF687C1</checksum>
</file>
<file>
<filename>Warehouse_ComStock_90.1-2007_7A.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>4D1B42DF</checksum>
</file>
<file>
<filename>baseboard_electric.osm</filename>
<filetype>osm</filetype>
Expand Down Expand Up @@ -263,6 +293,18 @@
<usage_type>test</usage_type>
<checksum>CE8455E1</checksum>
</file>
<file>
<filename>prototype_restaurant.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>AFEF2990</checksum>
</file>
<file>
<filename>prototype_restaurant_no_exhaust.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>5A643321</checksum>
</file>
<file>
<filename>research_special.osm</filename>
<filetype>osm</filetype>
Expand All @@ -275,11 +317,23 @@
<usage_type>test</usage_type>
<checksum>2009F8A6</checksum>
</file>
<file>
<filename>small_office_pthp_basic.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>496561DD</checksum>
</file>
<file>
<filename>small_office_pthp_high_loads.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>94D9705E</checksum>
</file>
<file>
<filename>small_office_pthp_no_windows.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>139107B8</checksum>
</file>
</files>
</measure>
Loading