diff --git a/.github/workflows/test_with_openstudio.yml b/.github/workflows/test_with_openstudio.yml index 61bf14cc..78082b2c 100644 --- a/.github/workflows/test_with_openstudio.yml +++ b/.github/workflows/test_with_openstudio.yml @@ -17,7 +17,7 @@ jobs: # The type of runner that the job will run on runs-on: ubuntu-latest container: - image: nrel/openstudio:3.7.0 + image: nrel/openstudio:3.8.0 steps: - uses: actions/checkout@v2 @@ -34,7 +34,7 @@ jobs: - name: install dependencies shell: bash run: | - gem install bundler -v '2.1.4' + gem install bundler -v '2.4.10' bundle -v bundle install - name: run tests diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ec68e28..43fbf199 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # OpenStudio Common Measures Gem +## Version 0.10.0 +- Support for OpenStudio 3.8 (upgrade to standards gem 0.6.0, extension gem 0.8.0) +- Support Ruby 3.2.2 + ## Version 0.9.0 - Support for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.7) diff --git a/Gemfile b/Gemfile index 8fa6a8ce..22313745 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source 'http://rubygems.org' +# Specify your gem's dependencies in openstudio-model-articulation.gemspec gemspec # Local gems are useful when developing and integrating the various dependencies. @@ -10,12 +11,16 @@ gemspec # checkout the latest version (develop) from github. allow_local = ENV['FAVOR_LOCAL_GEMS'] +# Delete when these branchesa are merged and released +# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'wenyi-bypass-zlib' +# gem 'openstudio-standards', github: 'NREL/openstudio-standards', tag: 'v0.6.0.rc2', ref: "1c42110" +# gem 'openstudio_measure_tester', :git => 'https://github.com/NREL/OpenStudio-measure-tester-gem.git', :branch => 'wenyi-dependencies-update' +# gem 'openstudio-workflow', :git => 'https://github.com/NREL/OpenStudio-workflow-gem.git', :branch => 'develop', ref: "32126e9b9f6" +# gem 'bcl', :git => 'https://github.com/wenyikuang/bcl-gem.git', :branch => 'develop' + +# Only uncomment if you need to test a different version of the extension gem if allow_local && File.exist?('../OpenStudio-extension-gem') gem 'openstudio-extension', path: '../OpenStudio-extension-gem' elsif allow_local gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' -end - -# For Testing -# gem 'openstudio-standards', github: 'NREL/openstudio-standards', branch: '3.5.0_changes' -# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'v0.6.0' +end \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 007e87d5..8a8cb14a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ //Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs -@Library('cbci_shared_libs') _ +@Library('cbci_shared_libs@developExtension') _ // Build for PR to develop branch only. if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set diff --git a/README.md b/README.md index 6361ee60..7890fa2c 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ bundle exec rake openstudio:test_with_openstudio |OpenStudio Common Measures Gem|OpenStudio|Ruby| |:--------------:|:----------:|:--------:| +| 0.10.0 | 3.8 | 3.2.2 | | 0.9.0 | 3.7 | 2.7 | | 0.8.0 | 3.6 | 2.7 | | 0.7.0 | 3.5 | 2.7 | diff --git a/lib/measures/.rubocop.yml b/lib/measures/.rubocop.yml new file mode 100644 index 00000000..33b37e3b --- /dev/null +++ b/lib/measures/.rubocop.yml @@ -0,0 +1,6 @@ +AllCops: + Exclude: + - 'spec/test_measures/**/*' +require: rubocop-performance +inherit_from: + - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml diff --git a/lib/measures/AddCostPerAreaToConstruction/measure.xml b/lib/measures/AddCostPerAreaToConstruction/measure.xml index 397206a8..44621458 100644 --- a/lib/measures/AddCostPerAreaToConstruction/measure.xml +++ b/lib/measures/AddCostPerAreaToConstruction/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_cost_per_area_to_construction bf6ac5d5-6348-4012-b7b4-1200a672e377 - 31107677-dcac-4fa7-996a-9d1bb202737c - 20221115T223558Z + 860086a0-4eb3-4290-af42-1ebdadb94125 + 2024-07-11T14:32:03Z 35DA4ED3 AddCostPerAreaToConstruction Add Cost per Area to Construction @@ -140,16 +140,10 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita - 0416_NetArea_b.osm - osm - test - 3D3EE8E9 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -157,6 +151,12 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita readme E8C8B150 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -166,19 +166,19 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita measure.rb rb script - 639725D7 + C55F964C - AddCostPerAreaToConstruction_Test.rb - rb + 0416_NetArea_b.osm + osm test - 44FC87CD + 3D3EE8E9 - LICENSE.md - md - license - 64FFEBDE + AddCostPerAreaToConstruction_Test.rb + rb + test + 9DF2FFF9 diff --git a/lib/measures/AddCostPerFloorAreaToBuilding/measure.xml b/lib/measures/AddCostPerFloorAreaToBuilding/measure.xml index 26dbb223..45c02387 100644 --- a/lib/measures/AddCostPerFloorAreaToBuilding/measure.xml +++ b/lib/measures/AddCostPerFloorAreaToBuilding/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_cost_per_floor_area_to_building 153992bb-0202-424b-9fbb-57fcf0285e65 - 00195ee2-2b09-4270-aa2a-e9642d582b63 - 20221115T223602Z + 763c9857-93fa-4049-a8c0-6161c30eb541 + 2024-07-11T14:32:06Z 35DA4ED3 AddCostPerFloorAreaToBuilding Add Cost per Floor Area to Building @@ -141,16 +141,16 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita - 0416_NetArea_b.osm - osm - test - 3D3EE8E9 + LICENSE.md + md + license + BFFB1AA6 - 0924_demo_e.osm - osm - test - 6615D680 + README.md + md + readme + DE5B21BA README.md.erb @@ -158,12 +158,6 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita readmeerb 703C9964 - - README.md - md - readme - DE5B21BA - OpenStudio @@ -173,19 +167,25 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita measure.rb rb script - E92E034C + E067600B - AddCostPerFloorAreaToBuilding_Test.rb - rb + 0416_NetArea_b.osm + osm test - 5B187CC2 + 3D3EE8E9 - LICENSE.md - md - license - 64FFEBDE + 0924_demo_e.osm + osm + test + 6615D680 + + + AddCostPerFloorAreaToBuilding_Test.rb + rb + test + EDAC8370 diff --git a/lib/measures/AddCostPerFloorAreaToElectricEquipment/measure.xml b/lib/measures/AddCostPerFloorAreaToElectricEquipment/measure.xml index 804794a7..52a76aa9 100644 --- a/lib/measures/AddCostPerFloorAreaToElectricEquipment/measure.xml +++ b/lib/measures/AddCostPerFloorAreaToElectricEquipment/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_cost_per_floor_area_to_electric_equipment 42cf1acc-c0bc-46cd-af67-8a17cadaab7b - 878740df-ba76-4b19-9baf-e845b66097e0 - 20221115T223556Z + e584d703-1f79-47dc-9940-126d4927a992 + 2024-07-11T14:32:01Z 35DA4ED3 AddCostPerFloorAreaToElectricEquipment Add Cost per Floor Area to Electric Equipment @@ -140,16 +140,10 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita - 0416_NetArea_b.osm - osm - test - 3D3EE8E9 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -157,6 +151,12 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita readme F4D7E305 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -166,19 +166,19 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita measure.rb rb script - 808F6B1D + 878DCC90 - AddCostPerFloorAreaToElectricEquipment_Test.rb - rb + 0416_NetArea_b.osm + osm test - 146B4156 + 3D3EE8E9 - LICENSE.md - md - license - 64FFEBDE + AddCostPerFloorAreaToElectricEquipment_Test.rb + rb + test + BFD5BDA4 diff --git a/lib/measures/AddCostPerFloorAreaToLights/measure.xml b/lib/measures/AddCostPerFloorAreaToLights/measure.xml index 913be491..a8a75cd6 100644 --- a/lib/measures/AddCostPerFloorAreaToLights/measure.xml +++ b/lib/measures/AddCostPerFloorAreaToLights/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_cost_per_floor_area_to_lights eeec5adf-b3a8-498a-b0d1-eabd81ca0620 - a0e1d94d-12f7-46a8-8cdd-3fa40e32ce9f - 20221115T223600Z + 585d2977-848a-421c-9da0-e798d70f8c2c + 2024-07-11T14:32:04Z 35DA4ED3 AddCostPerFloorAreaToLights Add Cost per FloorArea to Lights @@ -140,16 +140,10 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita - 0416_NetArea_b.osm - osm - test - 3D3EE8E9 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -157,6 +151,12 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita readme 58C38C0E + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -166,19 +166,19 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita measure.rb rb script - 3F22D79C + C42B8DD0 - AddCostPerFloorAreaToLights_Test.rb - rb + 0416_NetArea_b.osm + osm test - 368AF36A + 3D3EE8E9 - LICENSE.md - md - license - 64FFEBDE + AddCostPerFloorAreaToLights_Test.rb + rb + test + 3D7791B0 diff --git a/lib/measures/AddCostPerFloorAreaUnusedToLights/measure.xml b/lib/measures/AddCostPerFloorAreaUnusedToLights/measure.xml index aabf1a95..4467f787 100644 --- a/lib/measures/AddCostPerFloorAreaUnusedToLights/measure.xml +++ b/lib/measures/AddCostPerFloorAreaUnusedToLights/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_cost_per_floor_area_to_unused_lights a5f5ddcf-48bb-413a-a712-0ee22f0b40a4 - b24929d8-d7d6-494a-857b-cf777d46fe91 - 20221115T223608Z + 1b346f2e-67d4-4041-b3b3-db02c92c91dc + 2024-07-11T14:32:11Z 35DA4ED3 AddCostPerFloorAreaToUnusedLights Add Cost per Floor Area to Unused Lights @@ -138,16 +138,10 @@ - 0416_NetArea_b.osm - osm - test - 8626A1EB - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -155,6 +149,12 @@ readme 1FCC0A99 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -164,19 +164,19 @@ measure.rb rb script - A8633B81 + 8191C2A5 - AddCostPerFloorAreaToUusedLights_Test.rb - rb + 0416_NetArea_b.osm + osm test - 4C187139 + 8626A1EB - LICENSE.md - md - license - 64FFEBDE + AddCostPerFloorAreaToUusedLights_Test.rb + rb + test + 81802BBB diff --git a/lib/measures/AddCostToSupplySideHVACComponentByAirLoop/measure.xml b/lib/measures/AddCostToSupplySideHVACComponentByAirLoop/measure.xml index d1958f14..4b86a4dd 100644 --- a/lib/measures/AddCostToSupplySideHVACComponentByAirLoop/measure.xml +++ b/lib/measures/AddCostToSupplySideHVACComponentByAirLoop/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_cost_to_supply_side_hvac_component_by_air_loop a667a52f-aa04-4997-9292-c81671d75f84 - 2560e2b2-8e34-4c24-998f-b60752ad2664 - 20221115T223559Z + 3add3271-7d23-4c60-8262-496b8ce3c8d9 + 2024-07-11T14:32:03Z 35DA4ED3 AddCostToSupplySideHVACComponentByAirLoop Add Cost to Supply Side HVAC Component by Air Loop @@ -80,7 +80,7 @@ false - {0e05ea8e-1ac9-4621-871d-ffbfab694f2a} + {e082ca35-10c9-4d99-9639-c6fa18a6d270} *All Air Loops* @@ -205,16 +205,10 @@ - HVACComponentBasic.osm - osm - test - FA350D42 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -223,10 +217,10 @@ 77E97831 - HVACComponentBasic/files/USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 + README.md.erb + erb + readmeerb + 703C9964 @@ -237,19 +231,25 @@ measure.rb rb script - BA1AC91E + F66AA885 AddCostToSupplySideHVACComponentByAirLoop_Test.rb rb test - 44CFEA7D + 4AD33D4B - LICENSE.md - md - license - 64FFEBDE + HVACComponentBasic/files/USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 + + + HVACComponentBasic.osm + osm + test + FA350D42 diff --git a/lib/measures/AddCostperAreatoUnusedConstruction/measure.xml b/lib/measures/AddCostperAreatoUnusedConstruction/measure.xml index deb3f40d..b7a7c2ce 100644 --- a/lib/measures/AddCostperAreatoUnusedConstruction/measure.xml +++ b/lib/measures/AddCostperAreatoUnusedConstruction/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_cost_per_area_to_unused_construction ad632782-125f-45c8-a9cf-516e184b418a - 77e28ae4-1653-4fe6-bb97-b605ba0a0b92 - 20221115T223602Z + 0ef0fe11-89d7-4d04-96fd-4e7d683637f1 + 2024-07-11T14:32:06Z 35DA4ED3 AddCostPerAreaToUnusedConstruction Add Cost per Area to Unused Construction @@ -138,16 +138,10 @@ - 0416_NetArea_b.osm - osm - test - 3D3EE8E9 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -155,6 +149,12 @@ readme 1966C795 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -164,19 +164,19 @@ measure.rb rb script - 9FB1CA14 + B4FCE3CF - AddCostperAreatoUnusedConstruction_Test.rb - rb + 0416_NetArea_b.osm + osm test - AFB58E20 + 3D3EE8E9 - LICENSE.md - md - license - 64FFEBDE + AddCostperAreatoUnusedConstruction_Test.rb + rb + test + 48F4C252 diff --git a/lib/measures/AddExteriorLights/measure.xml b/lib/measures/AddExteriorLights/measure.xml index b4f24477..82af9fee 100644 --- a/lib/measures/AddExteriorLights/measure.xml +++ b/lib/measures/AddExteriorLights/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_exterior_lights 34f9050c-5f8f-4d10-8e46-30ca8333114d - 7355a8e1-f96c-4b04-af4c-7a1afa532590 - 20221115T223557Z + 5424f31c-13ac-438e-a802-98c69979c130 + 2024-07-11T14:32:02Z 293730A7 AddExteriorLights Add Exterior Lights @@ -148,16 +148,10 @@ - RefBldgMediumOfficeNew2004_Chicago_a.osm - osm - test - 9621988A - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -165,6 +159,12 @@ readme FE656A0B + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -174,19 +174,19 @@ measure.rb rb script - DF0D238F + 7D47CAD4 AddExteriorLights_Test.rb rb test - ED00FA13 + 31C74E80 - LICENSE.md - md - license - 64FFEBDE + RefBldgMediumOfficeNew2004_Chicago_a.osm + osm + test + 9621988A diff --git a/lib/measures/AddMeter/measure.xml b/lib/measures/AddMeter/measure.xml index 9e5afc36..c20a2c83 100644 --- a/lib/measures/AddMeter/measure.xml +++ b/lib/measures/AddMeter/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_meter ad4015f2-6d1d-4bb2-84b1-db47bc67a5b2 - 45de170c-fd35-4cc6-8f31-d77db602f425 - 20221115T223604Z + 288e248e-aedf-4c6b-ac7b-1077444b6a59 + 2024-07-11T14:32:07Z 0CA4D54C AddMeter Add Meter @@ -79,10 +79,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -90,6 +90,12 @@ readme 29718290 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -99,19 +105,13 @@ measure.rb rb script - 23CC8AB4 + FE6DA82F AddMeter_Test.rb rb test - CCC824A0 - - - LICENSE.md - md - license - 64FFEBDE + 99BD0176 diff --git a/lib/measures/AddOutputDiagnostics/measure.xml b/lib/measures/AddOutputDiagnostics/measure.xml index dc1de332..525f9340 100644 --- a/lib/measures/AddOutputDiagnostics/measure.xml +++ b/lib/measures/AddOutputDiagnostics/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_output_diagnostics cb957503-4a01-42c4-a918-a44df4ea759c - 9af64701-5626-4138-af69-44d1d18cba67 - 20221115T223556Z + 28c00b8a-091e-4792-9eeb-65e6e64482d2 + 2024-07-11T14:32:00Z AA6ADD14 AddOutputDiagnostics Add Output Diagnostics @@ -81,10 +81,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -93,16 +93,10 @@ FC2D21D7 - AddOutputDiagnostics_Test.rb - rb - test - 5EDC7B29 - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -113,7 +107,13 @@ measure.rb rb script - 32D45F14 + 94FC90D2 + + + AddOutputDiagnostics_Test.rb + rb + test + 43E8CA0D diff --git a/lib/measures/AddOutputVariable/measure.xml b/lib/measures/AddOutputVariable/measure.xml index 849d6eee..fe48f01b 100644 --- a/lib/measures/AddOutputVariable/measure.xml +++ b/lib/measures/AddOutputVariable/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_output_variable 2a058afb-e349-49ae-a4bf-2c56a42b4352 - 80fdaf20-61bf-4e79-aa6e-a14bf130007f - 20221115T223608Z + 72ed5e71-ec1d-4f48-b3f9-844048dde9ae + 2024-07-11T14:32:11Z 0CA4D54C AddOutputVariable Add Output Variable @@ -91,10 +91,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -102,6 +102,12 @@ readme D866D79B + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -111,19 +117,13 @@ measure.rb rb script - FFBDDF9A + 1AC65C90 AddOutputVariable_Test.rb rb test - 37743A88 - - - LICENSE.md - md - license - 64FFEBDE + 416E70B7 diff --git a/lib/measures/AddSimplePvToShadingSurfacesByType/measure.xml b/lib/measures/AddSimplePvToShadingSurfacesByType/measure.xml index 2d1cebb4..749da69c 100644 --- a/lib/measures/AddSimplePvToShadingSurfacesByType/measure.xml +++ b/lib/measures/AddSimplePvToShadingSurfacesByType/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_simple_pv_to_shading_surfaces_by_type 27627c16-75d4-4fc3-add9-2d7d538c0130 - 630daa69-1131-4fec-85e2-2678f4fa3223 - 20221115T223605Z + a6476df6-8fac-48df-9065-6d2dc7f1c382 + 2024-07-11T14:32:08Z 92C8C204 AddSimplePvToShadingSurfacesByType Add Simple PV to Specified Shading Surfaces @@ -115,16 +115,10 @@ - PV_test_model.osm - osm - test - DA2775F4 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -133,16 +127,10 @@ 0A15907B - AddSimplePvToShadingSurfacesByType_Test.rb - rb - test - A539BF8F - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -153,7 +141,19 @@ measure.rb rb script - A446FDD9 + 83450B00 + + + AddSimplePvToShadingSurfacesByType_Test.rb + rb + test + D86CF5F6 + + + PV_test_model.osm + osm + test + DA2775F4 diff --git a/lib/measures/AddThermalComfortModelTypes/measure.xml b/lib/measures/AddThermalComfortModelTypes/measure.xml index fb4b5ad5..18a3b51a 100644 --- a/lib/measures/AddThermalComfortModelTypes/measure.xml +++ b/lib/measures/AddThermalComfortModelTypes/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_thermal_comfort_model_types 5ae7b6b3-58d0-40b4-9899-a7cf0e0d36d2 - 65302226-31ae-4c79-8981-43a9fd4b4e74 - 20230421T151558Z + 4df1a3ab-2368-464d-8ade-28a0b26601fd + 2024-07-11T14:32:12Z F0C3F749 AddThermalComfortModelTypes AddThermalComfortModelTypes @@ -193,23 +193,23 @@ - - README.md.erb - erb - readmeerb - F1C26127 - LICENSE.md md license - CD7F5672 + BFFB1AA6 - base-schedules-simple-power-outage.osm - osm - test - 86C09826 + README.md + md + readme + EEFF828A + + + README.md.erb + erb + readmeerb + F1C26127 @@ -220,25 +220,25 @@ measure.rb rb script - 69FB822F + F8B1D234 AddThermalComfortModelTypes_Test.rb rb test - D7A5EAE0 + 5EC888D3 - README.md - md - readme - EEFF828A + base-schedules-simple-power-outage.osm + osm + test + 86C09826 test_AddThermalComfortModelTypes.osm osm test - CA066850 + 0C6F65B1 diff --git a/lib/measures/AddThermalComfortModelTypes/tests/test_AddThermalComfortModelTypes.osm b/lib/measures/AddThermalComfortModelTypes/tests/test_AddThermalComfortModelTypes.osm index 07cb8644..b099a9f3 100644 --- a/lib/measures/AddThermalComfortModelTypes/tests/test_AddThermalComfortModelTypes.osm +++ b/lib/measures/AddThermalComfortModelTypes/tests/test_AddThermalComfortModelTypes.osm @@ -1,7 +1,7 @@ OS:Version, - {c38679ba-9cea-4f46-be56-9aa9de05078a}, !- Handle - 3.5.1; !- Version Identifier + {0fe68258-4db9-43ba-b35a-9a3a6b3bbf95}, !- Handle + 3.8.0; !- Version Identifier OS:WeatherFile, {0811aa26-ba59-4221-8456-ad811e6b28bd}, !- Handle @@ -140,7 +140,7 @@ OS:Schedule:Day, {59e3789a-9cdf-4aa0-bf29-0494b296bef2}, !- Handle Schedule Day 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 1; !- Value Until Time 1 @@ -168,7 +168,7 @@ OS:Schedule:Day, {1c388734-fff7-43f5-a386-f5183e2663e9}, !- Handle outage off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 1, !- Value Until Time 1 @@ -265,7 +265,7 @@ OS:Schedule:Day, {396a715e-bc29-41f1-9c4d-98a27439e971}, !- Handle outage off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -293,7 +293,7 @@ OS:Schedule:Day, {e183fd76-a327-4115-8675-177421659843}, !- Handle outage off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -499,7 +499,7 @@ OS:Schedule:Day, {b6955e13-6590-4217-99e3-35c6016a1187}, !- Handle Schedule Day 2, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -527,7 +527,7 @@ OS:Schedule:Day, {b9c85ef9-aa23-4146-84cd-670e28a74f31}, !- Handle heating setpoint allday1, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 20; !- Value Until Time 1 @@ -542,7 +542,7 @@ OS:Schedule:Day, {ebdb9144-c97a-4f9b-91d8-f562d339fb69}, !- Handle Schedule Day 3, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -570,7 +570,7 @@ OS:Schedule:Day, {82e03042-83d1-4a26-9952-486c87ef443e}, !- Handle cooling setpoint allday1, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 25.5555555555556; !- Value Until Time 1 @@ -1670,7 +1670,7 @@ OS:Schedule:Day, {02c8bb7c-88f5-4f31-9547-ea2f613337b9}, !- Handle Schedule Day 4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -1698,7 +1698,7 @@ OS:Schedule:Day, {07f126ad-28a0-4688-98b5-49ceec2660bf}, !- Handle cooling season schedule allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -1726,7 +1726,7 @@ OS:Schedule:Day, {96b349e0-ffe4-45b9-9a20-4478160db847}, !- Handle cooling season schedule allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 1; !- Value Until Time 1 @@ -1754,7 +1754,7 @@ OS:Schedule:Day, {1cb60390-41c6-4c23-ba8e-aece1da58871}, !- Handle cooling season schedule allday11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -1858,7 +1858,7 @@ OS:Schedule:Day, {61e11d17-1554-4410-b4b6-a712af75007a}, !- Handle Schedule Day 5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -1886,7 +1886,7 @@ OS:Schedule:Day, {1d02f57c-83fd-4524-8347-381848147ae0}, !- Handle trans schedule winter=0.85 summer=0.7 allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0.85; !- Value Until Time 1 @@ -1914,7 +1914,7 @@ OS:Schedule:Day, {7872670f-22dc-483a-ab3c-fb5b82b4e4c0}, !- Handle trans schedule winter=0.85 summer=0.7 allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0.7; !- Value Until Time 1 @@ -1942,7 +1942,7 @@ OS:Schedule:Day, {d63ffeb3-bdba-4fdd-ad55-e275ee505bb5}, !- Handle trans schedule winter=0.85 summer=0.7 allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0.85; !- Value Until Time 1 @@ -2549,7 +2549,7 @@ OS:Schedule:Day, {539d4937-28a3-48c2-b14f-d911f929424a}, !- Handle Schedule Day 6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -2577,7 +2577,7 @@ OS:Schedule:Day, {0c98e385-b312-4608-aae3-07bdda45e84d}, !- Handle occupants schedule allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 7, !- Hour 1 0, !- Minute 1 1, !- Value Until Time 1 @@ -2620,7 +2620,7 @@ OS:People:Definition, 0.563030303030303, !- Sensible Heat Fraction 0, !- Carbon Dioxide Generation Rate {m3/s-W} No, !- Enable ASHRAE 55 Comfort Warnings - ZoneAveraged, !- Mean Radiant Temperature Calculation Type + EnclosureAveraged, !- Mean Radiant Temperature Calculation Type Fanger, !- Thermal Comfort Model Type 1 Pierce; !- Thermal Comfort Model Type 2 @@ -2632,9 +2632,9 @@ OS:People, {fe6d13ab-5e09-43f0-87d6-c94127de246c}, !- Number of People Schedule Name {4d544aaf-b6cb-46cf-beac-a747ae78b1fa}, !- Activity Level Schedule Name , !- Surface Name/Angle Factor List Name - {95cd08fa-41ff-4782-8e6a-48ac94ffb9d0}, !- Work Efficiency Schedule Name - {21e105c5-9e9f-4b4c-a55a-623124a87354}, !- Clothing Insulation Schedule Name - {e9546a6f-18f7-45b0-84f8-59c62b99a68a}, !- Air Velocity Schedule Name + {506c2c49-8208-43b9-92a3-882d9659f6ee}, !- Work Efficiency Schedule Name + {b7350b1c-afd8-4894-b2b0-cb064661db8d}, !- Clothing Insulation Schedule Name + {e0d9c0e0-6f5d-4e06-a6d5-b374db9a86e3}, !- Air Velocity Schedule Name 1; !- Multiplier OS:ScheduleTypeLimits, @@ -2748,6 +2748,7 @@ OS:Coil:Cooling:DX:SingleSpeed, autosize, !- Evaporative Condenser Air Flow Rate {m3/s} autosize, !- Evaporative Condenser Pump Rated Power Consumption {W} 50, !- Crankcase Heater Capacity {W} + , !- Crankcase Heater Capacity Function of Temperature Curve Name 10, !- Maximum Outdoor Dry-Bulb Temperature for Crankcase Heater Operation {C} , !- Supply Water Storage Tank Name , !- Condensate Collection Water Storage Tank Name @@ -2770,9 +2771,9 @@ OS:Coil:Heating:Gas, , !- Air Inlet Node Name , !- Air Outlet Node Name , !- Temperature Setpoint Node Name - 0, !- Parasitic Electric Load {W} + 0, !- On Cycle Parasitic Electric Load {W} , !- Part Load Fraction Correlation Curve Name - 0, !- Parasitic Gas Load {W} + 0, !- Off Cycle Parasitic Gas Load {W} NaturalGas; !- Fuel Type OS:AdditionalProperties, @@ -2929,20 +2930,17 @@ OS:AirLoopHVAC:UnitarySystem, , !- Supply Air Flow Rate Per Floor Area during Heating Operation {m3/s-m2} , !- Fraction of Autosized Design Heating Supply Air Flow Rate , !- Design Supply Air Flow Rate Per Unit of Capacity During Heating Operation {m3/s-W} - , !- Supply Air Flow Rate Method When No Cooling or Heating is Required - 0, !- Supply Air Flow Rate When No Cooling or Heating is Required {m3/s} + None, !- Supply Air Flow Rate Method When No Cooling or Heating is Required + , !- Supply Air Flow Rate When No Cooling or Heating is Required {m3/s} , !- Supply Air Flow Rate Per Floor Area When No Cooling or Heating is Required {m3/s-m2} , !- Fraction of Autosized Design Cooling Supply Air Flow Rate When No Cooling or Heating is Required , !- Fraction of Autosized Design Heating Supply Air Flow Rate When No Cooling or Heating is Required , !- Design Supply Air Flow Rate Per Unit of Capacity During Cooling Operation When No Cooling or Heating is Required {m3/s-W} , !- Design Supply Air Flow Rate Per Unit of Capacity During Heating Operation When No Cooling or Heating is Required {m3/s-W} + Yes, !- No Load Supply Air Flow Rate Control Set To Low Speed 48.8888888888889, !- Maximum Supply Air Temperature {C} 21, !- Maximum Outdoor Dry-Bulb Temperature for Supplemental Heater Operation {C} , !- Outdoor Dry-Bulb Temperature Sensor Node Name - 2.5, !- Maximum Cycling Rate {cycles/hr} - 60, !- Heat Pump Time Constant {s} - 0.01, !- Fraction of On-Cycle Power Use - 60, !- Heat Pump Fan Delay Time {s} 0, !- Ancilliary On-Cycle Electric Power {W} 0; !- Ancilliary Off-Cycle Electric Power {W} @@ -3176,7 +3174,7 @@ OS:Schedule:Day, {b1e933e7-fb5a-47e3-ba37-a041bd812047}, !- Handle Schedule Day 7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 1; !- Value Until Time 1 @@ -3204,7 +3202,7 @@ OS:Schedule:Day, {4129831e-076e-4dfb-94c8-c4ab1a52e37c}, !- Handle Sequential Fraction Schedule off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 1, !- Value Until Time 1 @@ -3301,7 +3299,7 @@ OS:Schedule:Day, {8696daee-87c5-4e6d-90c2-b3e44d4e4224}, !- Handle Sequential Fraction Schedule off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -3329,7 +3327,7 @@ OS:Schedule:Day, {dbcaf984-2688-4c93-b1da-267e992666ca}, !- Handle Sequential Fraction Schedule off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -3413,7 +3411,7 @@ OS:Schedule:Day, {87072de9-fdfc-4707-b515-f7d39d1bad43}, !- Handle Schedule Day 8, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 1; !- Value Until Time 1 @@ -3441,7 +3439,7 @@ OS:Schedule:Day, {71054a04-9695-4b19-a222-bfc37356d2fb}, !- Handle Sequential Fraction Schedule off period0 3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 1, !- Value Until Time 1 @@ -3538,7 +3536,7 @@ OS:Schedule:Day, {48f9f9ae-4ccc-423c-9def-3898c7667888}, !- Handle Sequential Fraction Schedule off period0 4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -3566,7 +3564,7 @@ OS:Schedule:Day, {c04a4a7c-a3b2-4008-91dc-c8f7708ab2cd}, !- Handle Sequential Fraction Schedule off period0 5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -4010,7 +4008,7 @@ OS:Schedule:Day, {c4828b36-e142-4a5e-be0a-1ab3572dd772}, !- Handle Schedule Day 11, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 52.6666666666667; !- Value Until Time 1 @@ -4038,7 +4036,7 @@ OS:Schedule:Day, {0fa90355-13c8-4825-8662-b8fb85ca77de}, !- Handle water heater setpoint off period0, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 52.6666666666667, !- Value Until Time 1 @@ -4135,7 +4133,7 @@ OS:Schedule:Day, {2250077f-cbe4-444f-8bae-19bc3d1a0d4f}, !- Handle water heater setpoint off period0 1, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 2; !- Value Until Time 1 @@ -4163,7 +4161,7 @@ OS:Schedule:Day, {afa1f1a4-f2c4-44ae-ae58-3d65ed6e3a46}, !- Handle water heater setpoint off period0 2, !- Name {f9bf22d0-06ab-435d-a0a1-3e7e737e6758}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 2, !- Value Until Time 1 @@ -4423,7 +4421,7 @@ OS:Schedule:Day, {ca3f2906-552d-49af-98e9-b23dccf77b4c}, !- Handle Schedule Day 9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -4451,7 +4449,7 @@ OS:Schedule:Day, {09c21e64-af02-4fd3-b717-b7d0e5975f4a}, !- Handle clothes washer allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.103524780412324, !- Value Until Time 1 @@ -4536,7 +4534,7 @@ OS:Schedule:Day, {770c1441-4514-421f-9811-561c0a382c39}, !- Handle clothes washer allday2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.102603194830019, !- Value Until Time 1 @@ -4621,7 +4619,7 @@ OS:Schedule:Day, {b0b9096d-5bb8-4941-b96b-4d0bef102184}, !- Handle clothes washer allday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.104651162790698, !- Value Until Time 1 @@ -4706,7 +4704,7 @@ OS:Schedule:Day, {54d20e4f-658c-4798-a177-3267d5a5500c}, !- Handle clothes washer allday4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.10444636599463, !- Value Until Time 1 @@ -4791,7 +4789,7 @@ OS:Schedule:Day, {daaa4a93-1561-469b-845f-936fe4c0d751}, !- Handle clothes washer allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.104651162790698, !- Value Until Time 1 @@ -4876,7 +4874,7 @@ OS:Schedule:Day, {90d62e56-b9d3-43a1-a470-7e84b47c2205}, !- Handle clothes washer allday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.101988804441815, !- Value Until Time 1 @@ -4961,7 +4959,7 @@ OS:Schedule:Day, {a7f99368-d14d-4faf-8de6-42c9dba5346c}, !- Handle clothes washer allday7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.102295999635917, !- Value Until Time 1 @@ -5046,7 +5044,7 @@ OS:Schedule:Day, {c4cd2d56-be66-422a-bdc4-7d3277cb1448}, !- Handle clothes washer allday9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.101988804441815, !- Value Until Time 1 @@ -5131,7 +5129,7 @@ OS:Schedule:Day, {20a2a13e-5296-4637-9ae0-08fdb166c468}, !- Handle clothes washer allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.0987120557047285, !- Value Until Time 1 @@ -5216,7 +5214,7 @@ OS:Schedule:Day, {2756b8ac-da35-4256-8db2-37f3c33f2a47}, !- Handle clothes washer allday11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.0982000637145588, !- Value Until Time 1 @@ -5301,7 +5299,7 @@ OS:Schedule:Day, {84aea05f-7c72-4985-89c6-8b12468a056f}, !- Handle clothes washer allday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.103524780412324, !- Value Until Time 1 @@ -5386,7 +5384,7 @@ OS:Schedule:Day, {632a3608-f938-4764-bc3b-ebd8abc82613}, !- Handle clothes washer off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.102295999635917, !- Value Until Time 1 @@ -5483,7 +5481,7 @@ OS:Schedule:Day, {fb7af6e8-9f54-4be6-854c-3f9cdad0129c}, !- Handle clothes washer off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -5511,7 +5509,7 @@ OS:Schedule:Day, {efd15217-eb55-496e-aa69-4100a0dcf49d}, !- Handle clothes washer off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -5615,7 +5613,7 @@ OS:Schedule:Day, {d623911b-5069-4cf9-8ba6-94b30089057a}, !- Handle Schedule Day 10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -5643,7 +5641,7 @@ OS:Schedule:Day, {afa5a9ab-40e3-432f-a2ae-b7e5c29c96e8}, !- Handle clothes dryer allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.123456790123457, !- Value Until Time 1 @@ -5737,7 +5735,7 @@ OS:Schedule:Day, {09f979b2-d6cf-4417-baac-c6915cbbe6cc}, !- Handle clothes dryer off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.123456790123457, !- Value Until Time 1 @@ -5834,7 +5832,7 @@ OS:Schedule:Day, {3aaf599a-d2f1-4ac8-897e-8c7a79b39735}, !- Handle clothes dryer off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -5862,7 +5860,7 @@ OS:Schedule:Day, {23ddfd97-92c7-406a-a406-f156acd4b018}, !- Handle clothes dryer off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -5966,7 +5964,7 @@ OS:Schedule:Day, {54488085-5de3-4624-80d4-02c382467344}, !- Handle Schedule Day 12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -5994,7 +5992,7 @@ OS:Schedule:Day, {82c3398c-bf00-4b3b-9935-79dbea497143}, !- Handle dishwasher allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.135135135135135, !- Value Until Time 1 @@ -6085,7 +6083,7 @@ OS:Schedule:Day, {6937bd72-e50f-4588-b26e-b6eef587bcbb}, !- Handle dishwasher allday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.122077410135751, !- Value Until Time 1 @@ -6176,7 +6174,7 @@ OS:Schedule:Day, {438acb0f-2e89-4732-9b87-1cf9cfbc857d}, !- Handle dishwasher allday4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.121584665796152, !- Value Until Time 1 @@ -6267,7 +6265,7 @@ OS:Schedule:Day, {b9a7cc9d-ec53-4b80-8668-6b85019cbc00}, !- Handle dishwasher allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.122077410135751, !- Value Until Time 1 @@ -6358,7 +6356,7 @@ OS:Schedule:Day, {39e756dc-3448-40a5-82f4-5bca71325543}, !- Handle dishwasher allday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.109635615560866, !- Value Until Time 1 @@ -6449,7 +6447,7 @@ OS:Schedule:Day, {25448601-f7c7-4861-a393-4add84120e72}, !- Handle dishwasher allday7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.110374732070265, !- Value Until Time 1 @@ -6540,7 +6538,7 @@ OS:Schedule:Day, {77b92077-bd31-49a2-9ae2-0072c8823a8e}, !- Handle dishwasher allday9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.109635615560866, !- Value Until Time 1 @@ -6631,7 +6629,7 @@ OS:Schedule:Day, {07592e25-7690-4c55-b364-a6ef05da7390}, !- Handle dishwasher allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.133656902116337, !- Value Until Time 1 @@ -6722,7 +6720,7 @@ OS:Schedule:Day, {13ba6b88-1ef7-4ba1-b37a-ebb423c98293}, !- Handle dishwasher allday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.135135135135135, !- Value Until Time 1 @@ -6813,7 +6811,7 @@ OS:Schedule:Day, {3825b41c-5b27-4454-933a-76bd5c6676e5}, !- Handle dishwasher off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.110374732070265, !- Value Until Time 1 @@ -6910,7 +6908,7 @@ OS:Schedule:Day, {0ce2f22d-55a5-421d-b8fb-0703592a605f}, !- Handle dishwasher off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -6938,7 +6936,7 @@ OS:Schedule:Day, {13e54872-082a-4321-a318-184d1f36a972}, !- Handle dishwasher off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -7042,7 +7040,7 @@ OS:Schedule:Day, {a4350bdc-97d1-49f1-a88a-93db16466fcc}, !- Handle Schedule Day 13, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -7070,7 +7068,7 @@ OS:Schedule:Day, {b49a7b02-1af1-4a11-afd5-c7194ef1f7ed}, !- Handle fridge allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.610948905109489, !- Value Until Time 1 @@ -7152,7 +7150,7 @@ OS:Schedule:Day, {1e9cf281-16ec-46fc-8432-a10f8f674c3d}, !- Handle fridge allday2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.60948905109489, !- Value Until Time 1 @@ -7234,7 +7232,7 @@ OS:Schedule:Day, {dcca2e7f-54fe-4c96-8f24-a8f6c535fb2c}, !- Handle fridge allday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.791240875912409, !- Value Until Time 1 @@ -7316,7 +7314,7 @@ OS:Schedule:Day, {e900ff63-a13c-4881-be5e-3e52641d6db1}, !- Handle fridge allday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.8, !- Value Until Time 1 @@ -7398,7 +7396,7 @@ OS:Schedule:Day, {5050f72b-9502-44a1-9ad5-092835795c85}, !- Handle fridge allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.67956204379562, !- Value Until Time 1 @@ -7480,7 +7478,7 @@ OS:Schedule:Day, {e8ce0831-79f4-427e-811e-1b9d9a43c4ad}, !- Handle fridge allday11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.675182481751825, !- Value Until Time 1 @@ -7562,7 +7560,7 @@ OS:Schedule:Day, {e24a4b02-e0c4-4823-9f56-156bb1dcdcc5}, !- Handle fridge allday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.610948905109489, !- Value Until Time 1 @@ -7644,7 +7642,7 @@ OS:Schedule:Day, {5038298a-40fa-420e-a322-e5b9bad08207}, !- Handle fridge off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.8, !- Value Until Time 1 @@ -7741,7 +7739,7 @@ OS:Schedule:Day, {07ebfcb2-c417-4ec7-9679-d07546845296}, !- Handle fridge off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -7769,7 +7767,7 @@ OS:Schedule:Day, {60321ad3-6afe-4361-bb32-574f3dfa87a3}, !- Handle fridge off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -7873,7 +7871,7 @@ OS:Schedule:Day, {c91bb636-7265-4a83-8ff7-3c870b3f5748}, !- Handle Schedule Day 14, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -7901,7 +7899,7 @@ OS:Schedule:Day, {f79630ce-2818-4a02-ad26-c06dbb4d12f9}, !- Handle cooking range allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0466666666666667, !- Value Until Time 1 @@ -7992,7 +7990,7 @@ OS:Schedule:Day, {7dc138e2-a0bd-41ae-9e62-b1733b9ebfcb}, !- Handle cooking range allday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0421573989668794, !- Value Until Time 1 @@ -8083,7 +8081,7 @@ OS:Schedule:Day, {a6c840f3-e465-4073-8060-3ee1498e38cc}, !- Handle cooking range allday4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0419872379216044, !- Value Until Time 1 @@ -8174,7 +8172,7 @@ OS:Schedule:Day, {2fa07cc0-57b7-4ff0-b498-5af1a7a55c4b}, !- Handle cooking range allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0421573989668794, !- Value Until Time 1 @@ -8265,7 +8263,7 @@ OS:Schedule:Day, {9751ea7a-e515-417b-b7f5-e2bfad52c558}, !- Handle cooking range allday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0378608325736858, !- Value Until Time 1 @@ -8356,7 +8354,7 @@ OS:Schedule:Day, {6bb2cb10-bbe8-4dea-8a85-47ec49760e78}, !- Handle cooking range allday7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0381160741415983, !- Value Until Time 1 @@ -8447,7 +8445,7 @@ OS:Schedule:Day, {71b68a89-2655-493f-bf38-3a36db285e3a}, !- Handle cooking range allday9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0378608325736858, !- Value Until Time 1 @@ -8538,7 +8536,7 @@ OS:Schedule:Day, {c5d0ce8d-3cc4-4965-a02a-7b349f6d78ce}, !- Handle cooking range allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0461561835308417, !- Value Until Time 1 @@ -8629,7 +8627,7 @@ OS:Schedule:Day, {633de864-a045-4ef3-938e-93ce3d7b491c}, !- Handle cooking range allday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.0466666666666667, !- Value Until Time 1 @@ -8720,7 +8718,7 @@ OS:Schedule:Day, {a34a0033-4dce-464a-ba33-77783957181b}, !- Handle cooking range off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.0381160741415983, !- Value Until Time 1 @@ -8817,7 +8815,7 @@ OS:Schedule:Day, {749db85b-e795-4760-a374-2c58d1c4256c}, !- Handle cooking range off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -8845,7 +8843,7 @@ OS:Schedule:Day, {87647a14-1606-4be6-898a-1144005943d8}, !- Handle cooking range off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -9336,7 +9334,7 @@ OS:Schedule:Day, {414f64a9-f3d9-42f5-b60b-bba5028d6846}, !- Handle Schedule Day 15, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -9364,7 +9362,7 @@ OS:Schedule:Day, {837e9a6c-5a2e-4331-967a-cef546f8fcbe}, !- Handle dhw fixtures allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.137931034482759, !- Value Until Time 1 @@ -9458,7 +9456,7 @@ OS:Schedule:Day, {7d2fe6cb-d0b7-49d9-b53b-d29e462ebec2}, !- Handle dhw fixtures off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.137931034482759, !- Value Until Time 1 @@ -9555,7 +9553,7 @@ OS:Schedule:Day, {928e9997-9a66-42bf-969a-81ae45cfda14}, !- Handle dhw fixtures off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -9583,7 +9581,7 @@ OS:Schedule:Day, {52f35ead-9711-42ab-afad-992d5ef71d4e}, !- Handle dhw fixtures off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -9763,7 +9761,7 @@ OS:Schedule:Day, {2b32db00-b47f-4530-a7a9-13d1adf5d1e1}, !- Handle Schedule Day 16, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -9791,7 +9789,7 @@ OS:Schedule:Day, {bc740552-0117-4b19-81d5-580fb8b35dca}, !- Handle misc tv schedule allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.416666666666667, !- Value Until Time 1 @@ -9882,7 +9880,7 @@ OS:Schedule:Day, {326407f8-e2b3-4931-81d0-8b0df6ff3abf}, !- Handle misc tv schedule allday2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.413734975080622, !- Value Until Time 1 @@ -9973,7 +9971,7 @@ OS:Schedule:Day, {673d5a94-055d-487f-b286-8d23b00d2c9f}, !- Handle misc tv schedule allday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.352169451773673, !- Value Until Time 1 @@ -10064,7 +10062,7 @@ OS:Schedule:Day, {0a1194df-3393-4d8b-b163-f76fdef946ad}, !- Handle misc tv schedule allday4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.355101143359719, !- Value Until Time 1 @@ -10155,7 +10153,7 @@ OS:Schedule:Day, {b8ecfb9b-b76e-4370-8273-7f049046da45}, !- Handle misc tv schedule allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.352169451773673, !- Value Until Time 1 @@ -10246,7 +10244,7 @@ OS:Schedule:Day, {ab4f552c-ffa5-4861-b518-770e866620b9}, !- Handle misc tv schedule allday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.363896218117854, !- Value Until Time 1 @@ -10337,7 +10335,7 @@ OS:Schedule:Day, {a1e0fb6d-8008-44e6-9d12-c4b665c19778}, !- Handle misc tv schedule allday7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.364995602462621, !- Value Until Time 1 @@ -10428,7 +10426,7 @@ OS:Schedule:Day, {3dc71c8b-8562-4c96-8ddd-c1cec3b46685}, !- Handle misc tv schedule allday8, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.351802990325418, !- Value Until Time 1 @@ -10519,7 +10517,7 @@ OS:Schedule:Day, {a2c483cc-c286-40bc-abd4-28c1444c66a7}, !- Handle misc tv schedule allday9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.363896218117854, !- Value Until Time 1 @@ -10610,7 +10608,7 @@ OS:Schedule:Day, {ae52946b-b4ee-4634-b091-7e948c597cfe}, !- Handle misc tv schedule allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.317722075637643, !- Value Until Time 1 @@ -10701,7 +10699,7 @@ OS:Schedule:Day, {f593c4b0-d4eb-46fb-ad64-b6506c88b886}, !- Handle misc tv schedule allday11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.315156845499853, !- Value Until Time 1 @@ -10792,7 +10790,7 @@ OS:Schedule:Day, {0beed128-b852-4d79-a8f3-56007d553da3}, !- Handle misc tv schedule allday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.416666666666667, !- Value Until Time 1 @@ -10883,7 +10881,7 @@ OS:Schedule:Day, {b61563dd-37c3-4143-9f8b-dfd0c4b7aef4}, !- Handle misc tv schedule off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.364995602462621, !- Value Until Time 1 @@ -10980,7 +10978,7 @@ OS:Schedule:Day, {1de98da5-1e82-4808-9c39-663b264bf2be}, !- Handle misc tv schedule off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -11008,7 +11006,7 @@ OS:Schedule:Day, {821e9fc4-9dd4-4aba-9d80-3330ccb67c3c}, !- Handle misc tv schedule off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -11112,7 +11110,7 @@ OS:Schedule:Day, {dfe005f8-8195-4b0f-a11c-0ddac5b2db1e}, !- Handle Schedule Day 17, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -11140,7 +11138,7 @@ OS:Schedule:Day, {c45728f7-cf2e-4924-a472-99543af1eb25}, !- Handle misc plug loads schedule allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.655649119646958, !- Value Until Time 1 @@ -11228,7 +11226,7 @@ OS:Schedule:Day, {bcfa4a10-6e1c-4392-b58f-d62284541356}, !- Handle misc plug loads schedule allday2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.660377358490566, !- Value Until Time 1 @@ -11316,7 +11314,7 @@ OS:Schedule:Day, {71002c11-c2a9-44b5-b695-43a941ae0c68}, !- Handle misc plug loads schedule allday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.521682352411402, !- Value Until Time 1 @@ -11404,7 +11402,7 @@ OS:Schedule:Day, {47125435-31b8-4f94-aedf-043df6fbfaab}, !- Handle misc plug loads schedule allday4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.519580912925354, !- Value Until Time 1 @@ -11492,7 +11490,7 @@ OS:Schedule:Day, {60a17099-f7fa-4657-8356-e1338eca1b63}, !- Handle misc plug loads schedule allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.521682352411402, !- Value Until Time 1 @@ -11580,7 +11578,7 @@ OS:Schedule:Day, {f93abd5c-663f-4fd7-b434-cca61076c1b2}, !- Handle misc plug loads schedule allday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.434472613740412, !- Value Until Time 1 @@ -11668,7 +11666,7 @@ OS:Schedule:Day, {47aa8883-0900-4298-a71e-e89ad55d85e3}, !- Handle misc plug loads schedule allday7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.43132045451134, !- Value Until Time 1 @@ -11756,7 +11754,7 @@ OS:Schedule:Day, {ca4687e4-5f89-47fb-8367-77e1c96a8246}, !- Handle misc plug loads schedule allday9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.434472613740412, !- Value Until Time 1 @@ -11844,7 +11842,7 @@ OS:Schedule:Day, {5f6781a8-2917-443c-8ab0-ccd0458c7b2e}, !- Handle misc plug loads schedule allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.520106272796866, !- Value Until Time 1 @@ -11932,7 +11930,7 @@ OS:Schedule:Day, {c8f31f53-41dd-48e8-92c7-4d15c0e603a3}, !- Handle misc plug loads schedule allday11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.51853019318233, !- Value Until Time 1 @@ -12020,7 +12018,7 @@ OS:Schedule:Day, {617150be-91fe-4934-8fcd-7696541c7f2f}, !- Handle misc plug loads schedule allday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.655649119646958, !- Value Until Time 1 @@ -12108,7 +12106,7 @@ OS:Schedule:Day, {457d9cf5-ef4a-473a-b3ce-1e7c49ceacfc}, !- Handle misc plug loads schedule off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.43132045451134, !- Value Until Time 1 @@ -12205,7 +12203,7 @@ OS:Schedule:Day, {27496142-1fa0-4e98-bf0d-79940748cf8d}, !- Handle misc plug loads schedule off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -12233,7 +12231,7 @@ OS:Schedule:Day, {ab01f002-8ed7-4d4d-bf3d-44fbda409c56}, !- Handle misc plug loads schedule off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -12337,7 +12335,7 @@ OS:Schedule:Day, {855708b9-fef7-4dfa-8c4b-320559f1c43e}, !- Handle Schedule Day 18, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -12365,7 +12363,7 @@ OS:Schedule:Day, {cb6f524d-eb61-45fc-832a-1580f6023dac}, !- Handle interior lighting schedule allday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.140909090909091, !- Value Until Time 1 @@ -12456,7 +12454,7 @@ OS:Schedule:Day, {35cf00fb-dbb5-402f-aafb-f8667c71dc6f}, !- Handle interior lighting schedule allday2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.139592004460888, !- Value Until Time 1 @@ -12547,7 +12545,7 @@ OS:Schedule:Day, {7523b5ba-f63f-48df-ab58-12164b8bad5a}, !- Handle interior lighting schedule allday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.135993657505285, !- Value Until Time 1 @@ -12638,7 +12636,7 @@ OS:Schedule:Day, {e1c06e17-ac30-4d06-99b8-caff32366079}, !- Handle interior lighting schedule allday4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.13107822410148, !- Value Until Time 1 @@ -12729,7 +12727,7 @@ OS:Schedule:Day, {f7dce36e-8c0d-449a-9d7d-56c6e2c2fe25}, !- Handle interior lighting schedule allday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.126162790697674, !- Value Until Time 1 @@ -12820,7 +12818,7 @@ OS:Schedule:Day, {ac1813f3-7449-469e-b332-5a1531eac0f1}, !- Handle interior lighting schedule allday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.122564443742072, !- Value Until Time 1 @@ -12911,7 +12909,7 @@ OS:Schedule:Day, {4354ee34-35a3-4fcb-8ead-06f47441d240}, !- Handle interior lighting schedule allday7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.121247357293869, !- Value Until Time 1 @@ -13002,7 +13000,7 @@ OS:Schedule:Day, {b5ffdf36-6a06-49ed-97b9-6ca1cd454186}, !- Handle interior lighting schedule allday8, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.122564443742072, !- Value Until Time 1 @@ -13093,7 +13091,7 @@ OS:Schedule:Day, {f0b95742-0038-4d16-a780-f86cd37dbe9e}, !- Handle interior lighting schedule allday9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.126162790697674, !- Value Until Time 1 @@ -13184,7 +13182,7 @@ OS:Schedule:Day, {4f7877cf-cb24-4b3e-8ee6-d78f3a74f79d}, !- Handle interior lighting schedule allday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.13107822410148, !- Value Until Time 1 @@ -13275,7 +13273,7 @@ OS:Schedule:Day, {4842eb8d-f3b8-4f89-8951-11456d4c6a44}, !- Handle interior lighting schedule allday11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.135993657505285, !- Value Until Time 1 @@ -13366,7 +13364,7 @@ OS:Schedule:Day, {07af607a-040e-4d1a-8587-b5d2c2edae6b}, !- Handle interior lighting schedule allday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.139592004460888, !- Value Until Time 1 @@ -13457,7 +13455,7 @@ OS:Schedule:Day, {9fbd8df9-82c1-446f-9ac0-d6fee3eb7666}, !- Handle interior lighting schedule off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.121247357293869, !- Value Until Time 1 @@ -13554,7 +13552,7 @@ OS:Schedule:Day, {fc1c1dc5-0d04-46cf-b851-03f88978cdfd}, !- Handle interior lighting schedule off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -13582,7 +13580,7 @@ OS:Schedule:Day, {03ee1db4-538a-494c-a15f-63f950c5e11e}, !- Handle interior lighting schedule off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -13687,7 +13685,7 @@ OS:Schedule:Day, {af642b09-fd20-4fcd-944a-5b9528735bf4}, !- Handle Schedule Day 19, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -13715,7 +13713,7 @@ OS:Schedule:Day, {1f008738-7844-4b96-8891-604766015214}, !- Handle exterior lighting schedule weekday1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.434958518013411, !- Value Until Time 1 @@ -13797,7 +13795,7 @@ OS:Schedule:Day, {2e3eedd8-d679-43dc-bbee-aba9247f1d45}, !- Handle exterior lighting schedule weekend1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.434958518013411, !- Value Until Time 1 @@ -13885,7 +13883,7 @@ OS:Schedule:Day, {8b555e37-4625-433b-afd3-badee3b007c1}, !- Handle exterior lighting schedule weekday2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.438095238095238, !- Value Until Time 1 @@ -13967,7 +13965,7 @@ OS:Schedule:Day, {80acc642-2fc5-4cdf-946b-74d5ae998743}, !- Handle exterior lighting schedule weekend2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.438095238095238, !- Value Until Time 1 @@ -14055,7 +14053,7 @@ OS:Schedule:Day, {05872444-4ec1-4828-9229-8aef9f070a1a}, !- Handle exterior lighting schedule weekday3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.346084782361632, !- Value Until Time 1 @@ -14137,7 +14135,7 @@ OS:Schedule:Day, {baeb4ef5-c456-4a8f-bdf1-88217c13af08}, !- Handle exterior lighting schedule weekend3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.346084782361632, !- Value Until Time 1 @@ -14225,7 +14223,7 @@ OS:Schedule:Day, {249897d2-a036-4093-b112-5dbcc3f28e0e}, !- Handle exterior lighting schedule weekday4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.344690684547486, !- Value Until Time 1 @@ -14307,7 +14305,7 @@ OS:Schedule:Day, {88258dd8-457f-4cae-af97-3b2f34233cf4}, !- Handle exterior lighting schedule weekend4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.344690684547486, !- Value Until Time 1 @@ -14395,7 +14393,7 @@ OS:Schedule:Day, {efe1f458-9864-464c-be45-6224e9996130}, !- Handle exterior lighting schedule weekday5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.346084782361632, !- Value Until Time 1 @@ -14477,7 +14475,7 @@ OS:Schedule:Day, {59095e53-b4c2-4863-89a4-f5a008047e8b}, !- Handle exterior lighting schedule weekend5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.346084782361632, !- Value Until Time 1 @@ -14565,7 +14563,7 @@ OS:Schedule:Day, {d7ee9341-87aa-47be-9898-02db1b37482f}, !- Handle exterior lighting schedule weekday6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.288229723074592, !- Value Until Time 1 @@ -14647,7 +14645,7 @@ OS:Schedule:Day, {280ae68d-4149-45c9-998c-27e966cd7b80}, !- Handle exterior lighting schedule weekend6, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.288229723074592, !- Value Until Time 1 @@ -14735,7 +14733,7 @@ OS:Schedule:Day, {bf1b2d45-d5b9-4907-acdb-ef576677fcd6}, !- Handle exterior lighting schedule weekday7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.286138576353373, !- Value Until Time 1 @@ -14817,7 +14815,7 @@ OS:Schedule:Day, {fd81906d-43a1-4a7b-8786-681f0ea28ffc}, !- Handle exterior lighting schedule weekend7, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.286138576353373, !- Value Until Time 1 @@ -14905,7 +14903,7 @@ OS:Schedule:Day, {a9672451-8c4a-4e6b-b05a-f04c8f2bc9d7}, !- Handle exterior lighting schedule weekday9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.288229723074592, !- Value Until Time 1 @@ -14987,7 +14985,7 @@ OS:Schedule:Day, {8e33caf8-631c-4ce7-a051-b801900d7d71}, !- Handle exterior lighting schedule weekend9, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.288229723074592, !- Value Until Time 1 @@ -15075,7 +15073,7 @@ OS:Schedule:Day, {65aa284b-65df-4d85-82e5-486411ce7e2c}, !- Handle exterior lighting schedule weekday10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.345039209001023, !- Value Until Time 1 @@ -15157,7 +15155,7 @@ OS:Schedule:Day, {16950acf-9668-47a1-9567-556fac96b395}, !- Handle exterior lighting schedule weekend10, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.345039209001023, !- Value Until Time 1 @@ -15245,7 +15243,7 @@ OS:Schedule:Day, {0af7b901-d8cb-4024-9083-6b6fd2320f89}, !- Handle exterior lighting schedule weekday11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.343993635640414, !- Value Until Time 1 @@ -15327,7 +15325,7 @@ OS:Schedule:Day, {e786663b-a5fb-4397-ac52-3d48eb215094}, !- Handle exterior lighting schedule weekend11, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.343993635640414, !- Value Until Time 1 @@ -15415,7 +15413,7 @@ OS:Schedule:Day, {9e10920d-8146-47af-914e-714a9a6973d0}, !- Handle exterior lighting schedule weekday12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 5, !- Hour 1 0, !- Minute 1 0.434958518013411, !- Value Until Time 1 @@ -15497,7 +15495,7 @@ OS:Schedule:Day, {9c41502d-09f6-4ac9-9232-559c10603fa1}, !- Handle exterior lighting schedule weekend12, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 2, !- Hour 1 0, !- Minute 1 0.434958518013411, !- Value Until Time 1 @@ -15585,7 +15583,7 @@ OS:Schedule:Day, {977bbd25-d278-4a0d-8945-da185a8bb96c}, !- Handle exterior lighting schedule off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.286138576353373, !- Value Until Time 1 @@ -15682,7 +15680,7 @@ OS:Schedule:Day, {02f92ece-baa3-42b4-a7b0-6e28ae3e9e6c}, !- Handle exterior lighting schedule off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -15710,7 +15708,7 @@ OS:Schedule:Day, {e7afcde6-cd57-4c3d-b0ae-62a91afcb6bd}, !- Handle exterior lighting schedule off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -16816,7 +16814,7 @@ OS:Schedule:Day, {97f1ab47-bd8e-482d-9f2d-54250952552d}, !- Handle Schedule Day 20, !- Name {17477fef-cf72-49db-8325-641f589ca97f}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -16844,7 +16842,7 @@ OS:Schedule:Day, {b34ee92d-2e16-40da-8711-a3dd7ad0a9de}, !- Handle natural vent avail schedule day, !- Name {17477fef-cf72-49db-8325-641f589ca97f}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 1; !- Value Until Time 1 @@ -17036,7 +17034,7 @@ OS:Schedule:Day, {8f5fb86a-979c-4cae-8c96-943a75d8b9b0}, !- Handle Schedule Day 21, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 1; !- Value Until Time 1 @@ -17064,7 +17062,7 @@ OS:Schedule:Day, {1b5e4501-2dc6-4871-bc4c-99d2472bd82a}, !- Handle mech vent house fan schedule off period0, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 1, !- Value Until Time 1 @@ -17161,7 +17159,7 @@ OS:Schedule:Day, {7366bf92-4a5a-4e82-8b71-a1688651fe9c}, !- Handle mech vent house fan schedule off period0 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -17189,7 +17187,7 @@ OS:Schedule:Day, {100afe19-2ac8-4a43-a418-0b88b8ba22db}, !- Handle mech vent house fan schedule off period0 2, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -17473,7 +17471,7 @@ OS:Schedule:Day, {ab9fbcfd-4f15-4f18-ac24-930b55579817}, !- Handle Schedule Day 22, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -17501,7 +17499,7 @@ OS:Schedule:Day, {a1930dcc-cdc4-4644-8454-db403ae3f213}, !- Handle clothes dryer allday1 1, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.123456790123457, !- Value Until Time 1 @@ -17595,7 +17593,7 @@ OS:Schedule:Day, {a9ca0955-ffd5-494d-88e0-beec014dc196}, !- Handle clothes dryer off period0 3, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0.123456790123457, !- Value Until Time 1 @@ -17692,7 +17690,7 @@ OS:Schedule:Day, {15b24bc6-69a9-4762-ab27-23bf3916a7c8}, !- Handle clothes dryer off period0 4, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 24, !- Hour 1 0, !- Minute 1 0; !- Value Until Time 1 @@ -17720,7 +17718,7 @@ OS:Schedule:Day, {f8bd3a4e-c4bd-47e4-b29b-1d75e6500ee6}, !- Handle clothes dryer off period0 5, !- Name {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name - , !- Interpolate to Timestep + No, !- Interpolate to Timestep 1, !- Hour 1 0, !- Minute 1 0, !- Value Until Time 1 @@ -17956,19 +17954,19 @@ OS:OutputControl:Files, Yes; !- Output Tarcog OS:Schedule:Constant, - {95cd08fa-41ff-4782-8e6a-48ac94ffb9d0}, !- Handle + {506c2c49-8208-43b9-92a3-882d9659f6ee}, !- Handle Work Efficiency Schedule, !- Name - {830801ce-faf9-42b2-b96a-536e6d58ba5e}, !- Schedule Type Limits Name + {19d4cbde-dc4f-4bc8-a2b5-dc7fb8650d80}, !- Schedule Type Limits Name 0; !- Value OS:Schedule:Constant, - {21e105c5-9e9f-4b4c-a55a-623124a87354}, !- Handle + {b7350b1c-afd8-4894-b2b0-cb064661db8d}, !- Handle Clothing Insulation Schedule, !- Name - {0dfb0a49-e6a1-4857-a605-6caec539135f}, !- Schedule Type Limits Name + {c2e186f3-6ef8-4d3e-aa8f-0bd7b041e157}, !- Schedule Type Limits Name 0.6; !- Value OS:ScheduleTypeLimits, - {0dfb0a49-e6a1-4857-a605-6caec539135f}, !- Handle + {c2e186f3-6ef8-4d3e-aa8f-0bd7b041e157}, !- Handle ClothingInsulation, !- Name 0, !- Lower Limit Value , !- Upper Limit Value @@ -17976,13 +17974,13 @@ OS:ScheduleTypeLimits, ClothingInsulation; !- Unit Type OS:Schedule:Constant, - {e9546a6f-18f7-45b0-84f8-59c62b99a68a}, !- Handle + {e0d9c0e0-6f5d-4e06-a6d5-b374db9a86e3}, !- Handle Air Velocity Schedule, !- Name - {6599fbae-d6ba-4560-9760-af1af9ad83ce}, !- Schedule Type Limits Name + {036db4c4-f210-4023-a969-6f2611cc0154}, !- Schedule Type Limits Name 0.1; !- Value OS:ScheduleTypeLimits, - {6599fbae-d6ba-4560-9760-af1af9ad83ce}, !- Handle + {036db4c4-f210-4023-a969-6f2611cc0154}, !- Handle Velocity, !- Name 0, !- Lower Limit Value , !- Upper Limit Value diff --git a/lib/measures/AdjustSystemEfficiencies/measure.xml b/lib/measures/AdjustSystemEfficiencies/measure.xml index c9e04b62..df8a0dcc 100644 --- a/lib/measures/AdjustSystemEfficiencies/measure.xml +++ b/lib/measures/AdjustSystemEfficiencies/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 adjust_system_efficiencies edeaff3d-3ae4-4487-b4a4-5cf08ea14510 - 7f77a08e-915b-4631-a3b4-1048dd87e545 - 20221115T223558Z + c1b9b6df-bd86-4d3b-b545-7c5e6577bc46 + 2024-07-11T14:32:02Z 4435983D AdjustSystemEfficiencies AdjustSystemEfficiencies @@ -47,10 +47,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -59,10 +59,10 @@ FA0C0477 - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -73,7 +73,7 @@ measure.rb rb script - 3F3FC5CA + 69995AED diff --git a/lib/measures/AdjustThermostatSetpointsByDegrees/measure.xml b/lib/measures/AdjustThermostatSetpointsByDegrees/measure.xml index fa4e5a9a..cd1a3c2c 100644 --- a/lib/measures/AdjustThermostatSetpointsByDegrees/measure.xml +++ b/lib/measures/AdjustThermostatSetpointsByDegrees/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 adjust_thermostat_setpoints_by_degrees 6e1f34f9-92e1-44ea-9279-de0b9b64f6a1 - eb95a2a5-8558-4862-a832-c30f31884641 - 20221115T223559Z + d53c0249-4b17-4979-8f31-ad4f80bcced0 + 2024-07-11T14:32:04Z 4F7846F2 AdjustThermostatSetpointsByDegrees Adjust Thermostat Setpoints by Degrees @@ -75,16 +75,16 @@ - seed_model.osm - osm - test - 01DC9D8F + LICENSE.md + md + license + BFFB1AA6 - ThermostatTestModel.osm - osm - test - 508ECE85 + README.md + md + readme + DDCB3166 README.md.erb @@ -92,12 +92,6 @@ readmeerb 703C9964 - - README.md - md - readme - DDCB3166 - OpenStudio @@ -107,19 +101,25 @@ measure.rb rb script - D7609A7B + 14C584F1 AdjustThermostatSetpointsByDegrees_Test.rb rb test - 38557326 + 05E313CE - LICENSE.md - md - license - 64FFEBDE + ThermostatTestModel.osm + osm + test + 508ECE85 + + + seed_model.osm + osm + test + 01DC9D8F diff --git a/lib/measures/ChangeBuildingLocation/README.md b/lib/measures/ChangeBuildingLocation/README.md index 7324efa0..63aeb587 100644 --- a/lib/measures/ChangeBuildingLocation/README.md +++ b/lib/measures/ChangeBuildingLocation/README.md @@ -39,7 +39,7 @@ Name of the weather file to change to. This is the filename with the extension ( **Model Dependent:** false -**Choice Display Names** ["Lookup From Stat File", "ASHRAE 169-2013-1A", "ASHRAE 169-2013-1B", "ASHRAE 169-2013-2A", "ASHRAE 169-2013-2B", "ASHRAE 169-2013-3A", "ASHRAE 169-2013-3B", "ASHRAE 169-2013-3C", "ASHRAE 169-2013-4A", "ASHRAE 169-2013-4B", "ASHRAE 169-2013-4C", "ASHRAE 169-2013-5A", "ASHRAE 169-2013-5B", "ASHRAE 169-2013-5C", "ASHRAE 169-2013-6A", "ASHRAE 169-2013-6B", "ASHRAE 169-2013-7A", "ASHRAE 169-2013-8A", "CEC T24-CEC1", "CEC T24-CEC2", "CEC T24-CEC3", "CEC T24-CEC4", "CEC T24-CEC5", "CEC T24-CEC6", "CEC T24-CEC7", "CEC T24-CEC8", "CEC T24-CEC9", "CEC T24-CEC10", "CEC T24-CEC11", "CEC T24-CEC12", "CEC T24-CEC13", "CEC T24-CEC14", "CEC T24-CEC15", "CEC T24-CEC16"] +**Choice Display Names** ["ASHRAE 169-2013-1A", "ASHRAE 169-2013-1B", "ASHRAE 169-2013-2A", "ASHRAE 169-2013-2B", "ASHRAE 169-2013-3A", "ASHRAE 169-2013-3B", "ASHRAE 169-2013-3C", "ASHRAE 169-2013-4A", "ASHRAE 169-2013-4B", "ASHRAE 169-2013-4C", "ASHRAE 169-2013-5A", "ASHRAE 169-2013-5B", "ASHRAE 169-2013-5C", "ASHRAE 169-2013-6A", "ASHRAE 169-2013-6B", "ASHRAE 169-2013-7A", "ASHRAE 169-2013-8A", "CEC T24-CEC1", "CEC T24-CEC2", "CEC T24-CEC3", "CEC T24-CEC4", "CEC T24-CEC5", "CEC T24-CEC6", "CEC T24-CEC7", "CEC T24-CEC8", "CEC T24-CEC9", "CEC T24-CEC10", "CEC T24-CEC11", "CEC T24-CEC12", "CEC T24-CEC13", "CEC T24-CEC14", "CEC T24-CEC15", "CEC T24-CEC16", "Lookup From Stat File"] diff --git a/lib/measures/ChangeBuildingLocation/measure.rb b/lib/measures/ChangeBuildingLocation/measure.rb index c0509981..7933a0ea 100644 --- a/lib/measures/ChangeBuildingLocation/measure.rb +++ b/lib/measures/ChangeBuildingLocation/measure.rb @@ -6,17 +6,9 @@ # Authors : Nicholas Long, David Goldwasser # Simple measure to load the EPW file and DDY file -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' -require 'openstudio/extension/core/os_lib_model_generation.rb' - class ChangeBuildingLocation < OpenStudio::Measure::ModelMeasure Dir[File.dirname(__FILE__) + '/resources/*.rb'].each { |file| require file } - - # resource file modules - include OsLib_HelperMethods - include OsLib_ModelGeneration + require 'openstudio-standards' # define the name that a user will see, this method may be deprecated as # the display name in PAT comes from the name field in measure.xml @@ -34,10 +26,11 @@ def arguments(model) args << weather_file_name # make choice argument for climate zone - choices = OpenStudio::StringVector.new + #choices = OpenStudio::StringVector.new + choices = OpenstudioStandards::CreateTypical.get_climate_zones choices << 'Lookup From Stat File' - climate_zone = OpenStudio::Measure::OSArgument.makeChoiceArgument('climate_zone', get_climate_zones(false, 'Lookup From Stat File'), true) + climate_zone = OpenStudio::Measure::OSArgument.makeChoiceArgument('climate_zone', choices, true) climate_zone.setDisplayName('Climate Zone.') climate_zone.setDefaultValue('Lookup From Stat File') args << climate_zone @@ -74,14 +67,16 @@ def run(model, runner, user_arguments) super(model, runner, user_arguments) # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model)) + args = runner.getArgumentValues(arguments(model), user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] if !args then return false end # lookup and replace argument values from upstream measures if args['use_upstream_args'] == true args.each do |arg, value| next if arg == 'use_upstream_args' # this argument should not be changed - value_from_osw = OsLib_HelperMethods.check_upstream_measure_for_arg(runner, arg) + value_from_osw = runner.getPastStepValuesForName(arg) + value_from_osw = value_from_osw.collect{ |k, v| Hash[:measure_name => k, :value => v] }.first if !value_from_osw.empty? if !value_from_osw.empty? runner.registerInfo("Replacing argument named #{arg} from current measure with a value of #{value_from_osw[:value]} from #{value_from_osw[:measure_name]}.") new_val = value_from_osw[:value] diff --git a/lib/measures/ChangeBuildingLocation/measure.xml b/lib/measures/ChangeBuildingLocation/measure.xml index 81245443..91d7b469 100644 --- a/lib/measures/ChangeBuildingLocation/measure.xml +++ b/lib/measures/ChangeBuildingLocation/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 change_building_location d4db4971-f5ba-11e3-a3ac-0800200c9a66 - 946ae086-8c8e-4aa7-9d53-f482ba39d7a5 - 20221115T223606Z + 746afe91-d190-49c5-9534-26416d0bc55a + 2024-07-11T14:32:10Z 057E8D9D ChangeBuildingLocation ChangeBuildingLocation @@ -27,10 +27,6 @@ false Lookup From Stat File - - Lookup From Stat File - Lookup From Stat File - ASHRAE 169-2013-1A ASHRAE 169-2013-1A @@ -163,6 +159,10 @@ CEC T24-CEC16 CEC T24-CEC16 + + Lookup From Stat File + Lookup From Stat File + @@ -236,64 +236,99 @@ - another_weather_file.ddy + LICENSE.md + md + license + BFFB1AA6 + + + README.md + md + readme + 7309F88E + + + README.md.erb + erb + readmeerb + 232D0477 + + + + OpenStudio + 2.0.0 + 3.8.0 + + measure.rb + rb + script + 5EF937BC + + + epw.rb + rb + resource + 27FA10AC + + + stat_file.rb + rb + resource + 9C3DAF73 + + + CA_LOS-ANGELES-IAP_722950S_12.ddy ddy test - D6178C51 + 6664A3D4 - another_weather_file.epw + CA_LOS-ANGELES-IAP_722950S_12.epw epw test - D3B7E25B + E8072B82 - another_weather_file.stat + CA_LOS-ANGELES-IAP_722950S_12.stat stat test - E8C83421 - - - model_test.osm - osm - test - 0B8479BC + 12BCA842 - USA_MA_Boston-Logan.Intl.AP.725090_TMY3.ddy + USA_MA_Boston-Logan.Intl.AP.725090_AMY.ddy ddy test E4CBEAF0 - USA_MA_Boston-Logan.Intl.AP.725090_TMY3.epw + USA_MA_Boston-Logan.Intl.AP.725090_AMY.epw epw test B65824C3 - USA_MA_Boston-Logan.Intl.AP.725090_TMY3.stat + USA_MA_Boston-Logan.Intl.AP.725090_AMY.stat stat test 8657DDB9 - multiyear.ddy + USA_MA_Boston-Logan.Intl.AP.725090_TMY3.ddy ddy test - D6178C51 + E4CBEAF0 - multiyear.epw + USA_MA_Boston-Logan.Intl.AP.725090_TMY3.epw epw test - F0A18702 + B65824C3 - multiyear.stat + USA_MA_Boston-Logan.Intl.AP.725090_TMY3.stat stat test - E715E1B9 + 8657DDB9 USA_WA_Renton.Muni.AP.727934_TMY3.ddy @@ -314,52 +349,40 @@ 7C51425E - model_test.osw - osw - test - F5FABCCF - - - README.md.erb - erb - readmeerb - 232D0477 - - - CA_LOS-ANGELES-IAP_722950S_12.ddy + another_weather_file.ddy ddy test - 6664A3D4 + D6178C51 - CA_LOS-ANGELES-IAP_722950S_12.epw + another_weather_file.epw epw test - E8072B82 + D3B7E25B - CA_LOS-ANGELES-IAP_722950S_12.stat + another_weather_file.stat stat test - 12BCA842 + E8C83421 - USA_MA_Boston-Logan.Intl.AP.725090_AMY.ddy - ddy + change_building_location_test.rb + rb test - E4CBEAF0 + 8C3A6D8B - USA_MA_Boston-Logan.Intl.AP.725090_AMY.epw - epw + model_test.osm + osm test - B65824C3 + 0B8479BC - USA_MA_Boston-Logan.Intl.AP.725090_AMY.stat - stat + model_test.osw + osw test - 8657DDB9 + F5FABCCF model_test_with_epw.osm @@ -368,45 +391,22 @@ D1551F9A - README.md - md - readme - D6556B8E - - - LICENSE.md - md - license - 64FFEBDE - - - stat_file.rb - rb - resource - 22D1FE2F - - - epw.rb - rb - resource - 95B8F1F7 + multiyear.ddy + ddy + test + D6178C51 - change_building_location_test.rb - rb + multiyear.epw + epw test - B7124724 + F0A18702 - - OpenStudio - 2.0.0 - 3.0.0 - - measure.rb - rb - script - 2753B0E4 + multiyear.stat + stat + test + E715E1B9 diff --git a/lib/measures/EnableIdealAirLoadsForAllZones/measure.xml b/lib/measures/EnableIdealAirLoadsForAllZones/measure.xml index 3598e0ae..235ee574 100644 --- a/lib/measures/EnableIdealAirLoadsForAllZones/measure.xml +++ b/lib/measures/EnableIdealAirLoadsForAllZones/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 enable_ideal_air_loads_for_all_zones f70d4a3d-8b93-4fef-b679-858fe1e05acc - 44e602b6-9df8-4995-818d-56bff2bceb00 - 20221115T223603Z + 3284623f-843f-4286-826d-219bcb457ee8 + 2024-07-11T14:32:07Z 4435983D EnableIdealAirLoadsForAllZones EnableIdealAirLoadsForAllZones @@ -30,16 +30,10 @@ - IdealAir_TestModel.osm - osm - test - CF7E3DB7 - - - README.md.erb - erb - readmeerb - 232D0477 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -48,10 +42,10 @@ 99E5F2C0 - EnableIdealAirLoadsForAllZones_Test.rb - rb - test - A986CBE0 + README.md.erb + erb + readmeerb + 232D0477 @@ -62,13 +56,19 @@ measure.rb rb script - F6911372 + 24DA507D - LICENSE.md - md - license - 64FFEBDE + EnableIdealAirLoadsForAllZones_Test.rb + rb + test + FC169E73 + + + IdealAir_TestModel.osm + osm + test + CF7E3DB7 diff --git a/lib/measures/ExportScheduleCSV/measure.xml b/lib/measures/ExportScheduleCSV/measure.xml index c80131ee..ea0178f8 100644 --- a/lib/measures/ExportScheduleCSV/measure.xml +++ b/lib/measures/ExportScheduleCSV/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 export_schedule_csv 6fc1a46d-4912-47af-8ace-a7c453fbe363 - ca8d5ad7-4b0b-460c-b16f-99317305d0f8 - 20221115T223604Z + 5a8d134c-3008-49ab-a2f4-f4a614f22371 + 2024-07-11T14:32:08Z 2C8A3EEF ExportScheduleCSV ExportScheduleCSV @@ -39,16 +39,16 @@ - ExampleModel.osm - osm - test - 6EBB9908 + LICENSE.md + md + license + BFFB1AA6 - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 + README.md + md + readme + 6F5139DD README.md.erb @@ -57,33 +57,33 @@ 703C9964 - README.md - md - readme - 6F5139DD + + OpenStudio + 2.0.0 + 2.0.0 + + measure.rb + rb + script + 57C4F21B - LICENSE.md - md - license - 64FFEBDE + ExampleModel.osm + osm + test + 6EBB9908 ExportScheduleCSV_Test.rb rb test - 9EE1AB45 + D467AE10 - - OpenStudio - 2.0.0 - 2.0.0 - - measure.rb - rb - script - 44168D6E + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 diff --git a/lib/measures/ImportEnvelopeAndInternalLoadsFromIdf/measure.xml b/lib/measures/ImportEnvelopeAndInternalLoadsFromIdf/measure.xml index 4e903edf..3c42a38f 100644 --- a/lib/measures/ImportEnvelopeAndInternalLoadsFromIdf/measure.xml +++ b/lib/measures/ImportEnvelopeAndInternalLoadsFromIdf/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 import_envelope_and_internal_loads_from_idf 10a3ffb4-de25-4cb3-87ff-5922219716f9 - 857716a2-080e-45e1-b202-cd85c6c637ec - 20221115T223549Z + c0e675d5-d39e-44e2-ab33-e6eeb0552880 + 2024-07-11T14:31:57Z 45097B60 ImportEnvelopeAndInternalLoadsFromIdf ImportEnvelopeAndInternalLoadsFromIdf @@ -57,22 +57,16 @@ - RefBldgLargeHotelNew2004_Chicago.idf - idf - test - DED4B3CA - - - ExtLightsAndShading.idf - idf - test - 5AC6FC9B + LICENSE.md + md + license + BFFB1AA6 - measure_test.osw - osw - test - F5FABCCF + README.md + md + readme + F5E34925 README.md.erb @@ -80,12 +74,6 @@ readmeerb 703C9964 - - README.md - md - readme - F5E34925 - OpenStudio @@ -95,19 +83,31 @@ measure.rb rb script - 2FEB9F38 + 3BC0F8F5 - LICENSE.md - md - license - 64FFEBDE + ExtLightsAndShading.idf + idf + test + 5AC6FC9B ImportEnvelopeAndInternalLoadsFromIdf_Test.rb rb test - 1E81C398 + 3EA0317D + + + RefBldgLargeHotelNew2004_Chicago.idf + idf + test + DED4B3CA + + + measure_test.osw + osw + test + F5FABCCF diff --git a/lib/measures/MeterFlodPlot/measure.xml b/lib/measures/MeterFlodPlot/measure.xml index cc52b479..cd746e5e 100644 --- a/lib/measures/MeterFlodPlot/measure.xml +++ b/lib/measures/MeterFlodPlot/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 meter_flood_plot 62940b95-409c-46a7-9328-d3d162b9ee50 - 4fe51e3d-4435-4dce-8f1c-23c07440df29 - 20221115T223608Z + 10494c5c-8e91-4cc0-ba90-17678259ad9b + 2024-07-11T14:32:11Z 2C8A3EEF MeterFloodPlot MeterFloodPlot @@ -39,22 +39,16 @@ - ExampleModel.osm - osm - test - 4D4C61B5 - - - report.html.in - in - resource - CBF4B218 + LICENSE.md + md + license + BFFB1AA6 - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 + README.md + md + readme + C55B841A README.md.erb @@ -63,33 +57,39 @@ 703C9964 - README.md - md - readme - C55B841A + + OpenStudio + 2.0.0 + 2.0.0 + + measure.rb + rb + script + BDBF31EE - LICENSE.md - md - license - 64FFEBDE + report.html.in + in + resource + CBF4B218 + + + ExampleModel.osm + osm + test + 4D4C61B5 MeterFloodPlot_Test.rb rb test - 0986337F + 009C9E2C - - OpenStudio - 2.0.0 - 2.0.0 - - measure.rb - rb - script - 78EFBA10 + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 diff --git a/lib/measures/ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects/measure.xml b/lib/measures/ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects/measure.xml index b4afb731..61292835 100644 --- a/lib/measures/ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects/measure.xml +++ b/lib/measures/ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 modify_energyplus_coil_cooling_dx_single_speed_objects b224bd36-213e-4b0e-b3fe-70371e04533d - 77b55466-153a-49ad-829b-a39dee6d018b - 20221115T223556Z + a14e96a3-e1b8-42b3-bc36-d41f6b446aae + 2024-07-11T14:32:01Z C7ED76C0 ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects @@ -73,16 +73,10 @@ - Test.osm - osm - test - BCF2DBB8 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -91,16 +85,10 @@ 8B12BFCE - ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects_Test.rb - rb - test - B106105F - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -111,7 +99,19 @@ measure.rb rb script - 9CF6D8FF + 24FFD147 + + + ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects_Test.rb + rb + test + 5D35182D + + + Test.osm + osm + test + BCF2DBB8 diff --git a/lib/measures/ModifyEnergyPlusFanVariableVolumeObjects/measure.xml b/lib/measures/ModifyEnergyPlusFanVariableVolumeObjects/measure.xml index d1ee7ad6..3a1c737d 100644 --- a/lib/measures/ModifyEnergyPlusFanVariableVolumeObjects/measure.xml +++ b/lib/measures/ModifyEnergyPlusFanVariableVolumeObjects/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 modify_energyplus_fan_variable_volume_objects 009fe4eb-be72-4803-ac84-471ebe2c4c21 - b8925399-d370-40c3-8e97-843ae4b0daf8 - 20221115T223602Z + 60d1f2e0-fdbf-47fc-bc89-849bd2c08020 + 2024-07-11T14:32:06Z D8794EFE ModifyEnergyPlusFanVariableVolumeObjects ModifyEnergyPlusFanVariableVolumeObjects @@ -45,16 +45,10 @@ - Test.osm - osm - test - BCF2DBB8 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -63,16 +57,10 @@ E3BA65D6 - ModifyEnergyPlusFanVariableVolumeObjects_Test.rb - rb - test - AFBEB9E3 - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -83,7 +71,19 @@ measure.rb rb script - E40C5BBB + D39F4516 + + + ModifyEnergyPlusFanVariableVolumeObjects_Test.rb + rb + test + 2679B778 + + + Test.osm + osm + test + BCF2DBB8 diff --git a/lib/measures/PredictedMeanVote/measure.xml b/lib/measures/PredictedMeanVote/measure.xml index 26055281..11cae481 100644 --- a/lib/measures/PredictedMeanVote/measure.xml +++ b/lib/measures/PredictedMeanVote/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 predicted_mean_vote 11cd3144-dac6-4f64-90e4-b8804c6bfc5e - 8c8eafc6-8eea-482a-b9af-e84639eefd22 - 20221115T223608Z + 7cdac9cc-f495-48c3-b785-ba9ebbd43c84 + 2024-07-11T14:32:11Z 0CA4D54C PredictedMeanVote Predicted Mean Vote @@ -133,16 +133,16 @@ - PMV_Exercise6PlusNewSchedules.osm - osm - test - 834E052E + LICENSE.md + md + license + BFFB1AA6 - PMV_Exercise6PlusNewSchedulesIdealAir.osm - osm - test - 88395709 + README.md + md + readme + C2BA306D README.md.erb @@ -150,12 +150,6 @@ readmeerb 703C9964 - - README.md - md - readme - C2BA306D - OpenStudio @@ -165,19 +159,25 @@ measure.rb rb script - A69BAB0E + 1ED2F705 - LICENSE.md - md - license - 64FFEBDE + PMV_Exercise6PlusNewSchedules.osm + osm + test + 834E052E + + + PMV_Exercise6PlusNewSchedulesIdealAir.osm + osm + test + 88395709 PredictedMeanVote_Test.rb rb test - 62708ABD + 45D42BF7 diff --git a/lib/measures/RemoveInternalLoadsDirectlyAssignedToSpaces/measure.xml b/lib/measures/RemoveInternalLoadsDirectlyAssignedToSpaces/measure.xml index 71e27c96..dcaca73b 100644 --- a/lib/measures/RemoveInternalLoadsDirectlyAssignedToSpaces/measure.xml +++ b/lib/measures/RemoveInternalLoadsDirectlyAssignedToSpaces/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 remove_internal_loads_directly_assigned_to_spaces 019999e0-3e0c-4a77-abbf-a3352de12384 - 7f3775f8-71ef-48fe-97d5-fa0fdc123897 - 20221115T223556Z + cdb00200-b4f7-4057-b230-a0430fd92fae + 2024-07-11T14:32:00Z 057E8D9D RemoveInternalLoadsDirectlyAssignedToSpaces RemoveInternalLoadsDirectlyAssignedToSpaces @@ -30,16 +30,10 @@ - ImportedIdf_TestModel.osm - osm - test - C9C6BBB8 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -47,6 +41,12 @@ readme C53C5996 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -56,19 +56,19 @@ measure.rb rb script - 41A3852C + DB0BDBF8 - RemoveInternalLoadsDirectlyAssignedToSpaces_Test.rb - rb + ImportedIdf_TestModel.osm + osm test - 69B36EF0 + C9C6BBB8 - LICENSE.md - md - license - 64FFEBDE + RemoveInternalLoadsDirectlyAssignedToSpaces_Test.rb + rb + test + 50551D9D diff --git a/lib/measures/RemoveUnusedDefaultProfiles/measure.xml b/lib/measures/RemoveUnusedDefaultProfiles/measure.xml index c8bdad83..a5000698 100644 --- a/lib/measures/RemoveUnusedDefaultProfiles/measure.xml +++ b/lib/measures/RemoveUnusedDefaultProfiles/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 remove_unused_default_profiles 8abcdf38-c391-465a-8fb8-b243aa4f0b06 - f5b7e661-a4da-4ab5-bcf1-d092c7aade8d - 20221115T223556Z + c8cf8fcd-9671-4976-b6fa-6d033599cb6c + 2024-07-11T14:32:01Z B6CD1F98 RemoveUnusedDefaultProfiles RemoveUnusedDefaultProfiles @@ -40,16 +40,10 @@ - ScheduleCleanup_TestModel.osm - osm - test - E1E75C42 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -57,6 +51,12 @@ readme 4403A4C3 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -66,19 +66,19 @@ measure.rb rb script - 36CBB8CE + A25450BF RemoveUnusedDefaultProfiles_Test.rb rb test - 9A301172 + 7903E7D1 - LICENSE.md - md - license - 64FFEBDE + ScheduleCleanup_TestModel.osm + osm + test + E1E75C42 diff --git a/lib/measures/ReplaceExteriorWindowConstruction/measure.xml b/lib/measures/ReplaceExteriorWindowConstruction/measure.xml index 64d212c1..ebe763aa 100644 --- a/lib/measures/ReplaceExteriorWindowConstruction/measure.xml +++ b/lib/measures/ReplaceExteriorWindowConstruction/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 replace_exterior_window_construction 95116deb-0716-4cdc-af27-09c463befc7c - bb79400e-c308-442f-bd56-52e1238b4cd0 - 20221115T223608Z + 91ef97e1-ec9e-4f25-bc3a-4a0374375bbf + 2024-07-11T14:32:11Z 6DE831F7 ReplaceExteriorWindowConstruction Replace Exterior Window Constructions with a Different Construction from the Model. @@ -186,22 +186,16 @@ For costs added as part of a design alternatives "Years Until Costs Start? is ty - EnvelopeAndLoadTestModel_01.osm - osm - test - 10AA8866 - - - ReverseTranslatedModel.osm - osm - test - 0B94403D + LICENSE.md + md + license + BFFB1AA6 - EnvelopeAndLoadTestModel_01Costed.osm - osm - test - 40BB59D1 + README.md + md + readme + CA45F32D README.md.erb @@ -209,12 +203,6 @@ For costs added as part of a design alternatives "Years Until Costs Start? is ty readmeerb 703C9964 - - README.md - md - readme - CA45F32D - OpenStudio @@ -224,19 +212,31 @@ For costs added as part of a design alternatives "Years Until Costs Start? is ty measure.rb rb script - 02D95F25 + 45DA1672 + + + EnvelopeAndLoadTestModel_01.osm + osm + test + 10AA8866 + + + EnvelopeAndLoadTestModel_01Costed.osm + osm + test + 40BB59D1 ReplaceExteriorWindowConstruction_Test.rb rb test - E1F8556C + A573E976 - LICENSE.md - md - license - 64FFEBDE + ReverseTranslatedModel.osm + osm + test + 0B94403D diff --git a/lib/measures/ReplaceModel/README.md b/lib/measures/ReplaceModel/README.md index 62e3461b..4b1feced 100644 --- a/lib/measures/ReplaceModel/README.md +++ b/lib/measures/ReplaceModel/README.md @@ -20,8 +20,7 @@ ModelMeasure ### External OSM File Name -Name of the model to replace current model. This is the filename with the extension (e.g. MyModel.osm). Optionally this can inclucde the full file path, but for most use cases should just be file name. - +Name of the model to replalace current model. This is the filename with the extension (e.g. MyModel.osm). Optionally this can inclucde the full file path, but for most use cases should just be file name. **Name:** external_model_name, **Type:** String, **Units:** , @@ -31,4 +30,3 @@ Name of the model to replace current model. This is the filename with the extens - diff --git a/lib/measures/ReplaceModel/measure.xml b/lib/measures/ReplaceModel/measure.xml index 1fcdddb8..2012334e 100644 --- a/lib/measures/ReplaceModel/measure.xml +++ b/lib/measures/ReplaceModel/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 replace_model 54f03343-5b5c-42f4-818c-5e6de6ded489 - 7ab0e620-5411-481e-93b2-83768245a28c - 20230607T052233Z + d16e4a8f-cb31-49a6-9b8a-57ba444241fa + 2024-07-11T14:32:10Z 057E8D9D ReplaceModel Replace OpenStudio Model @@ -14,7 +14,7 @@ external_model_name External OSM File Name - Name of the model to replace current model. This is the filename with the extension (e.g. MyModel.osm). Optionally this can inclucde the full file path, but for most use cases should just be file name. + Name of the model to replalace current model. This is the filename with the extension (e.g. MyModel.osm). Optionally this can inclucde the full file path, but for most use cases should just be file name. String true false @@ -39,16 +39,22 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - 6616E1BE + LICENSE.md + md + license + BFFB1AA6 - test.osw - osw - test - F5FABCCF + README.md + md + readme + 3E7AEAB6 + + + README.md.erb + erb + readmeerb + 703C9964 @@ -59,13 +65,25 @@ measure.rb rb script - 15A137A6 + 1327E71E + + + EnvelopeAndLoadTestModel_01.osm + osm + test + 6616E1BE ReplaceModel_Test.rb rb test - AA8EB3EB + B418CC92 + + + test.osw + osw + test + F5FABCCF diff --git a/lib/measures/ReplaceThermostatSchedules/measure.xml b/lib/measures/ReplaceThermostatSchedules/measure.xml index 647f65fb..45aeaad3 100644 --- a/lib/measures/ReplaceThermostatSchedules/measure.xml +++ b/lib/measures/ReplaceThermostatSchedules/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 replace_thermostat_schedules 7e6da001-30f2-419c-bfc0-2f96ba2115cb - 89d9d3af-9cdd-40d6-afb5-190a2ab57c50 - 20221115T223610Z + 260ebf84-d91c-4861-b5f0-4a47a0821c08 + 2024-07-11T14:32:14Z 4F7846F2 ReplaceThermostatSchedules Replace Thermostat Schedules @@ -17,10 +17,10 @@ Choice true false - {de4a5938-8864-44fd-8dc3-b85e56b79112} + {bf97efc3-79f7-4b8b-8b25-e8b6c8e7f5c1} - {de4a5938-8864-44fd-8dc3-b85e56b79112} + {bf97efc3-79f7-4b8b-8b25-e8b6c8e7f5c1} *All Thermal Zones* @@ -91,10 +91,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -102,6 +102,12 @@ readme 7ECBC1DB + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -111,19 +117,13 @@ measure.rb rb script - D15EBA1A - - - LICENSE.md - md - license - 64FFEBDE + 62FAE26F ReplaceThermostatSchedules_Test.rb rb test - 08EBDF1B + 0A1A19D8 diff --git a/lib/measures/ReportModelChanges/measure.xml b/lib/measures/ReportModelChanges/measure.xml index 5f87ba6b..072159c7 100644 --- a/lib/measures/ReportModelChanges/measure.xml +++ b/lib/measures/ReportModelChanges/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 report_model_changes 6d66b426-908f-4528-9fe5-523b9d2f49c5 - fd4583cb-843b-45ee-965c-d3d5816fc826 - 20230607T052232Z + 53950a14-e3d9-48c3-b879-e5a2c80071b3 + 2024-07-11T14:32:02Z 1E1F8B97 ReportModelChanges ReportModelChanges @@ -38,16 +38,16 @@ - MidriseApartment.osm - osm - test - B05AFC75 + LICENSE.md + md + license + BFFB1AA6 - MidriseApartment2.osm - osm - test - 064FE67D + README.md + md + readme + 6670A756 README.md.erb @@ -55,12 +55,6 @@ readmeerb 703C9964 - - README.md - md - readme - 6670A756 - OpenStudio @@ -70,19 +64,25 @@ measure.rb rb script - B56A3AC0 + 6874D3BA - LICENSE.md - md - license - 64FFEBDE + MidriseApartment.osm + osm + test + B05AFC75 + + + MidriseApartment2.osm + osm + test + 064FE67D ReportModelChanges_Test.rb rb test - 982B2BDC + E1F88956 diff --git a/lib/measures/RunPeriod/measure.xml b/lib/measures/RunPeriod/measure.xml index f7123d89..f22a03c6 100644 --- a/lib/measures/RunPeriod/measure.xml +++ b/lib/measures/RunPeriod/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 run_period 6da969e0-4256-49bf-9607-26504cc3d321 - 4f3cd565-8b1f-445e-863e-08233b390197 - 20221115T223609Z + 0a683159-5299-451e-8f4b-98bf19d50586 + 2024-07-11T14:32:12Z 057E8D9D RunPeriod Set Run Period Object @@ -93,10 +93,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -104,6 +104,12 @@ readme 31467068 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -113,13 +119,7 @@ measure.rb rb script - 10C1978C - - - LICENSE.md - md - license - 64FFEBDE + E43AD9D8 diff --git a/lib/measures/RunPeriodMultiple/measure.xml b/lib/measures/RunPeriodMultiple/measure.xml index 57262fd9..5674a2da 100644 --- a/lib/measures/RunPeriodMultiple/measure.xml +++ b/lib/measures/RunPeriodMultiple/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 run_period_multiple 100a5eba-0442-42cb-bdf1-9cf75e102f71 - 67d5da8b-2476-48a9-b987-f7e3caf0617b - 20221115T223606Z + 9e401ed2-e8ce-4a5d-994e-b0ac6716f809 + 2024-07-11T14:32:09Z 87C4F8A7 RunPeriodMultiple Set Multiple Run Period Object @@ -71,10 +71,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -83,10 +83,10 @@ 1CF1E24C - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -97,7 +97,7 @@ measure.rb rb script - 7974EF1A + B42E6FBE diff --git a/lib/measures/ServerDirectoryCleanup/measure.xml b/lib/measures/ServerDirectoryCleanup/measure.xml index 7a2fa662..3ea1ffb1 100644 --- a/lib/measures/ServerDirectoryCleanup/measure.xml +++ b/lib/measures/ServerDirectoryCleanup/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 server_directory_cleanup ec7d04ad-0b7b-495b-825a-e1b6d28d1d3f - d77ddec0-1542-42cf-be4e-42203351027b - 20221115T223556Z + d4c7557d-56bd-43bc-842b-df4c9d687338 + 2024-07-11T14:32:00Z 5BFE84C4 ServerDirectoryCleanup Server Directory Cleanup @@ -247,22 +247,10 @@ - example_model.osm - osm - test - 39B6E26C - - - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -271,16 +259,10 @@ 4910D396 - LICENSE.md - md - license - 64FFEBDE - - - ServerDirectoryCleanup_test.rb - rb - test - 687ADAF4 + README.md.erb + erb + readmeerb + 703C9964 @@ -291,7 +273,25 @@ measure.rb rb script - CE714E8E + D359866E + + + ServerDirectoryCleanup_test.rb + rb + test + 6E655440 + + + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 + + + example_model.osm + osm + test + 39B6E26C diff --git a/lib/measures/SetCOPforSingleSpeedDXCoolingUnits/measure.xml b/lib/measures/SetCOPforSingleSpeedDXCoolingUnits/measure.xml index c473b9bf..e755907a 100644 --- a/lib/measures/SetCOPforSingleSpeedDXCoolingUnits/measure.xml +++ b/lib/measures/SetCOPforSingleSpeedDXCoolingUnits/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_co_pfor_single_speed_dx_cooling_units a4a7297e-8314-4df7-86b5-bec18cdd0a3a - 669cf3e7-6b07-4bb3-8b03-8d3d7110de08 - 20221115T223607Z + ecc52a39-09b3-4704-aea6-0e1e03dc7c7f + 2024-07-11T14:32:10Z 9E2537CD SetCOPforSingleSpeedDXCoolingUnits Set COP for Single Speed DX Cooling Units @@ -17,10 +17,10 @@ Choice true false - {3d9c6cf3-bccd-4c66-a172-ac03910e8b07} + {f0734103-166d-437f-9b61-2c7eb6bca96f} - {3d9c6cf3-bccd-4c66-a172-ac03910e8b07} + {f0734103-166d-437f-9b61-2c7eb6bca96f} *All Air Loops* @@ -137,16 +137,10 @@ - 0320_ModelWithHVAC_01.osm - osm - test - 049F3417 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -154,6 +148,12 @@ readme 61EB7DEE + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -163,19 +163,19 @@ measure.rb rb script - 92FBD7CE + BE5CE2B0 - SetCOPforSingleSpeedDXCoolingUnits_Test.rb - rb + 0320_ModelWithHVAC_01.osm + osm test - 22001715 + 049F3417 - LICENSE.md - md - license - 64FFEBDE + SetCOPforSingleSpeedDXCoolingUnits_Test.rb + rb + test + F0149C98 diff --git a/lib/measures/SetCOPforTwoSpeedDXCoolingUnits/measure.xml b/lib/measures/SetCOPforTwoSpeedDXCoolingUnits/measure.xml index 2b74c127..6bff430f 100644 --- a/lib/measures/SetCOPforTwoSpeedDXCoolingUnits/measure.xml +++ b/lib/measures/SetCOPforTwoSpeedDXCoolingUnits/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_co_pfor_two_speed_dx_cooling_units f5a8d60a-e60f-4097-99c3-28bfda3f29a3 - 7090eefa-f84e-412f-b323-ee1f88528f8e - 20221115T223549Z + 7d428cb8-87cb-4af1-be37-dcde43784958 + 2024-07-11T14:31:57Z 9E2537CD SetCOPforTwoSpeedDXCoolingUnits Set COP for Two Speed DX Cooling Units @@ -17,10 +17,10 @@ Choice true false - {daec4601-1d85-44cd-9668-28f8270106f9} + {13abad73-a5ec-4198-ba9d-a31bbaeba4bd} - {daec4601-1d85-44cd-9668-28f8270106f9} + {13abad73-a5ec-4198-ba9d-a31bbaeba4bd} *All Air Loops* @@ -145,16 +145,10 @@ - 0320_ModelWithHVAC_01.osm - osm - test - 049F3417 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -162,6 +156,12 @@ readme 185458E4 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -171,19 +171,19 @@ measure.rb rb script - 1BB8ACA4 + 0B24B1FF - SetCOPforTwoSpeedDXCoolingUnits_Test.rb - rb + 0320_ModelWithHVAC_01.osm + osm test - 3518F4D2 + 049F3417 - LICENSE.md - md - license - 64FFEBDE + SetCOPforTwoSpeedDXCoolingUnits_Test.rb + rb + test + 6642FD63 diff --git a/lib/measures/SetEnergyPlusInfiltrationFlowRatePerFloorArea/measure.xml b/lib/measures/SetEnergyPlusInfiltrationFlowRatePerFloorArea/measure.xml index 8cd2ef52..c7c8fb1e 100644 --- a/lib/measures/SetEnergyPlusInfiltrationFlowRatePerFloorArea/measure.xml +++ b/lib/measures/SetEnergyPlusInfiltrationFlowRatePerFloorArea/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_energyplus_infiltration_flow_rate_per_floor_area 490a2af3-7b64-4915-bf9e-9a3a7b525a17 - 5f518d31-780d-49b3-bdae-8edd4f5f4609 - 20221115T223604Z + f0a43c52-a491-47f5-836e-c1ad63d92633 + 2024-07-11T14:32:07Z 2AC0F979 SetEnergyPlusInfiltrationFlowRatePerFloorArea SetEnergyPlusInfiltrationFlowRatePerFloorArea @@ -38,16 +38,10 @@ - Test.osm - osm - test - BCF2DBB8 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -56,16 +50,10 @@ 22131551 - SetEnergyPlusInfiltrationFlowRatePerFloorArea_Test.rb - rb - test - 6735877C - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -76,7 +64,19 @@ measure.rb rb script - 05764C3F + 2019B336 + + + SetEnergyPlusInfiltrationFlowRatePerFloorArea_Test.rb + rb + test + 2E5603D6 + + + Test.osm + osm + test + BCF2DBB8 diff --git a/lib/measures/SetEnergyPlusLightObjectsLPD/measure.xml b/lib/measures/SetEnergyPlusLightObjectsLPD/measure.xml index 92e69ae3..0a90d0f9 100644 --- a/lib/measures/SetEnergyPlusLightObjectsLPD/measure.xml +++ b/lib/measures/SetEnergyPlusLightObjectsLPD/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_energyplus_light_objects_lpd 88e02d9f-611f-45ec-afd7-eb9c0e2f8ccf - 0d1f7adf-143c-4727-b24d-1721348307e6 - 20221115T223604Z + d2643ca9-a58d-4aeb-9997-a2eda8191651 + 2024-07-11T14:32:08Z B087785D SetEnergyPlusLightObjectsLPD SetEnergyPlusLightObjectsLPD @@ -39,16 +39,10 @@ - EpLpdTest.osm - osm - test - 10DA2352 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -57,16 +51,10 @@ 92996150 - SetEnergyPlusLightobjectsLPD_Test.rb - rb - test - B6D86CC2 - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -77,7 +65,19 @@ measure.rb rb script - C766541F + 3F762C1A + + + EpLpdTest.osm + osm + test + 10DA2352 + + + SetEnergyPlusLightobjectsLPD_Test.rb + rb + test + 28F9CDC3 diff --git a/lib/measures/SetEnergyPlusMinimumOutdoorAirFlowRate/measure.xml b/lib/measures/SetEnergyPlusMinimumOutdoorAirFlowRate/measure.xml index e0b37760..77830492 100644 --- a/lib/measures/SetEnergyPlusMinimumOutdoorAirFlowRate/measure.xml +++ b/lib/measures/SetEnergyPlusMinimumOutdoorAirFlowRate/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_energyplus_minimum_outdoor_air_flow_rate 90e4574a-b4cc-4a00-9b43-1fe9bb7e6e77 - 8224560b-dbe9-46e9-8c2c-df70f58f2345 - 20221115T223549Z + a10ba836-d5ab-48a4-894f-76ad4d2b72e4 + 2024-07-11T14:31:54Z 7E41814C SetEnergyPlusMinimumOutdoorAirFlowRate SetEnergyPlusMinimumOutdoorAirFlowRate @@ -38,16 +38,10 @@ - Test.osm - osm - test - BCF2DBB8 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -56,16 +50,10 @@ 36DFB6F3 - SetEnergyPlusMinimumOutdoorAirFlowRate_Test.rb - rb - test - 1386CFB6 - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -76,7 +64,19 @@ measure.rb rb script - B75D360A + 6010C9AE + + + SetEnergyPlusMinimumOutdoorAirFlowRate_Test.rb + rb + test + 090F893F + + + Test.osm + osm + test + BCF2DBB8 diff --git a/lib/measures/SetGasBurnerEfficiency/measure.xml b/lib/measures/SetGasBurnerEfficiency/measure.xml index cae7f24f..2ee297ee 100644 --- a/lib/measures/SetGasBurnerEfficiency/measure.xml +++ b/lib/measures/SetGasBurnerEfficiency/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_gas_burner_efficiency afabec3d-cd02-4908-a367-84e21657421f - 0dbdbb90-9547-47c0-8093-1f46464ff0eb - 20221115T223603Z + c7d4d253-ee9d-4a3e-a607-c3a7a99ba800 + 2024-07-11T14:32:07Z 0DA5C9E6 SetGasBurnerEfficiency Set Gas Burner Efficiency @@ -17,10 +17,10 @@ Choice true false - {5e0d590f-588e-4699-b294-8598faeb3e1e} + {c9c3dbcd-3bb4-4d6b-84d7-028f59183294} - {5e0d590f-588e-4699-b294-8598faeb3e1e} + {c9c3dbcd-3bb4-4d6b-84d7-028f59183294} *All Air Loops* @@ -137,16 +137,10 @@ - 0320_ModelWithHVAC_01.osm - osm - test - 049F3417 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -154,6 +148,12 @@ readme FC832500 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -163,19 +163,19 @@ measure.rb rb script - B79DCD40 + 9172F00E - SetGasBurnerEfficiency_Test.rb - rb + 0320_ModelWithHVAC_01.osm + osm test - 06315368 + 049F3417 - LICENSE.md - md - license - 64FFEBDE + SetGasBurnerEfficiency_Test.rb + rb + test + 54DB1C8D diff --git a/lib/measures/SetLifecycleCostParameters/measure.xml b/lib/measures/SetLifecycleCostParameters/measure.xml index 478abb3f..540ded66 100644 --- a/lib/measures/SetLifecycleCostParameters/measure.xml +++ b/lib/measures/SetLifecycleCostParameters/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_lifecycle_cost_parameters bb5913af-d959-4e2a-81c5-cd0f3d14c99a - e57bffc0-609c-439d-962d-e3cd8e5b2a68 - 20221115T223609Z + 98193b33-fcec-4f89-88e7-f5308e2dd0a1 + 2024-07-11T14:32:12Z 35DA4ED3 SetLifecycleCostParameters SetLifecycleCostParameters @@ -49,10 +49,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -60,6 +60,12 @@ readme D5C161AA + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -69,19 +75,13 @@ measure.rb rb script - 768427C1 + 9384B192 SetLifecycleCostParameters_Test.rb rb test - 8EC39874 - - - LICENSE.md - md - license - 64FFEBDE + F338096F diff --git a/lib/measures/SetLightingLoadsByLPD/measure.xml b/lib/measures/SetLightingLoadsByLPD/measure.xml index 105935b2..f2cf66c9 100644 --- a/lib/measures/SetLightingLoadsByLPD/measure.xml +++ b/lib/measures/SetLightingLoadsByLPD/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_lighting_loads_by_lpd 901c076e-02af-4bf4-a780-57391e7b1e2a - 044955a0-c1b3-49dd-a448-8e2cdcaf9e73 - 20221115T223601Z + aad422b5-45d3-4ba5-96ad-eae60f8e508e + 2024-07-11T14:32:05Z 293730A7 SetLightingLoadsByLPD Set Lighting Loads by LPD @@ -17,10 +17,10 @@ Choice true false - {ac63c1dc-c508-4e10-b5ab-bd3a2f929351} + {7e97915d-4925-4057-9fd4-ff95f7acc6a0} - {ac63c1dc-c508-4e10-b5ab-bd3a2f929351} + {7e97915d-4925-4057-9fd4-ff95f7acc6a0} *Entire Building* @@ -146,6 +146,35 @@ + + LICENSE.md + md + license + BFFB1AA6 + + + README.md + md + readme + DD51F214 + + + README.md.erb + erb + readmeerb + 232D0477 + + + + OpenStudio + 2.0.0 + 2.0.0 + + measure.rb + rb + script + 0EFA7B73 + EnvelopeAndLoadTestModel_01.osm osm @@ -164,40 +193,11 @@ test ECE1D347 - - README.md.erb - erb - readmeerb - 232D0477 - - - README.md - md - readme - DD51F214 - - - LICENSE.md - md - license - 64FFEBDE - ReplaceLightsWithLPD_01_Test.rb rb test - DE0D9F71 - - - - OpenStudio - 2.0.0 - 2.0.0 - - measure.rb - rb - script - C9795A92 + 2DCE6E7D diff --git a/lib/measures/SetSpaceInfiltrationByExteriorSurfaceArea/measure.xml b/lib/measures/SetSpaceInfiltrationByExteriorSurfaceArea/measure.xml index 32a551ad..07ba3b0c 100644 --- a/lib/measures/SetSpaceInfiltrationByExteriorSurfaceArea/measure.xml +++ b/lib/measures/SetSpaceInfiltrationByExteriorSurfaceArea/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_space_infiltration_by_exterior_surface_area 9d7b0789-3974-4869-a2a8-055391857e3c - ee71eab6-16cc-4947-b13e-04430161dd56 - 20221115T223600Z + 81479110-c3db-43cf-8a8c-9e7b01e8ba82 + 2024-07-11T14:32:04Z E88CCCA7 SetSpaceInfiltrationByExteriorSurfaceArea Set Space Infiltration by Exterior Surface Area @@ -145,16 +145,16 @@ A one time material & installation cost can be added to the building object - EnvelopeAndLoadTestModel_01.osm - osm - test - D136DC8F + LICENSE.md + md + license + BFFB1AA6 - ReverseTranslatedModel.osm - osm - test - 0B94403D + README.md + md + readme + 4B3DFB4E README.md.erb @@ -162,12 +162,6 @@ A one time material & installation cost can be added to the building object readmeerb 703C9964 - - README.md - md - readme - 4B3DFB4E - OpenStudio @@ -177,19 +171,25 @@ A one time material & installation cost can be added to the building object measure.rb rb script - 5BD51492 + CF16E76C - SetSpaceInfiltrationByExteriorSurfaceArea_Test.rb - rb + EnvelopeAndLoadTestModel_01.osm + osm test - A1B8D103 + D136DC8F - LICENSE.md - md - license - 64FFEBDE + ReverseTranslatedModel.osm + osm + test + 0B94403D + + + SetSpaceInfiltrationByExteriorSurfaceArea_Test.rb + rb + test + F828C2F0 diff --git a/lib/measures/SetThermostatSchedules/measure.xml b/lib/measures/SetThermostatSchedules/measure.xml index 817f731a..bb6fc223 100644 --- a/lib/measures/SetThermostatSchedules/measure.xml +++ b/lib/measures/SetThermostatSchedules/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_thermostat_schedules 2978cde0-53d5-4096-bdab-11f9f6e074f1 - acca4042-2748-4812-bfb9-d0d0b97d9df3 - 20221115T223558Z + 827b8a50-f4b1-4a89-9e1c-702e01cec767 + 2024-07-11T14:32:03Z F4CEA58B SetThermostatSchedules Set Thermostat Schedules @@ -17,10 +17,10 @@ Choice true false - {9f1ce2c8-588d-41c8-8cc2-4c79337bb19b} + {a8ae3532-dbdb-4733-bef4-fa0b7f4cd415} - {9f1ce2c8-588d-41c8-8cc2-4c79337bb19b} + {a8ae3532-dbdb-4733-bef4-fa0b7f4cd415} *All Thermal Zones* @@ -91,10 +91,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -102,6 +102,12 @@ readme 7C2538DE + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -111,19 +117,13 @@ measure.rb rb script - AC752969 - - - LICENSE.md - md - license - 64FFEBDE + C58D0263 SetThermostatSchedules_Test.rb rb test - 0A896D00 + A78DA3D0 diff --git a/lib/measures/ShiftScheduleProfileTime/measure.xml b/lib/measures/ShiftScheduleProfileTime/measure.xml index 9e587764..bfc9503a 100644 --- a/lib/measures/ShiftScheduleProfileTime/measure.xml +++ b/lib/measures/ShiftScheduleProfileTime/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 shift_schedule_profile_time 1c642348-f074-4ad1-98ee-2208ddc89ac7 - 4f449856-9a3b-4ad0-a5a1-efea0b95396a - 20221115T223607Z + b8e9677e-d5d5-4583-b552-95e53bf655ff + 2024-07-11T14:32:10Z B6CD1F98 ShiftScheduleProfileTime ShiftScheduleProfileTime @@ -17,10 +17,10 @@ Choice true false - {4998e0bc-9175-4c72-9384-15b3c9c1f4f7} + {dbbe6087-34db-420d-8a04-3c691240c1a6} - {4998e0bc-9175-4c72-9384-15b3c9c1f4f7} + {dbbe6087-34db-420d-8a04-3c691240c1a6} *All Ruleset Schedules* @@ -63,16 +63,10 @@ - 3Story2Space.osm - osm - test - B4AB814E - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -80,6 +74,12 @@ readme 8E63A0BF + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -89,19 +89,19 @@ measure.rb rb script - 589E2347 + B0B00FDE - ShiftScheduleProfileTime_Test.rb - rb + 3Story2Space.osm + osm test - 0C5DE85F + B4AB814E - LICENSE.md - md - license - 64FFEBDE + ShiftScheduleProfileTime_Test.rb + rb + test + 579AC50F diff --git a/lib/measures/SwapLightsDefinition/measure.xml b/lib/measures/SwapLightsDefinition/measure.xml index 950e6b9e..354b7f72 100644 --- a/lib/measures/SwapLightsDefinition/measure.xml +++ b/lib/measures/SwapLightsDefinition/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 swap_lights_definition 63845525-5b86-448f-9a34-6be8481496ea - fc6bf2b2-8b69-4c14-b9c2-1a383fe68383 - 20221115T223609Z + 57da7a6a-5a0f-4229-9d57-35e265606fba + 2024-07-11T14:32:13Z 293730A7 SwapLightsDefinition SwapLightsDefinition @@ -73,16 +73,16 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - E3EB4106 + LICENSE.md + md + license + BFFB1AA6 - EnvelopeAndLoadTestModel_01_costed.osm - osm - test - 2ED2C03C + README.md + md + readme + 23BE224A README.md.erb @@ -90,12 +90,6 @@ readmeerb 703C9964 - - README.md - md - readme - 23BE224A - OpenStudio @@ -105,19 +99,25 @@ measure.rb rb script - C9F006CF + 7DECDBEC - SwapLightsDefinition_Test.rb - rb + EnvelopeAndLoadTestModel_01.osm + osm test - 715DD3B7 + E3EB4106 - LICENSE.md - md - license - 64FFEBDE + EnvelopeAndLoadTestModel_01_costed.osm + osm + test + 2ED2C03C + + + SwapLightsDefinition_Test.rb + rb + test + C5163C1F diff --git a/lib/measures/UnmetLoadHoursTroubleshooting/measure.xml b/lib/measures/UnmetLoadHoursTroubleshooting/measure.xml index 77a5af2a..45a32ca4 100644 --- a/lib/measures/UnmetLoadHoursTroubleshooting/measure.xml +++ b/lib/measures/UnmetLoadHoursTroubleshooting/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 unmet_load_hours_troubleshooting edf8fc3a-5607-4e0f-9dd2-4a1e1545433b - 950c314a-a6aa-4198-b67e-705ed7baa838 - 20221115T223559Z + c6295e86-6d14-43d9-ad33-702bbd4aab0f + 2024-07-11T14:32:03Z 5BFE84C4 UnmetLoadHoursTroubleshooting Unmet Load Hours Troubleshooting @@ -101,10 +101,39 @@ - undersizedHVAC.osm - osm - test - 36469ABE + LICENSE.md + md + license + BFFB1AA6 + + + README.md + md + readme + 5C03BFC2 + + + README.md.erb + erb + readmeerb + 703C9964 + + + + OpenStudio + 2.0.0 + 2.0.0 + + measure.rb + rb + script + D516E015 + + + report.html.in + in + resource + 8D7B1438 2zone.osm @@ -119,10 +148,10 @@ 689C5D49 - report.html.in - in - resource - 8D7B1438 + UnmetLoadHoursTroubleshooting_Test.rb + rb + test + EDF1ED99 sqlfile.sql @@ -131,39 +160,10 @@ 00000000 - README.md.erb - erb - readmeerb - 703C9964 - - - README.md - md - readme - 5C03BFC2 - - - LICENSE.md - md - license - 64FFEBDE - - - UnmetLoadHoursTroubleshooting_Test.rb - rb + undersizedHVAC.osm + osm test - 6814B2C5 - - - - OpenStudio - 2.0.0 - 2.0.0 - - measure.rb - rb - script - 498D9E22 + 36469ABE diff --git a/lib/measures/VentilationQAQC/measure.xml b/lib/measures/VentilationQAQC/measure.xml index 322db5ba..af5a5ded 100644 --- a/lib/measures/VentilationQAQC/measure.xml +++ b/lib/measures/VentilationQAQC/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 ventilation_qaqc cb13be0e-88f6-494c-b3b1-dc748b42e205 - 1de0a266-209f-4b90-862d-2ab55958026c - 20221115T223556Z + d6f1285a-7105-45ad-a5b2-2423c694f2ac + 2024-07-11T14:32:01Z 2C8A3EEF VentilationQAQC Ventilation Report @@ -45,16 +45,10 @@ - USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw - epw - test - C254B53F - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -63,22 +57,10 @@ 7A7F2C94 - small_office.osm - osm - test - 358253AE - - - report.html.in - in - resource - E5A4911E - - - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -89,13 +71,31 @@ measure.rb rb script - CD2A5930 + 6332F0A4 + + + report.html.in + in + resource + E5A4911E + + + USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw + epw + test + C254B53F + + + small_office.osm + osm + test + 358253AE ventilation_qaqc_test.rb rb test - 99A61254 + 365B89D9 diff --git a/lib/measures/XcelEDAReportingandQAQC/measure.xml b/lib/measures/XcelEDAReportingandQAQC/measure.xml index 30ff5586..21e7f934 100644 --- a/lib/measures/XcelEDAReportingandQAQC/measure.xml +++ b/lib/measures/XcelEDAReportingandQAQC/measure.xml @@ -3,8 +3,8 @@ 3.1 xcel_eda_reportingand_qaqc 92bee759-86ae-4617-92e2-f8e5aa9dc684 - ee4dabcc-8247-4671-a7a2-50b7302e36f2 - 2023-11-28T19:09:56Z + 95b8af56-9b41-4af3-abff-dd11a6eb841a + 2024-07-11T14:32:12Z 2C8A3EEF XcelEDAReportingandQAQC XcelEDAReportingandQAQC @@ -98,7 +98,7 @@ 0116_OfficeTest121_dev.osm osm test - 63E36762 + 417AFBA7 USA_CO_Golden-NREL.724666_TMY3.epw diff --git a/lib/measures/XcelEDAReportingandQAQC/tests/0116_OfficeTest121_dev.osm b/lib/measures/XcelEDAReportingandQAQC/tests/0116_OfficeTest121_dev.osm index b8d80ecc..9dd7bb8a 100644 --- a/lib/measures/XcelEDAReportingandQAQC/tests/0116_OfficeTest121_dev.osm +++ b/lib/measures/XcelEDAReportingandQAQC/tests/0116_OfficeTest121_dev.osm @@ -636,10 +636,10 @@ OS:ScheduleTypeLimits, OS:SimulationControl, {657ba578-29ab-439c-87b6-218865343bf2}, ! Handle - No, ! Do Zone Sizing Calculation - No, ! Do System Sizing Calculation - No, ! Do Plant Sizing Calculation - No, ! Run Simulation for Sizing Periods + Yes, ! Do Zone Sizing Calculation + Yes, ! Do System Sizing Calculation + Yes, ! Do Plant Sizing Calculation + Yes, ! Run Simulation for Sizing Periods Yes, ! Run Simulation for Weather File Run Periods 0.040000000000000001, ! Loads Convergence Tolerance Value 0.40000000000000002, ! Temperature Convergence Tolerance Value diff --git a/lib/measures/XcelEDATariffSelectionandModelSetup/measure.xml b/lib/measures/XcelEDATariffSelectionandModelSetup/measure.xml index 62c6da9d..e9d40d99 100644 --- a/lib/measures/XcelEDATariffSelectionandModelSetup/measure.xml +++ b/lib/measures/XcelEDATariffSelectionandModelSetup/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 xcel_eda_tariff_selectionand_model_setup c5ab60e9-b8e5-4653-a502-5ed030f1335d - aee4a050-8cce-4e9a-8f6c-9ad93af850ba - 20230607T052233Z + 6771c66d-93f6-4a18-81a5-a83ca5754a9b + 2024-07-11T14:32:13Z 4FA703D1 XcelEDATariffSelectionandModelSetup XcelEDATariffSelectionandModelSetup @@ -133,10 +133,39 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - E11F67BD + LICENSE.md + md + license + BFFB1AA6 + + + README.md + md + readme + D8E0C68E + + + README.md.erb + erb + readmeerb + 703C9964 + + + + OpenStudio + 2.0.0 + 2.0.0 + + measure.rb + rb + script + 808C0D31 + + + Commercial.idf + idf + resource + 3F35D94A Interruptible Industrial G.idf @@ -145,10 +174,10 @@ B643926B - Commercial.idf + Large CG.idf idf resource - 3F35D94A + A27CAF65 Non-Xcel Commercial.idf @@ -156,6 +185,18 @@ resource 63C4C653 + + Non-Xcel Gas Firm.idf + idf + resource + 245CE0CB + + + Non-Xcel Gas Interruptible.idf + idf + resource + 8A690662 + Non-Xcel Primary General.idf idf @@ -186,6 +227,12 @@ resource 85ABC54E + + Residential Gas.idf + idf + resource + 5816D7C1 + Residential General.idf idf @@ -204,30 +251,6 @@ resource 0735795F - - Transmission General.idf - idf - resource - CD615EA6 - - - Large CG.idf - idf - resource - A27CAF65 - - - Residential Gas.idf - idf - resource - 5816D7C1 - - - Small CG.idf - idf - resource - B1DA33A6 - Secondary Photovoltaic Time-of-Use.idf idf @@ -235,51 +258,28 @@ D5155043 - Non-Xcel Gas Firm.idf + Small CG.idf idf resource - 245CE0CB + B1DA33A6 - Non-Xcel Gas Interruptible.idf + Transmission General.idf idf resource - 8A690662 - - - LICENSE.md - md - license - 9640B6CB - - - README.md.erb - erb - readmeerb - 703C9964 - - - README.md - md - readme - D8E0C68E + CD615EA6 - XcelEDATariffSelectionandModelSetup_Test.rb - rb + EnvelopeAndLoadTestModel_01/files/USA_CO_Golden-NREL.724666_TMY3.epw + epw test - 1486C77E + BDF687C1 - - OpenStudio - 2.0.0 - 2.0.0 - - measure.rb - rb - script - B040D95B + EnvelopeAndLoadTestModel_01/project.osp + osp + test + 2F951741 EnvelopeAndLoadTestModel_01/project.osp-journal @@ -294,16 +294,16 @@ 7042FFF4 - EnvelopeAndLoadTestModel_01/files/USA_CO_Golden-NREL.724666_TMY3.epw - epw + EnvelopeAndLoadTestModel_01.osm + osm test - BDF687C1 + E11F67BD - EnvelopeAndLoadTestModel_01/project.osp - osp + XcelEDATariffSelectionandModelSetup_Test.rb + rb test - 2F951741 + 8CFDBBFF diff --git a/lib/measures/ZoneReport/measure.xml b/lib/measures/ZoneReport/measure.xml index a6c313cb..43a3449f 100644 --- a/lib/measures/ZoneReport/measure.xml +++ b/lib/measures/ZoneReport/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 zone_report 81ac119f-4841-434c-9e11-824310fe1cb7 - 54e4658d-21fa-46d2-9724-cf5791d19079 - 20221115T223557Z + 98d96a5c-3240-40ae-a2d6-46ff8d47930b + 2024-07-11T14:32:02Z 2C8A3EEF ZoneReport Zone Report @@ -30,22 +30,16 @@ - report.html.in - in - resource - 9863EEC5 - - - gas_electric_mark_load.osm - osm - test - 1F5C6B63 + LICENSE.md + md + license + BFFB1AA6 - USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw - epw - test - C254B53F + README.md + md + readme + C013AECE README.md.erb @@ -54,33 +48,39 @@ 703C9964 - README.md - md - readme - C013AECE + + OpenStudio + 2.0.0 + 2.0.0 + + measure.rb + rb + script + C6695B06 - LICENSE.md - md - license - 64FFEBDE + report.html.in + in + resource + 9863EEC5 + + + USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw + epw + test + C254B53F ZoneReport_Test.rb rb test - DD50BE40 + 5CDE28AB - - OpenStudio - 2.0.0 - 2.0.0 - - measure.rb - rb - script - 02F159D1 + gas_electric_mark_load.osm + osm + test + 1F5C6B63 diff --git a/lib/measures/add_ems_emissions_reporting/measure.rb b/lib/measures/add_ems_emissions_reporting/measure.rb index 5eb8e7ac..65283d44 100644 --- a/lib/measures/add_ems_emissions_reporting/measure.rb +++ b/lib/measures/add_ems_emissions_reporting/measure.rb @@ -4,8 +4,6 @@ # ******************************************************************************* require 'csv' -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' # start the measure class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure diff --git a/lib/measures/add_ems_emissions_reporting/measure.xml b/lib/measures/add_ems_emissions_reporting/measure.xml index 923767a8..866d6e5e 100644 --- a/lib/measures/add_ems_emissions_reporting/measure.xml +++ b/lib/measures/add_ems_emissions_reporting/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_ems_emissions_reporting e8fe9153-5e70-4769-afa0-6da0045aa529 - 5503bbcc-4de8-4493-8ed7-e7129da38e82 - 20221115T223601Z + a433902c-9979-4067-bc02-69a17cc9e2fe + 2024-07-11T14:32:05Z 976EB6EB AddEMSEmissionsReporting Add EMS to Report Emissions @@ -447,10 +447,10 @@ - example_model.osm - osm - test - 8EA06A27 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -458,6 +458,17 @@ readme D90928F0 + + + OpenStudio + 2.5.1 + 3.8.0 + + measure.rb + rb + script + 88A306FD + future_annual_co2e.csv csv @@ -572,28 +583,17 @@ resource 6C952ECC - - LICENSE.md - md - license - 64FFEBDE - add_ems_emissions_reporting_test.rb rb test - 17B2F148 + 8A2D4011 - - OpenStudio - 2.5.1 - 2.5.1 - - measure.rb - rb - script - 471C0F9A + example_model.osm + osm + test + 8EA06A27 diff --git a/lib/measures/add_ems_to_control_ev_charging/measure.rb b/lib/measures/add_ems_to_control_ev_charging/measure.rb index e58e2c93..ff3b9973 100644 --- a/lib/measures/add_ems_to_control_ev_charging/measure.rb +++ b/lib/measures/add_ems_to_control_ev_charging/measure.rb @@ -4,8 +4,6 @@ # ******************************************************************************* # start the measure -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' class AddEMSToControlEVCharging < OpenStudio::Measure::ModelMeasure # human readable name def name diff --git a/lib/measures/add_ems_to_control_ev_charging/measure.xml b/lib/measures/add_ems_to_control_ev_charging/measure.xml index 3bc7510c..71de2b15 100644 --- a/lib/measures/add_ems_to_control_ev_charging/measure.xml +++ b/lib/measures/add_ems_to_control_ev_charging/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_ems_to_control_ev_charging df97997f-d02a-4e35-af7a-5aed16cb5772 - 5a5c367a-fcf8-4162-ba42-59edc0c46a4a - 20221115T223602Z + cb1e5410-6ed7-43a8-8ff7-a7134be49ef7 + 2024-07-11T14:32:06Z 976EB6EB AddEMSToControlEVCharging Add EMS to Control EV Charging @@ -50,10 +50,10 @@ - example_model.osm - osm - test - E925F127 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -61,28 +61,28 @@ readme 70CA2C6E - - LICENSE.md - md - license - 64FFEBDE - - - add_ems_to_control_ev_charging_test.rb - rb - test - 0BFC4A8F - OpenStudio 2.5.1 - 2.5.1 + 3.8.0 measure.rb rb script - 7EC3E27C + D2FD7CFE + + + add_ems_to_control_ev_charging_test.rb + rb + test + D10942F4 + + + example_model.osm + osm + test + E925F127 diff --git a/lib/measures/add_ev_load/measure.xml b/lib/measures/add_ev_load/measure.xml index 69cd15a9..cfcba603 100644 --- a/lib/measures/add_ev_load/measure.xml +++ b/lib/measures/add_ev_load/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_ev_load a23e0493-7357-48ca-b089-4d902efd6b50 - 1a1691ef-23a0-4d6e-b061-f2b3407950a3 - 20221115T223600Z + 6b5494cf-80bb-43d4-99d5-59325f977d4f + 2024-07-11T14:32:04Z 9A202986 AddEVLoad Add_EV_Load @@ -136,10 +136,10 @@ - example_model.osm - osm - test - E925F127 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -147,6 +147,29 @@ readme 2293F4B3 + + + OpenStudio + 2.5.1 + 2.5.1 + + measure.rb + rb + script + D3110BC3 + + + PSN_BuildingKey.csv + csv + resource + 153D4BBA + + + PSN_BuildingKey_v2.csv + csv + resource + 1000C8E8 + chg1_dow1_flex1.csv csv @@ -327,40 +350,17 @@ resource 114F9EA1 - - PSN_BuildingKey.csv - csv - resource - 153D4BBA - - - PSN_BuildingKey_v2.csv - csv - resource - 1000C8E8 - - - LICENSE.md - md - license - 64FFEBDE - add_ev_load_test.rb rb test - 8D60903A + 5381CBDE - - OpenStudio - 2.5.1 - 2.5.1 - - measure.rb - rb - script - 488C2195 + example_model.osm + osm + test + E925F127 diff --git a/lib/measures/add_rooftop_pv/measure.rb b/lib/measures/add_rooftop_pv/measure.rb index 44ea4e30..d08e909a 100644 --- a/lib/measures/add_rooftop_pv/measure.rb +++ b/lib/measures/add_rooftop_pv/measure.rb @@ -6,13 +6,10 @@ # see the URL below for information on how to write OpenStudio measures # http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/ -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' -require 'openstudio/extension/core/os_lib_schedules' - # start the measure class AddRooftopPV < OpenStudio::Measure::ModelMeasure + require 'openstudio-standards' + # human readable name def name return 'Add Rooftop PV' @@ -68,7 +65,8 @@ def run(model, runner, user_arguments) end # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model)) + args = runner.getArgumentValues(arguments(model), user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] if !args then return false end # check expected values of double arguments @@ -101,7 +99,7 @@ def run(model, runner, user_arguments) 'summerTimeValuePairs' => { 24.0 => target_transmittance }, 'defaultTimeValuePairs' => { 24.0 => target_transmittance } } - pv_shading_transmittance_schedule = OsLib_Schedules.createSimpleSchedule(model, inputs) + pv_shading_transmittance_schedule = OpenstudioStandards::Schedules.create_simple_schedule(model, inputs) runner.registerInfo("Created transmittance schedule for PV shading surfaces with constant value of #{target_transmittance}") model.getSurfaces.each do |surface| diff --git a/lib/measures/add_rooftop_pv/measure.xml b/lib/measures/add_rooftop_pv/measure.xml index 946edbd8..8426f8bd 100644 --- a/lib/measures/add_rooftop_pv/measure.xml +++ b/lib/measures/add_rooftop_pv/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_rooftop_pv 34550614-0c87-44db-9252-0ca0915b1e64 - 645e4fbe-c829-4de2-adc5-3181f2db13ea - 20221115T223603Z + f6dcae0f-c0e6-42dc-bc4b-1caca12e71f3 + 2024-07-11T14:32:06Z 178163B6 AddRooftopPV Add Rooftop PV @@ -88,16 +88,10 @@ - pv_test_input.osm - osm - test - AB14A2B3 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -106,27 +100,33 @@ 936FAC3C - LICENSE.md - md - license - 64FFEBDE - - - add_rooftop_pv_test.rb - rb - test - 450F2645 + README.md.erb + erb + readmeerb + 703C9964 OpenStudio 2.0.0 - 2.8.0 + 3.8.0 measure.rb rb script - 5289A80E + 9AA2D6EE + + + add_rooftop_pv_test.rb + rb + test + 5432FFC3 + + + pv_test_input.osm + osm + test + AB14A2B3 diff --git a/lib/measures/add_zone_mixing_object/measure.xml b/lib/measures/add_zone_mixing_object/measure.xml index 10f81999..92cf61c9 100644 --- a/lib/measures/add_zone_mixing_object/measure.xml +++ b/lib/measures/add_zone_mixing_object/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_zone_mixing_object 6ed65817-1d97-43da-a4c2-1d738eafcde5 - 915a90ef-082e-48f3-a782-d4416927bc88 - 20221115T223602Z + 422d82bc-c2d0-44ac-b1ed-9b40cb21bf6a + 2024-07-11T14:32:05Z 61000E02 AddZoneMixingObject Add Zone Mixing Object @@ -70,16 +70,10 @@ - ZoneMixingTestModel.osm - osm - test - 4451DD5D - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -88,10 +82,10 @@ 9C34D6E1 - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -102,13 +96,19 @@ measure.rb rb script - 464B8F57 + 968CA324 + + + ZoneMixingTestModel.osm + osm + test + 4451DD5D add_zone_mixing_object_test.rb rb test - 9EBBF197 + A0A93765 diff --git a/lib/measures/add_zone_ventilation_design_flow_rate_object/measure.xml b/lib/measures/add_zone_ventilation_design_flow_rate_object/measure.xml index 2a4a5246..e31abbb1 100644 --- a/lib/measures/add_zone_ventilation_design_flow_rate_object/measure.xml +++ b/lib/measures/add_zone_ventilation_design_flow_rate_object/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 add_zone_ventilation_design_flow_rate_object c31e2212-720d-413f-bdb9-f38e198dcfa3 - 128c4140-fa3d-48ec-878d-ef81a22de16a - 20221115T223549Z + e54d0d73-cb66-40f7-8934-e1e211940976 + 2024-07-11T14:31:57Z 3B6B95A6 AddZoneVentilationDesignFlowRateObject Add Zone Ventilation Design Flow Rate Object @@ -105,16 +105,10 @@ - example_model.osm - osm - test - 2492F353 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -122,6 +116,12 @@ readme 8C13CD27 + + README.md.erb + erb + readmeerb + 703C9964 + OpenStudio @@ -131,19 +131,19 @@ measure.rb rb script - 14B01C81 - - - LICENSE.md - md - license - 64FFEBDE + 27698FB7 add_zone_ventilation_design_flow_rate_object_test.rb rb test - 0411D6F6 + 1C95B333 + + + example_model.osm + osm + test + 2492F353 diff --git a/lib/measures/air_wall_zone_mixing/measure.rb b/lib/measures/air_wall_zone_mixing/measure.rb index 4ffb8ba8..d8d17d75 100644 --- a/lib/measures/air_wall_zone_mixing/measure.rb +++ b/lib/measures/air_wall_zone_mixing/measure.rb @@ -6,12 +6,10 @@ # see the URL below for information on how to write OpenStudio measures # http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/ -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_geometry' - # start the measure class AirWallZoneMixing < OpenStudio::Measure::ModelMeasure + require 'openstudio-standards' + # human readable name def name return 'Air Wall Zone Mixing' @@ -78,8 +76,8 @@ def run(model, runner, user_arguments) max_space_height = 0 zone.spaces.each do |space| volume_counter += space.volume - min_space_zvalue = OsLib_Geometry.getSurfaceZValues(space.surfaces).sort.first # this expects an array of surfaces - max_space_zvalue = OsLib_Geometry.getSurfaceZValues(space.surfaces).sort.last # this expects an array of surfaces + min_space_zvalue = OpenstudioStandards::Geometry.surfaces_get_z_values(space.surfaces).sort.first # this expects an array of surfaces + max_space_zvalue = OpenstudioStandards::Geometry.surfaces_get_z_values(space.surfaces).sort.last # this expects an array of surfaces if max_space_zvalue - min_space_zvalue > max_space_height max_space_height = max_space_zvalue - min_space_zvalue end diff --git a/lib/measures/air_wall_zone_mixing/measure.xml b/lib/measures/air_wall_zone_mixing/measure.xml index 54de1825..2aa54f80 100644 --- a/lib/measures/air_wall_zone_mixing/measure.xml +++ b/lib/measures/air_wall_zone_mixing/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 air_wall_zone_mixing fd04f73e-a530-4144-9e1e-c1878b1394bc - 28c2d597-413e-4d7e-9fcc-d3ec505a65bd - 20221115T223559Z + 05a68d53-908d-4baf-9dd5-40c526bfc76f + 2024-07-11T14:32:03Z 772B7164 AirWallZoneMixing Air Wall Zone Mixing @@ -70,16 +70,10 @@ Zone mixing will only be added where there is an air wall and where the matched - example_model.osm - osm - test - AD3A8B94 - - - SimpleTest.osm - osm - test - 38ED88B9 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -129,28 +123,34 @@ Zone mixing will only be added where there is an air wall and where the matched doc 95902986 - - LICENSE.md - md - license - 64FFEBDE - - - air_wall_zone_mixing_test.rb - rb - test - F33CA3D2 - OpenStudio 2.0.0 - 2.8.0 + 3.8.0 measure.rb rb script - 53547EED + 2E6E39F8 + + + SimpleTest.osm + osm + test + 38ED88B9 + + + air_wall_zone_mixing_test.rb + rb + test + 856448EA + + + example_model.osm + osm + test + AD3A8B94 diff --git a/lib/measures/create_csv_output/measure.xml b/lib/measures/create_csv_output/measure.xml index 91b4585e..1a1e0ee5 100644 --- a/lib/measures/create_csv_output/measure.xml +++ b/lib/measures/create_csv_output/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 create_csv_output 99d3a7e5-4bd5-407f-b5eb-7c59660ca980 - fbbc1933-a541-4258-89b1-20ec4abae16a - 20230118T161956Z + a1449e43-ae2f-468f-abb1-11be6f448e2e + 2024-07-11T14:32:06Z 9BF1E6AC CreateCSVOutput CreateCSVOutput @@ -65,7 +65,13 @@ LICENSE.md md license - CD7F5672 + BFFB1AA6 + + + README.md + md + readme + 0A07426F README.md.erb @@ -79,24 +85,6 @@ doc 00000000 - - example_model.osm - osm - test - 39B6E26C - - - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 - - - report.html.in - in - resource - 3F69E3FB - OpenStudio @@ -106,19 +94,31 @@ measure.rb rb script - 94EA9ABB + B46C084C + + + report.html.in + in + resource + 3F69E3FB + + + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 create_csv_output_test.rb rb test - 74354A94 + 91652056 - README.md - md - readme - 0A07426F + example_model.osm + osm + test + 39B6E26C diff --git a/lib/measures/envelope_and_internal_load_breakdown/measure.rb b/lib/measures/envelope_and_internal_load_breakdown/measure.rb index 0cb58cae..3788c0fe 100644 --- a/lib/measures/envelope_and_internal_load_breakdown/measure.rb +++ b/lib/measures/envelope_and_internal_load_breakdown/measure.rb @@ -6,10 +6,6 @@ require 'erb' require 'json' -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' - require "#{File.dirname(__FILE__)}/resources/os_lib_reporting_envelope_and_internal_loads_breakdown" # start the measure diff --git a/lib/measures/envelope_and_internal_load_breakdown/measure.xml b/lib/measures/envelope_and_internal_load_breakdown/measure.xml index e86d4bad..d42c231d 100644 --- a/lib/measures/envelope_and_internal_load_breakdown/measure.xml +++ b/lib/measures/envelope_and_internal_load_breakdown/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 envelope_and_internal_load_breakdown 8f0e1fbb-8bc6-46e5-b6e4-db59177e2c02 - 094a25e3-d116-401e-8cdb-ae076a79079a - 20221115T224203Z + a792eb8c-870a-4c3e-8780-c1cd5b7dd8d2 + 2024-07-11T14:32:04Z 69BA4D91 EnvelopeAndInternalLoadBreakdown Envelope and Internal Load Breakdown @@ -71,28 +71,22 @@ - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 - - - ExampleModel.osm - osm - test - 7F9DACF4 + LICENSE.md + md + license + BFFB1AA6 - ExampleModel_NoExtNoGround.osm - osm - test - 07CE0378 + README.md + md + readme + 7D00FFF0 - ExampleModel_NoLoads_NoOA.osm - osm - test - CA6A593D + README.md.erb + erb + readmeerb + 1223C55C htg_gain_detailed_a.png @@ -113,63 +107,69 @@ E8E7FBC8 - htg_loss_summary.png + htg_loss_detailed.png png doc - 69DDA02E + 6E4E8FE2 - htg_loss_detailed.png + htg_loss_summary.png png doc - 6E4E8FE2 + 69DDA02E - README.md.erb - erb - readmeerb - 1223C55C + + OpenStudio + 2.0.0 + 3.8.0 + + measure.rb + rb + script + 184F527B os_lib_reporting_envelope_and_internal_loads_breakdown.rb rb resource - 471E57CB + EBC3D1C1 - LICENSE.md - md - license - 64FFEBDE + report.html.erb + erb + resource + 41C02D76 EnvelopeAndInternalLoadBreakdown_Test.rb rb test - C9C97ADF + DCE6255F - - OpenStudio - 2.0.0 - 3.1.0 - - measure.rb - rb - script - 4B3CF7A8 + ExampleModel.osm + osm + test + 7F9DACF4 - README.md - md - readme - 7D00FFF0 + ExampleModel_NoExtNoGround.osm + osm + test + 07CE0378 - report.html.erb - erb - resource - 0C9A88EB + ExampleModel_NoLoads_NoOA.osm + osm + test + CA6A593D + + + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 diff --git a/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb b/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb index dbccfebb..554d794c 100644 --- a/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb +++ b/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb @@ -23,6 +23,7 @@ + diff --git a/lib/measures/example_report/measure.rb b/lib/measures/example_report/measure.rb index 4eb29b6c..1e47591f 100644 --- a/lib/measures/example_report/measure.rb +++ b/lib/measures/example_report/measure.rb @@ -6,10 +6,6 @@ require 'erb' require 'json' -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' - require "#{File.dirname(__FILE__)}/resources/os_lib_reporting_example" # start the measure @@ -88,7 +84,8 @@ def run(runner, user_arguments) web_asset_path = setup[:web_asset_path] # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments) + args = runner.getArgumentValues(arguments, user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] unless args return false end diff --git a/lib/measures/example_report/measure.xml b/lib/measures/example_report/measure.xml index e6297bf3..c336edea 100644 --- a/lib/measures/example_report/measure.xml +++ b/lib/measures/example_report/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 example_report 174a6f71-3e8c-4f99-9e7a-b64f2e7535d4 - 7a62653c-c1e8-4550-a21f-3655bded5074 - 20221115T224157Z + 3f4dffcd-d7e8-40db-a753-45646f4cc20c + 2024-07-11T14:31:57Z 557BF06F ExampleReport Example Report @@ -105,22 +105,16 @@ - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 - - - ExampleModel.osm - osm - test - 7F9DACF4 + LICENSE.md + md + license + BFFB1AA6 - ExampleReport.pdf - pdf - resource - FBA35C89 + README.md + md + readme + 3C0851D8 README.md.erb @@ -129,45 +123,51 @@ 703C9964 - README.md - md - readme - 3C0851D8 + + OpenStudio + 2.0.0 + 3.8.0 + + measure.rb + rb + script + 3E43ABFD + + + ExampleReport.pdf + pdf + resource + FBA35C89 os_lib_reporting_example.rb rb resource - 79453AA9 + 44033BD8 - LICENSE.md - md - license - 64FFEBDE + report.html.erb + erb + resource + FF1CBF19 - ExampleReport_Test.rb - rb + ExampleModel.osm + osm test - 45DFAE69 + 7F9DACF4 - - OpenStudio - 2.0.0 - 3.1.0 - - measure.rb + ExampleReport_Test.rb rb - script - 04DFD4D1 + test + 5926CEE0 - report.html.erb - erb - resource - 71EF0A45 + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 diff --git a/lib/measures/example_report/resources/report.html.erb b/lib/measures/example_report/resources/report.html.erb index 554d794c..401337d8 100644 --- a/lib/measures/example_report/resources/report.html.erb +++ b/lib/measures/example_report/resources/report.html.erb @@ -23,6 +23,7 @@ + diff --git a/lib/measures/gem_env_report/measure.xml b/lib/measures/gem_env_report/measure.xml index ad24953f..b15df27f 100644 --- a/lib/measures/gem_env_report/measure.xml +++ b/lib/measures/gem_env_report/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 gem_environment_report 3f9f1a2f-0e8a-4c88-b817-10494fc3e73a - c37f64ba-bdf4-4c67-a5e6-4cd01086ac36 - 20221115T223606Z + b833f734-5c26-4273-94d8-d9cb36a7abf3 + 2024-07-11T14:32:10Z D1F10311 GemEnvironmentReport gem environment report @@ -40,10 +40,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -52,51 +52,51 @@ ACC6F66B - run_gem_env_info.rb - rb - resource - EB1D95F2 + README.md.erb + erb + readmeerb + 703C9964 - run_openstudio_info.rb + + OpenStudio + 2.0.0 + 2.0.0 + + measure.rb rb - resource - 926943DC + script + 509760B0 - LICENSE.md - md - license - 64FFEBDE + gem_env_info.rb + rb + resource + C74C9A12 openstudio_info.rb rb resource - BA1249C5 + 58061348 - gem_env_info.rb + run_gem_env_info.rb rb resource - 5C631590 + 9F90BABF - gem_env_report_Test.rb + run_openstudio_info.rb rb - test - 96AADEF6 + resource + E4901393 - - OpenStudio - 2.0.0 - 2.0.0 - - measure.rb + gem_env_report_Test.rb rb - script - 3D133192 + test + 1F849B2D diff --git a/lib/measures/generic_qaqc/measure.rb b/lib/measures/generic_qaqc/measure.rb index 32c742d8..14afdc02 100644 --- a/lib/measures/generic_qaqc/measure.rb +++ b/lib/measures/generic_qaqc/measure.rb @@ -7,24 +7,14 @@ require 'json' require 'openstudio-standards' -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_schedules' -require 'openstudio/extension/core/os_lib_helper_methods' -require 'openstudio/extension/core/os_lib_model_generation.rb' - # require all .rb files in resources folder +# todo - remove resource ruby files and connect to OpenstudioStandards::QAQC Dir[File.dirname(__FILE__) + '/resources/*.rb'].each { |file| require file } # start the measure class GenericQAQC < OpenStudio::Measure::ReportingMeasure # all QAQC checks should be in OsLib_QAQC module include OsLib_QAQC - include OsLib_HelperMethods - include OsLib_ModelGeneration - - # OsLib_CreateResults is needed for utility EDA programs but not the generic QAQC measure - # include OsLib_CreateResults # define the name that a user will see, this method may be deprecated as # the display name in PAT comes from the name field in measure.xml @@ -92,7 +82,7 @@ def arguments(model = nil) args = OpenStudio::Measure::OSArgumentVector.new # Make an argument for the template - template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', get_doe_templates(false), true) + template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', OpenstudioStandards::CreateTypical.get_doe_templates(false), true) template.setDisplayName('Target ASHRAE Standard') template.setDescription('This used to set the target standard for most checks.') template.setDefaultValue('90.1-2013') # there is override variable in run method for this @@ -169,7 +159,8 @@ def energyPlusOutputRequests(runner, user_arguments) result = OpenStudio::IdfObjectVector.new # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, @model, user_arguments, arguments) + args = runner.getArgumentValues(arguments, user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] unless args return false end @@ -231,7 +222,8 @@ def run(runner, user_arguments) climateZones.setClimateZone('ASHRAE', cz) # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, @model, user_arguments, arguments) + args = runner.getArgumentValues(arguments, user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] unless args return false end @@ -246,7 +238,8 @@ def run(runner, user_arguments) if args['use_upstream_args'] == true args.each do |arg, value| next if arg == 'use_upstream_args' # this argument should not be changed - value_from_osw = OsLib_HelperMethods.check_upstream_measure_for_arg(runner, arg) + value_from_osw = runner.getPastStepValuesForName(arg) + value_from_osw = value_from_osw.collect{ |k, v| Hash[:measure_name => k, :value => v] }.first if !value_from_osw.empty? if !value_from_osw.empty? runner.registerInfo("Replacing argument named #{arg} from current measure with a value of #{value_from_osw[:value]} from #{value_from_osw[:measure_name]}.") new_val = value_from_osw[:value] diff --git a/lib/measures/generic_qaqc/measure.xml b/lib/measures/generic_qaqc/measure.xml index 6a49e0e5..2be3cf71 100644 --- a/lib/measures/generic_qaqc/measure.xml +++ b/lib/measures/generic_qaqc/measure.xml @@ -3,8 +3,8 @@ 3.1 generic_qaqc d58d6b29-69ba-4915-b907-3c2c37ddb7c7 - 4a9ad832-316a-4d46-a2fb-36bb05afbefe - 2023-11-28T23:01:11Z + 30314b23-6e89-4672-ae78-4be112a7e2b4 + 2024-07-11T14:32:09Z 0A3BF61C GenericQAQC Generic QAQC @@ -506,18 +506,18 @@ OpenStudio 2.0.0 - 3.1.0 + 3.8.0 measure.rb rb script - 248589A4 + C631FD2F check_air_sys_temps.rb rb resource - A4C95CA9 + 3B5F8121 check_calibration.rb @@ -535,13 +535,13 @@ check_domestic_hot_water.rb rb resource - 58169778 + 29505A2B check_envelope_conductance.rb rb resource - 7DBD6363 + 192010AD check_eui_by_end_use.rb @@ -565,7 +565,7 @@ check_internal_loads.rb rb resource - 2343A7BE + 874EBD06 check_mech_sys_capacity.rb @@ -589,7 +589,7 @@ check_mech_sys_type.rb rb resource - E20ED4B4 + 2CE1AFFF check_part_loads.rb @@ -613,7 +613,7 @@ check_plant_temps.rb rb resource - DDA087A9 + B171C6AE check_plenum_loads.rb @@ -637,7 +637,7 @@ check_schedules.rb rb resource - 6DADD274 + 47BA3DD4 check_simultaneous_heating_and_cooling.rb @@ -649,7 +649,7 @@ check_supply_air_and_thermostat_temp_difference.rb rb resource - 3C95B9EE + 824F4D82 check_weather_files.rb @@ -673,7 +673,7 @@ report.html.erb erb resource - 41C02D76 + FF1CBF19 0422_test_b_sm_off.osm diff --git a/lib/measures/generic_qaqc/resources/check_air_sys_temps.rb b/lib/measures/generic_qaqc/resources/check_air_sys_temps.rb index 15d17488..0e3e1a1e 100644 --- a/lib/measures/generic_qaqc/resources/check_air_sys_temps.rb +++ b/lib/measures/generic_qaqc/resources/check_air_sys_temps.rb @@ -100,8 +100,8 @@ def check_air_sys_temps(category, target_standard, max_sizing_temp_delta = 0.1, when 'OS_SetpointManager_Scheduled' sch = spm.to_SetpointManagerScheduled.get.schedule if sch.to_ScheduleRuleset.is_initialized - min_c = std.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['min'] - max_c = std.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['max'] + min_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['min'] + max_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['max'] elsif sch.to_ScheduleConstant.is_initialized min_c = std.schedule_constant_annual_min_max_value(sch.to_ScheduleConstant.get)['min'] max_c = std.schedule_constant_annual_min_max_value(sch.to_ScheduleConstant.get)['max'] diff --git a/lib/measures/generic_qaqc/resources/check_domestic_hot_water.rb b/lib/measures/generic_qaqc/resources/check_domestic_hot_water.rb index c58205c9..b5f1116f 100644 --- a/lib/measures/generic_qaqc/resources/check_domestic_hot_water.rb +++ b/lib/measures/generic_qaqc/resources/check_domestic_hot_water.rb @@ -61,13 +61,13 @@ def check_domestic_hot_water(category, target_standard, min_pass, max_pass, name if use_old_gem_code annual_equiv_flow_rate = schedule_inst.to_ScheduleRuleset.get.annual_equivalent_full_load_hrs else - annual_equiv_flow_rate = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_inst.to_ScheduleRuleset.get) + annual_equiv_flow_rate = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_inst.to_ScheduleRuleset.get) end elsif schedule_inst.to_ScheduleConstant.is_initialized if use_old_gem_code annual_equiv_flow_rate = schedule_inst.to_ScheduleConstant.get.annual_equivalent_full_load_hrs else - annual_equiv_flow_rate = std.schedule_constant_annual_equivalent_full_load_hrs(schedule_inst.to_ScheduleConstant.get) + annual_equiv_flow_rate = OpenstudioStandards::Schedules.schedule_constant_get_equivalent_full_load_hours(schedule_inst.to_ScheduleConstant.get) end else check_elems << OpenStudio::Attribute.new('flag', "#{schedule_inst.name} isn't a Ruleset or Constant schedule. Can't calculate annual equivalent full load hours.") @@ -139,7 +139,7 @@ def check_domestic_hot_water(category, target_standard, min_pass, max_pass, name if use_old_gem_code annual_equiv_flow_rate = inst_schedule.to_ScheduleRuleset.get.annual_equivalent_full_load_hrs else - annual_equiv_flow_rate = std.schedule_ruleset_annual_equivalent_full_load_hrs(inst_schedule.to_ScheduleRuleset.get) + annual_equiv_flow_rate = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(inst_schedule.to_ScheduleRuleset.get) end elsif inst_schedule.to_ScheduleConstant.is_initialized if use_old_gem_code @@ -241,7 +241,7 @@ def check_domestic_hot_water(category, target_standard, min_pass, max_pass, name if use_old_gem_code annual_equiv_flow_rate = inst_schedule.to_ScheduleRuleset.get.annual_equivalent_full_load_hrs else - annual_equiv_flow_rate = std.schedule_ruleset_annual_equivalent_full_load_hrs(inst_schedule.to_ScheduleRuleset.get) + annual_equiv_flow_rate = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(inst_schedule.to_ScheduleRuleset.get) end elsif inst_schedule.to_ScheduleConstant.is_initialized if use_old_gem_code diff --git a/lib/measures/generic_qaqc/resources/check_envelope_conductance.rb b/lib/measures/generic_qaqc/resources/check_envelope_conductance.rb index 082be8d9..ad10b901 100644 --- a/lib/measures/generic_qaqc/resources/check_envelope_conductance.rb +++ b/lib/measures/generic_qaqc/resources/check_envelope_conductance.rb @@ -276,7 +276,7 @@ def check_envelope_conductance(category, target_standard, min_pass, max_pass, na construction_type = surface_detail[:construction_type] next if boundary_condition.to_s != 'Outdoors' - film_coefficients_r_value = std.film_coefficients_r_value(intended_surface_type, includes_int_film = true, includes_ext_film = true) + film_coefficients_r_value = OpenstudioStandards::Constructions.film_coefficients_r_value(intended_surface_type, includes_int_film = true, includes_ext_film = true) thermal_conductance = surface_detail[:construction].thermalConductance.get r_value_with_film = 1 / thermal_conductance + film_coefficients_r_value source_units = 'm^2*K/W' @@ -321,9 +321,11 @@ def check_envelope_conductance(category, target_standard, min_pass, max_pass, na # check for non opaque sub surfaces source_units = 'W/m^2*K' target_units = 'Btu/ft^2*h*R' - u_factor_si = std.construction_calculated_u_factor(sub_surface_detail[:construction].to_LayeredConstruction.get.to_Construction.get) + surface_construction = sub_surface_detail[:construction].to_LayeredConstruction.get + u_factor_si = OpenstudioStandards::Constructions.construction_get_conductance(surface_construction) u_factor_ip = OpenStudio.convert(u_factor_si, source_units, target_units).get - shgc = std.construction_calculated_solar_heat_gain_coefficient(sub_surface_detail[:construction].to_LayeredConstruction.get.to_Construction.get) + shgc = OpenstudioStandards::Constructions.construction_get_solar_transmittance(sub_surface_detail[:construction].to_LayeredConstruction.get) + intended_surface_type = sub_surface_detail[:surface_type] construction_type = sub_surface_detail[:construction_type] const_bldg_cat = sub_surface_detail[:const_bldg_cat] @@ -363,7 +365,7 @@ def check_envelope_conductance(category, target_standard, min_pass, max_pass, na intended_surface_type = sub_surface_detail[:surface_type] construction_type = sub_surface_detail[:construction_type] next if boundary_condition.to_s != 'Outdoors' - film_coefficients_r_value = std.film_coefficients_r_value(intended_surface_type, includes_int_film = true, includes_ext_film = true) + film_coefficients_r_value = OpenstudioStandards::Constructions.film_coefficients_r_value(intended_surface_type, includes_int_film = true, includes_ext_film = true) thermal_conductance = sub_surface_detail[:construction].thermalConductance.get r_value_with_film = 1 / thermal_conductance + film_coefficients_r_value @@ -458,7 +460,7 @@ def check_envelope_conductance(category, target_standard, min_pass, max_pass, na boundary_condition = surface_detail[:boundary_condition] intended_surface_type = surface_detail[:surface_type] construction_type = surface_detail[:construction_type] - film_coefficients_r_value = std.film_coefficients_r_value(intended_surface_type, includes_int_film = true, includes_ext_film = true) + film_coefficients_r_value = OpenstudioStandards::Constructions.film_coefficients_r_value(intended_surface_type, includes_int_film = true, includes_ext_film = true) thermal_conductance = surface_detail[:construction].thermalConductance.get r_value_with_film = 1 / thermal_conductance + film_coefficients_r_value diff --git a/lib/measures/generic_qaqc/resources/check_internal_loads.rb b/lib/measures/generic_qaqc/resources/check_internal_loads.rb index 213d211a..43bf0fd7 100644 --- a/lib/measures/generic_qaqc/resources/check_internal_loads.rb +++ b/lib/measures/generic_qaqc/resources/check_internal_loads.rb @@ -171,7 +171,7 @@ def check_internal_loads(category, target_standard, min_pass, max_pass, name_onl # skip if all spaces using this space type are plenums all_spaces_plenums = true space_type.spaces.each do |space| - if !std.space_plenum?(space) + if !OpenstudioStandards::Space.space_plenum?(space) all_spaces_plenums = false next end @@ -339,7 +339,7 @@ def check_internal_loads(category, target_standard, min_pass, max_pass, name_onl # warn if there are spaces in model that don't use space type unless they appear to be plenums @model.getSpaces.each do |space| - next if std.space_plenum?(space) + next if OpenstudioStandards::Space.space_plenum?(space) if !space.spaceType.is_initialized check_elems << OpenStudio::Attribute.new('flag', "#{space.name} doesn't have a space type assigned, can't validate internal loads.") diff --git a/lib/measures/generic_qaqc/resources/check_mech_sys_type.rb b/lib/measures/generic_qaqc/resources/check_mech_sys_type.rb index 5f9267e1..27433969 100644 --- a/lib/measures/generic_qaqc/resources/check_mech_sys_type.rb +++ b/lib/measures/generic_qaqc/resources/check_mech_sys_type.rb @@ -78,7 +78,7 @@ def check_mech_sys_type(category, target_standard, name_only = false) is_plenum = true end else - if std.space_plenum?(space) + if OpenstudioStandards::Space.space_plenum?(space) is_plenum = true end end diff --git a/lib/measures/generic_qaqc/resources/check_plant_temps.rb b/lib/measures/generic_qaqc/resources/check_plant_temps.rb index 0de8a578..72f45250 100644 --- a/lib/measures/generic_qaqc/resources/check_plant_temps.rb +++ b/lib/measures/generic_qaqc/resources/check_plant_temps.rb @@ -43,8 +43,8 @@ def check_plant_temps(category, target_standard, max_sizing_temp_delta = 0.1, na when 'OS_SetpointManager_Scheduled' sch = spm.to_SetpointManagerScheduled.get.schedule if sch.to_ScheduleRuleset.is_initialized - min_c = std.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['min'] - max_c = std.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['max'] + min_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['min'] + max_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(sch.to_ScheduleRuleset.get)['max'] elsif sch.to_ScheduleConstant.is_initialized min_c = std.schedule_constant_annual_min_max_value(sch.to_ScheduleConstant.get)['min'] max_c = std.schedule_constant_annual_min_max_value(sch.to_ScheduleConstant.get)['max'] @@ -60,8 +60,8 @@ def check_plant_temps(category, target_standard, max_sizing_temp_delta = 0.1, na next if low_sch.empty? low_sch = low_sch.get if low_sch.to_ScheduleRuleset.is_initialized - min_c = std.schedule_ruleset_annual_min_max_value(low_sch.to_ScheduleRuleset.get)['min'] - max_c = std.schedule_ruleset_annual_min_max_value(low_sch.to_ScheduleRuleset.get)['max'] + min_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(low_sch.to_ScheduleRuleset.get)['min'] + max_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(low_sch.to_ScheduleRuleset.get)['max'] elsif low_sch.to_ScheduleConstant.is_initialized min_c = std.schedule_constant_annual_min_max_value(low_sch.to_ScheduleConstant.get)['min'] max_c = std.schedule_constant_annual_min_max_value(low_sch.to_ScheduleConstant.get)['max'] @@ -74,8 +74,8 @@ def check_plant_temps(category, target_standard, max_sizing_temp_delta = 0.1, na next if high_sch.empty? high_sch = high_sch.get if high_sch.to_ScheduleRuleset.is_initialized - min_c = std.schedule_ruleset_annual_min_max_value(high_sch.to_ScheduleRuleset.get)['min'] - max_c = std.schedule_ruleset_annual_min_max_value(high_sch.to_ScheduleRuleset.get)['max'] + min_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(high_sch.to_ScheduleRuleset.get)['min'] + max_c = openstudiostandards::schedules.schedule_ruleset_annual_min_max_value(high_sch.to_ScheduleRuleset.get)['max'] elsif high_sch.to_ScheduleConstant.is_initialized min_c = std.schedule_constant_annual_min_max_value(high_sch.to_ScheduleConstant.get)['min'] max_c = std.schedule_constant_annual_min_max_value(high_sch.to_ScheduleConstant.get)['max'] diff --git a/lib/measures/generic_qaqc/resources/check_schedules.rb b/lib/measures/generic_qaqc/resources/check_schedules.rb index 18aa5e78..95373045 100644 --- a/lib/measures/generic_qaqc/resources/check_schedules.rb +++ b/lib/measures/generic_qaqc/resources/check_schedules.rb @@ -66,7 +66,7 @@ def check_schedules(category, target_standard, min_pass, max_pass, name_only = f # skip if all spaces using this space type are plenums all_spaces_plenums = true space_type.spaces.each do |space| - if !std.space_plenum?(space) + if !OpenstudioStandards::Space.space_plenum?(space) all_spaces_plenums = false next end @@ -90,7 +90,7 @@ def check_schedules(category, target_standard, min_pass, max_pass, name_only = f check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['lighting_schedule']} in standards json.") else # loop through and test individual load instances - target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get) + target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get) space_type.lights.each do |load_inst| inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard) if inst_sch_check then check_elems << inst_sch_check end @@ -107,7 +107,7 @@ def check_schedules(category, target_standard, min_pass, max_pass, name_only = f check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['electric_equipment_schedule']} in standards json.") else # loop through and test individual load instances - target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get) + target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get) space_type.electricEquipment.each do |load_inst| inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard) @@ -125,7 +125,7 @@ def check_schedules(category, target_standard, min_pass, max_pass, name_only = f check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['gas_equipment_schedule']} in standards json.") else # loop through and test individual load instances - target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get) + target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get) space_type.gasEquipment.each do |load_inst| inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard) if inst_sch_check then check_elems << inst_sch_check end @@ -141,7 +141,7 @@ def check_schedules(category, target_standard, min_pass, max_pass, name_only = f check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['occupancy_schedule']} in standards json.") else # loop through and test individual load instances - target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get) + target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get) space_type.people.each do |load_inst| inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard) if inst_sch_check then check_elems << inst_sch_check end @@ -182,7 +182,7 @@ def check_schedules(category, target_standard, min_pass, max_pass, name_only = f # warn if there are spaces in model that don't use space type unless they appear to be plenums @model.getSpaces.each do |space| - next if std.space_plenum?(space) + next if OpenstudioStandards::Space.space_plenum?(space) if !space.spaceType.is_initialized check_elems << OpenStudio::Attribute.new('flag', "#{space.name} doesn't have a space type assigned, can't validate schedules.") end @@ -234,7 +234,7 @@ def generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, ch # get annual equiv for model schedule if schedule_inst.to_ScheduleRuleset.is_initialized - inst_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_inst.to_ScheduleRuleset.get) + inst_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_inst.to_ScheduleRuleset.get) elsif schedule_inst.to_ScheduleConstant.is_initialized inst_hrs = std.schedule_constant_annual_equivalent_full_load_hrs(schedule_inst.to_ScheduleConstant.get) else diff --git a/lib/measures/generic_qaqc/resources/check_supply_air_and_thermostat_temp_difference.rb b/lib/measures/generic_qaqc/resources/check_supply_air_and_thermostat_temp_difference.rb index 7528f7f4..c9cde0f3 100644 --- a/lib/measures/generic_qaqc/resources/check_supply_air_and_thermostat_temp_difference.rb +++ b/lib/measures/generic_qaqc/resources/check_supply_air_and_thermostat_temp_difference.rb @@ -60,17 +60,20 @@ def check_supply_air_and_thermostat_temp_difference(category, target_standard, m if use_old_gem_code schedule_values = clg_sch.to_ScheduleRuleset.get.annual_min_max_value else - schedule_values = std.schedule_ruleset_annual_min_max_value(clg_sch.to_ScheduleRuleset.get) + schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(clg_sch) end elsif clg_sch.to_ScheduleConstant.is_initialized if use_old_gem_code schedule_values = clg_sch.to_ScheduleConstant.get.annual_min_max_value else - schedule_values = std.schedule_constant_annual_min_max_value(clg_sch.to_ScheduleConstant.get) + schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(clg_sch) end end unless schedule_values.nil? + puts "hello1" + puts schedule_values + puts "hello2" model_clg_min = schedule_values['min'] end end diff --git a/lib/measures/generic_qaqc/resources/report.html.erb b/lib/measures/generic_qaqc/resources/report.html.erb index 554d794c..401337d8 100644 --- a/lib/measures/generic_qaqc/resources/report.html.erb +++ b/lib/measures/generic_qaqc/resources/report.html.erb @@ -23,6 +23,7 @@ + diff --git a/lib/measures/get_site_from_building_component_library/measure.rb b/lib/measures/get_site_from_building_component_library/measure.rb index 8b348952..b3ae3cb8 100644 --- a/lib/measures/get_site_from_building_component_library/measure.rb +++ b/lib/measures/get_site_from_building_component_library/measure.rb @@ -6,14 +6,8 @@ # see the URL below for information on how to write OpenStudio measures # http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/ -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' - # start the measure class GetSiteFromBuildingComponentLibrary < OpenStudio::Measure::ModelMeasure - # resource file modules - include OsLib_HelperMethods # human readable name def name @@ -56,14 +50,16 @@ def run(model, runner, user_arguments) super(model, runner, user_arguments) # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model)) + args = runner.getArgumentValues(arguments(model), user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] if !args then return false end # lookup and replace argument values from upstream measures if args['use_upstream_args'] == true args.each do |arg, value| next if arg == 'use_upstream_args' # this argument should not be changed - value_from_osw = OsLib_HelperMethods.check_upstream_measure_for_arg(runner, arg) + value_from_osw = runner.getPastStepValuesForName(arg) + value_from_osw = value_from_osw.collect{ |k, v| Hash[:measure_name => k, :value => v] }.first if !value_from_osw.empty? if !value_from_osw.empty? runner.registerInfo("Replacing argument named #{arg} from current measure with a value of #{value_from_osw[:value]} from #{value_from_osw[:measure_name]}.") new_val = value_from_osw[:value] diff --git a/lib/measures/get_site_from_building_component_library/measure.xml b/lib/measures/get_site_from_building_component_library/measure.xml index 13d6234f..c791a66b 100644 --- a/lib/measures/get_site_from_building_component_library/measure.xml +++ b/lib/measures/get_site_from_building_component_library/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 get_site_from_building_component_library a6dff045-6f62-4288-a3f0-a5549f4c292a - 6cfdd1c0-eae5-4eba-b422-fde5d082ee4c - 20221115T223607Z + aa3db6e6-f8bf-492f-9fcd-b2c8750c4352 + 2024-07-11T14:32:10Z 99E7000D GetSiteFromBuildingComponentLibrary Get Site from Building Component Library @@ -94,10 +94,16 @@ - example_model.osm - osm - test - C4F35230 + LICENSE.md + md + license + BFFB1AA6 + + + README.md + md + readme + FAAFE9B7 README.md.erb @@ -106,39 +112,33 @@ 703C9964 - README.md - md - readme - FAAFE9B7 + + OpenStudio + 2.0.0 + 3.8.0 + + measure.rb + rb + script + 4D81272B bcl_api_test.rb rb test - 9EE93012 + 1CD9B490 - LICENSE.md - md - license - 64FFEBDE + example_model.osm + osm + test + C4F35230 get_site_from_building_component_library_test.rb rb test - F5BB0628 - - - - OpenStudio - 2.0.0 - 2.8.0 - - measure.rb - rb - script - 3FBDCCAF + AE95604F diff --git a/lib/measures/hvac_psychrometric_chart/measure.xml b/lib/measures/hvac_psychrometric_chart/measure.xml index 01ee953e..538cf6f2 100644 --- a/lib/measures/hvac_psychrometric_chart/measure.xml +++ b/lib/measures/hvac_psychrometric_chart/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 hvac_psychrometric_chart 97213780-0727-4462-8ec0-9a6c3e475cd6 - dad1d895-c678-4bb4-879d-3eae5fded9d3 - 20221115T224202Z + b6eca7ed-6047-4a27-9190-773f8e670e5c + 2024-07-11T14:32:02Z F657B621 HVACPsychrometricChart HVAC Psychrometric Chart @@ -44,22 +44,10 @@ - model_test.osm - osm - test - 34E3E58A - - - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -68,10 +56,10 @@ 3DE900D7 - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -82,19 +70,31 @@ measure.rb rb script - 7C4C392E + E80959ED + + + report.html.erb + erb + resource + FB03153C + + + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 hvac_psychrometric_chart_test.rb rb test - CE7469B8 + 8046D052 - report.html.erb - erb - resource - 3DE4D1D8 + model_test.osm + osm + test + 34E3E58A diff --git a/lib/measures/hvac_psychrometric_chart/resources/report.html.erb b/lib/measures/hvac_psychrometric_chart/resources/report.html.erb index b392e1fd..3eb11e93 100644 --- a/lib/measures/hvac_psychrometric_chart/resources/report.html.erb +++ b/lib/measures/hvac_psychrometric_chart/resources/report.html.erb @@ -23,6 +23,7 @@ + diff --git a/lib/measures/inject_idf_objects/measure.xml b/lib/measures/inject_idf_objects/measure.xml index 3ef21ad8..d367b131 100644 --- a/lib/measures/inject_idf_objects/measure.xml +++ b/lib/measures/inject_idf_objects/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 inject_idf_objects f567dfbc-d280-4d68-b061-019ab2630cd0 - d5c3cd4a-e663-4bb7-bb6c-e0f0cddbead9 - 20221115T223603Z + fad67fa1-ef05-4eea-bb44-8552e20c1a4c + 2024-07-11T14:32:07Z A8BAB05F InjectIDFObjects Inject IDF Objects @@ -61,28 +61,10 @@ This measure works for when you just need to add new IDF objects. If you need to - EnvelopeAndLoadTestModel_01.osm - osm - test - E11F67BD - - - Example B - BlockEnergyCharge.idf - idf - test - F90DD242 - - - model_test.osw - osw - test - F5FABCCF - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -91,10 +73,10 @@ This measure works for when you just need to add new IDF objects. If you need to 3D0882F2 - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -105,13 +87,31 @@ This measure works for when you just need to add new IDF objects. If you need to measure.rb rb script - 7BDE3C9B + AC4140F5 + + + EnvelopeAndLoadTestModel_01.osm + osm + test + E11F67BD + + + Example B - BlockEnergyCharge.idf + idf + test + F90DD242 measure_Test.rb rb test - B0776CD6 + 88C69467 + + + model_test.osw + osw + test + F5FABCCF diff --git a/lib/measures/openstudio_results/measure.rb b/lib/measures/openstudio_results/measure.rb index e2927e49..5d23131d 100644 --- a/lib/measures/openstudio_results/measure.rb +++ b/lib/measures/openstudio_results/measure.rb @@ -6,11 +6,6 @@ require 'erb' require 'json' -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_schedules' -require 'openstudio/extension/core/os_lib_helper_methods' - # load local resources require "#{File.dirname(__FILE__)}/resources/os_lib_reporting" require_relative 'resources/Siz.Model' @@ -213,7 +208,8 @@ def run(runner, user_arguments) web_asset_path = setup[:web_asset_path] # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments) + args = runner.getArgumentValues(arguments, user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] unless args return false end diff --git a/lib/measures/openstudio_results/measure.xml b/lib/measures/openstudio_results/measure.xml index f5c0d5ed..8f9a9b9b 100644 --- a/lib/measures/openstudio_results/measure.xml +++ b/lib/measures/openstudio_results/measure.xml @@ -3,8 +3,8 @@ 3.1 openstudio_results a25386cd-60e4-46bc-8b11-c755f379d916 - d45ffbf1-e76f-4e04-9de4-effdf2f0f410 - 2024-04-04T16:21:33Z + 5b4d387a-f537-4693-a9eb-6192957b6c1b + 2024-07-11T14:31:57Z 557BF06F OpenStudioResults OpenStudio Results @@ -618,12 +618,12 @@ OpenStudio 2.0.0 - 3.1.0 + 3.8.0 measure.rb rb script - 120E71D7 + 477BD96D Siz.AirConditionerVariableRefrigerantFlow.rb @@ -1397,13 +1397,13 @@ os_lib_reporting.rb rb resource - C18C8EF3 + 2B4F256F report.html.erb erb resource - CCE600FF + 945F4BD1 1004_SmallHotel_a.osm diff --git a/lib/measures/openstudio_results/resources/os_lib_reporting.rb b/lib/measures/openstudio_results/resources/os_lib_reporting.rb index 7ba7245b..653395b5 100644 --- a/lib/measures/openstudio_results/resources/os_lib_reporting.rb +++ b/lib/measures/openstudio_results/resources/os_lib_reporting.rb @@ -981,7 +981,7 @@ def self.spm_logic(component, is_ip_units) # Constrol type and temperature range setpoint = component.to_SetpointManagerScheduled.get supply_air_temp_schedule = setpoint.schedule - schedule_values = OsLib_Schedules.getMinMaxAnnualProfileValue(component.model, supply_air_temp_schedule) + schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(supply_air_temp_schedule) if schedule_values.nil? schedule_values_pretty = "can't inspect schedule" target_units = '' @@ -1229,14 +1229,14 @@ def self.air_loops_detail_section(model, sqlFile, runner, name_only = false, is_ if thermal_zone.thermostatSetpointDualSetpoint.is_initialized thermostat = thermal_zone.thermostatSetpointDualSetpoint.get if thermostat.coolingSetpointTemperatureSchedule.is_initialized - schedule_values = OsLib_Schedules.getMinMaxAnnualProfileValue(model, thermostat.coolingSetpointTemperatureSchedule.get) + schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(thermostat.coolingSetpointTemperatureSchedule.get) unless schedule_values.nil? cooling_temp_ranges << schedule_values['min'] cooling_temp_ranges << schedule_values['max'] end end if thermostat.heatingSetpointTemperatureSchedule.is_initialized - schedule_values = OsLib_Schedules.getMinMaxAnnualProfileValue(model, thermostat.heatingSetpointTemperatureSchedule.get) + schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(thermostat.heatingSetpointTemperatureSchedule.get) unless schedule_values.nil? heating_temps_ranges << schedule_values['min'] heating_temps_ranges << schedule_values['max'] @@ -1716,19 +1716,20 @@ def self.envelope_section_section(model, sqlFile, runner, name_only = false, is_ if use_old_gem_code shgc = construction_root.calculated_solar_heat_gain_coefficient else - shgc = std.construction_calculated_solar_heat_gain_coefficient(construction_root) + shgc = OpenstudioStandards::Constructions.construction_get_solar_transmittance(construction_root) end shgc_neat = OpenStudio.toNeatString(shgc, n_decimals_rvalue, false) if use_old_gem_code vlt = construction_root.calculated_visible_transmittance else - vlt = std.construction_calculated_visible_transmittance(construction_root) + vlt = OpenstudioStandards::Constructions.construction_get_visible_transmittance(construction_root) end vlt_neat = OpenStudio.toNeatString(vlt, n_decimals_rvalue, false) if use_old_gem_code u_factor = construction_root.calculated_u_factor else - u_factor = std.construction_calculated_u_factor(construction_root) + surface_construction = construction_root.to_LayeredConstruction.get + u_factor = OpenstudioStandards::Constructions.construction_get_conductance(surface_construction) end ufactor_conv = OpenStudio.convert(u_factor, source_ufactor_units, target_ufactor_units).get ufactor_neat = OpenStudio.toNeatString(ufactor_conv, n_decimals_rvalue, false) @@ -1869,7 +1870,7 @@ def self.water_use_section(model, sqlFile, runner, name_only = false, is_ip_unit peak_flow_rate_neat = OpenStudio.toNeatString(peak_flow_rate_conv, n_decimals, true) if water_use_equipment_def.targetTemperatureSchedule.is_initialized target_temp_sch = water_use_equipment_def.targetTemperatureSchedule.get - schedule_values = OsLib_Schedules.getMinMaxAnnualProfileValue(model, target_temp_sch) + schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(target_temp_sch) if !schedule_values.nil? min_conv = OpenStudio.convert(schedule_values['min'], source_units_temp, target_units_temp).get max_conv = OpenStudio.convert(schedule_values['max'], source_units_temp, target_units_temp).get diff --git a/lib/measures/openstudio_results/resources/report.html.erb b/lib/measures/openstudio_results/resources/report.html.erb index 1fda0c19..e14308a0 100644 --- a/lib/measures/openstudio_results/resources/report.html.erb +++ b/lib/measures/openstudio_results/resources/report.html.erb @@ -23,6 +23,7 @@ + diff --git a/lib/measures/remove_orphan_objects_and_unused_resources/measure.xml b/lib/measures/remove_orphan_objects_and_unused_resources/measure.xml index e51ceb50..9b383705 100644 --- a/lib/measures/remove_orphan_objects_and_unused_resources/measure.xml +++ b/lib/measures/remove_orphan_objects_and_unused_resources/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 remove_orphan_objects_and_unused_resources c618f299-a245-49ce-a119-82eb54007ede - cbd91dc6-4e6b-4db6-96e4-25f290510e41 - 20230607T052232Z + 65cd4e9a-d035-423a-8a58-853a318d2cab + 2024-07-11T14:32:07Z 28AD5222 RemoveOrphanObjectsAndUnusedResources Remove Orphan Objects and Unused Resources @@ -143,16 +143,10 @@ A second functionality is to remove unused resources. This will include things l - README.md.erb - erb - readmeerb - 703C9964 - - - 1125_infil_test_a.osm - osm - test - E8A821F1 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -161,16 +155,10 @@ A second functionality is to remove unused resources. This will include things l 3D163369 - LICENSE.md - md - license - 64FFEBDE - - - remove_orphan_objects_and_unused_resources_test.rb - rb - test - A54B8567 + README.md.erb + erb + readmeerb + 703C9964 @@ -181,7 +169,19 @@ A second functionality is to remove unused resources. This will include things l measure.rb rb script - 0B14129B + F3D52604 + + + 1125_infil_test_a.osm + osm + test + E8A821F1 + + + remove_orphan_objects_and_unused_resources_test.rb + rb + test + 931450B4 diff --git a/lib/measures/set_electric_equipment_loads_by_epd/measure.xml b/lib/measures/set_electric_equipment_loads_by_epd/measure.xml index 598d39e7..4e4cf3cd 100644 --- a/lib/measures/set_electric_equipment_loads_by_epd/measure.xml +++ b/lib/measures/set_electric_equipment_loads_by_epd/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_electric_equipment_loads_by_epd b1d87b95-a6d1-4999-bd0d-16da879f4340 - 82ce2fa6-e066-4dd0-adba-9b7338ed0757 - 20221115T223601Z + fbf62617-296b-4029-a917-c02257c9aab9 + 2024-07-11T14:32:05Z 5C8B3381 SetElectricEquipmentLoadsByEPD Set Electric Equipment loads by EPD @@ -17,10 +17,10 @@ Choice true false - {5d06cf57-89f9-4476-9475-68e081eb0d61} + {f4294201-a0fb-4eb7-b0f7-3fc09b56f7af} - {5d06cf57-89f9-4476-9475-68e081eb0d61} + {f4294201-a0fb-4eb7-b0f7-3fc09b56f7af} *Entire Building* @@ -147,28 +147,10 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - 10AA8866 - - - EnvelopeAndLoadTestModel_01_Costed.osm - osm - test - E025B7B3 - - - HasSpaceWithNoLightsOrElec.osm - osm - test - ECE1D347 - - - README.md.erb - erb - readmeerb - 232D0477 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -177,10 +159,10 @@ 14295EFE - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 232D0477 @@ -191,13 +173,31 @@ measure.rb rb script - EDD3B2FC + 788F4CF4 + + + EnvelopeAndLoadTestModel_01.osm + osm + test + 10AA8866 + + + EnvelopeAndLoadTestModel_01_Costed.osm + osm + test + E025B7B3 + + + HasSpaceWithNoLightsOrElec.osm + osm + test + ECE1D347 ReplaceElectricEquipmentWithEPD_Test.rb rb test - FF9A3A76 + C46B576F diff --git a/lib/measures/set_exterior_walls_and_floors_to_adiabatic/measure.xml b/lib/measures/set_exterior_walls_and_floors_to_adiabatic/measure.xml index 11018d25..a7c364ce 100644 --- a/lib/measures/set_exterior_walls_and_floors_to_adiabatic/measure.xml +++ b/lib/measures/set_exterior_walls_and_floors_to_adiabatic/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_exterior_walls_and_floors_to_adiabatic 63c7f9ba-8c85-4545-bbc0-d25babefb2c3 - 28a72ec3-8d49-48a7-a3e5-8cc15104bfc1 - 20221115T223609Z + 96e176fc-804c-4b94-adf4-ed9025bf5006 + 2024-07-11T14:32:13Z 5091078B SetExteriorWallsAndFloorsToAdiabatic Set Exterior Walls and Floors to Adiabatic @@ -175,16 +175,10 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - 10AA8866 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -199,10 +193,10 @@ 610E0A71 - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -213,13 +207,19 @@ measure.rb rb script - 2B7A488B + A19F261F + + + EnvelopeAndLoadTestModel_01.osm + osm + test + 10AA8866 set_exterior_walls_and_floors_to_adiabatic_Test.rb rb test - 36075FAD + 04DFF2A7 diff --git a/lib/measures/set_run_period/measure.xml b/lib/measures/set_run_period/measure.xml index 20358b79..5be729b9 100644 --- a/lib/measures/set_run_period/measure.xml +++ b/lib/measures/set_run_period/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_run_period 7a84292a-3975-4ab3-9284-6edabcbe750b - d1d53adb-3d40-4dbc-8e2f-4e3c3773c88c - 20230607T052232Z + 82d0104a-be54-4950-a422-91974bd47ca2 + 2024-07-11T14:32:02Z 2AF3A68E SetRunPeriod SetRunPeriod @@ -65,16 +65,10 @@ - example_model.osm - osm - test - 53D14E69 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -83,10 +77,10 @@ 78FEB295 - LICENSE.md - md - license - 64FFEBDE + README.md.erb + erb + readmeerb + 703C9964 @@ -97,13 +91,19 @@ measure.rb rb script - 9D94DDA1 + 17444A8B + + + example_model.osm + osm + test + 53D14E69 set_run_period_test.rb rb test - 7E3C2540 + 2D1F3E78 diff --git a/lib/measures/set_space_infiltration_per_exterior_area/measure.xml b/lib/measures/set_space_infiltration_per_exterior_area/measure.xml index 6934b8ee..e57aaa09 100644 --- a/lib/measures/set_space_infiltration_per_exterior_area/measure.xml +++ b/lib/measures/set_space_infiltration_per_exterior_area/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 set_space_infiltration_per_exterior_area 9d796dd3-c5cf-475a-81aa-607d3ba9d143 - d942587f-3023-4de1-9650-e3b7c177912e - 20221115T223557Z + aaca8731-4a5e-451c-aadf-63f6812959b9 + 2024-07-11T14:32:01Z 19EEDBBB SetSpaceInfiltrationPerExteriorArea SetSpaceInfiltrationPerExteriorArea @@ -68,16 +68,10 @@ - example_model.osm - osm - test - 66DC88A9 - - - README.md.erb - erb - readmeerb - 232D0477 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -86,10 +80,10 @@ 03150193 - set_space_infiltration_per_exterior_area_test.rb - rb - test - 0FD1E996 + README.md.erb + erb + readmeerb + 232D0477 @@ -100,13 +94,19 @@ measure.rb rb script - 527549E6 + B2A906CB - LICENSE.md - md - license - 64FFEBDE + example_model.osm + osm + test + 66DC88A9 + + + set_space_infiltration_per_exterior_area_test.rb + rb + test + 43EB4027 diff --git a/lib/measures/shadow_calculation/measure.xml b/lib/measures/shadow_calculation/measure.xml index 42632f1b..7acd063e 100644 --- a/lib/measures/shadow_calculation/measure.xml +++ b/lib/measures/shadow_calculation/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 shadow_calculation d0699b19-862f-4b68-9ff0-58483c45e0e8 - 229f6ef2-2113-44d4-b09d-9854a106e2e4 - 20230607T052232Z + 97464874-7a15-4367-aee6-48b0f14cc6d5 + 2024-07-11T14:32:00Z D8922A73 ShadowCalculation Shadow Calculation @@ -142,10 +142,10 @@ - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -154,16 +154,10 @@ FD971AB1 - LICENSE.md - md - license - 1DA898F1 - - - shadow_calculation_test.rb - rb - test - 80599822 + README.md.erb + erb + readmeerb + 703C9964 @@ -174,7 +168,13 @@ measure.rb rb script - 669F70B9 + E581782E + + + shadow_calculation_test.rb + rb + test + 0869DA34 diff --git a/lib/measures/tariff_selection_block/measure.rb b/lib/measures/tariff_selection_block/measure.rb index 0825b39b..ee3a02f7 100644 --- a/lib/measures/tariff_selection_block/measure.rb +++ b/lib/measures/tariff_selection_block/measure.rb @@ -6,10 +6,6 @@ # see the URL below for information on how to write OpenStudio measures # http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/ -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' - # start the measure class TariffSelectionBlock < OpenStudio::Measure::EnergyPlusMeasure # human readable name @@ -104,7 +100,8 @@ def run(workspace, runner, user_arguments) super(workspace, runner, user_arguments) # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, workspace, user_arguments, arguments(workspace)) + args = runner.getArgumentValues(arguments(workspace), user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] if !args then return false end # make arrays out of comma separated string inputs diff --git a/lib/measures/tariff_selection_block/measure.xml b/lib/measures/tariff_selection_block/measure.xml index 5bfbfbac..4bca28bb 100644 --- a/lib/measures/tariff_selection_block/measure.xml +++ b/lib/measures/tariff_selection_block/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 tariff_selection_block 42e9f831-f39a-4709-a79b-41db49c94f8c - fcb9004a-5a1b-4e07-998e-de185ca38c01 - 20221115T223605Z + a32acde2-5c0b-4530-9c82-30042fc3e128 + 2024-07-11T14:32:08Z 92578CE8 TariffSelectionBlock Tariff Selection-Block @@ -234,16 +234,10 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - E11F67BD - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -252,27 +246,33 @@ F00D5166 - LICENSE.md - md - license - 64FFEBDE - - - tariff_selection_block_test.rb - rb - test - F2389F5F + README.md.erb + erb + readmeerb + 703C9964 OpenStudio 2.0.0 - 2.8.0 + 3.8.0 measure.rb rb script - 7C97D5C8 + 5685B81E + + + EnvelopeAndLoadTestModel_01.osm + osm + test + E11F67BD + + + tariff_selection_block_test.rb + rb + test + E9AF4144 diff --git a/lib/measures/tariff_selection_flat/measure.rb b/lib/measures/tariff_selection_flat/measure.rb index 4a36e7d0..c3ec369e 100644 --- a/lib/measures/tariff_selection_flat/measure.rb +++ b/lib/measures/tariff_selection_flat/measure.rb @@ -6,10 +6,6 @@ # see the URL below for information on how to write OpenStudio measures # http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/ -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' - # start the measure class TariffSelectionFlat < OpenStudio::Measure::EnergyPlusMeasure # human readable name @@ -108,7 +104,9 @@ def run(workspace, runner, user_arguments) super(workspace, runner, user_arguments) # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, workspace, user_arguments, arguments(workspace)) + args = runner.getArgumentValues(arguments(workspace), user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] + if !args then return false end # reporting initial condition of model diff --git a/lib/measures/tariff_selection_flat/measure.xml b/lib/measures/tariff_selection_flat/measure.xml index 5433de67..3daaa670 100644 --- a/lib/measures/tariff_selection_flat/measure.xml +++ b/lib/measures/tariff_selection_flat/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 tariff_selection_flat 539c3e8e-6c41-4f50-ac61-6cbbf1ee1b55 - 1fb9337b-b3e4-4ac8-a75d-57682714b063 - 20221115T223610Z + 30111c72-9467-4d48-92e9-084c1c3ebe44 + 2024-07-11T14:32:14Z FBDC6D11 TariffSelectionFlat Tariff Selection-Flat @@ -210,16 +210,10 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - E11F67BD - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -228,27 +222,33 @@ A6339B0D - LICENSE.md - md - license - 64FFEBDE - - - tariff_selection_flat_test.rb - rb - test - 9104949F + README.md.erb + erb + readmeerb + 703C9964 OpenStudio 2.0.0 - 2.8.0 + 3.8.0 measure.rb rb script - 0B3FD5BD + AE5AA325 + + + EnvelopeAndLoadTestModel_01.osm + osm + test + E11F67BD + + + tariff_selection_flat_test.rb + rb + test + 7DEEBDDA diff --git a/lib/measures/tariff_selection_generic/measure.rb b/lib/measures/tariff_selection_generic/measure.rb index 83d206bb..a5576f0b 100644 --- a/lib/measures/tariff_selection_generic/measure.rb +++ b/lib/measures/tariff_selection_generic/measure.rb @@ -6,10 +6,6 @@ # see the URL below for information on how to write OpenStuido measures # http://openstudio.nrel.gov/openstudio-measure-writing-guide -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' - # start the measure class TariffSelectionGeneric < OpenStudio::Measure::EnergyPlusMeasure # define the name that a user will see, this method may be deprecated as @@ -98,7 +94,8 @@ def arguments(workspace) def run(workspace, runner, user_arguments) super(workspace, runner, user_arguments) - args = OsLib_HelperMethods.createRunVariables(runner, workspace, user_arguments, arguments(workspace)) + args = runner.getArgumentValues(arguments(workspace), user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] if !args then return false end # reporting initial condition of model diff --git a/lib/measures/tariff_selection_generic/measure.xml b/lib/measures/tariff_selection_generic/measure.xml index 42c69cfe..18df8575 100644 --- a/lib/measures/tariff_selection_generic/measure.xml +++ b/lib/measures/tariff_selection_generic/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 tariff_selection_generic d65ae535-f0ea-4745-9f5b-8d42c7070741 - 9c549927-8229-4938-a80c-c006dd6f0f35 - 20221115T223609Z + 63aaf453-3f25-42e9-a02b-67b47b9664f2 + 2024-07-11T14:32:13Z 43564105 TariffSelectionGeneric Tariff Selection-Generic @@ -126,16 +126,33 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - E11F67BD + LICENSE.md + md + license + BFFB1AA6 - Example_E.idf - idf - resource - 98AC420A + README.md + md + readme + 27EC34FF + + + README.md.erb + erb + readmeerb + 703C9964 + + + + OpenStudio + 2.0.0 + 3.8.0 + + measure.rb + rb + script + 04E8B27F Example_A.idf @@ -161,6 +178,12 @@ resource DA5EBB8B + + Example_E.idf + idf + resource + 98AC420A + Example_F.idf idf @@ -179,12 +202,6 @@ resource 1F984D08 - - README.md.erb - erb - readmeerb - 703C9964 - FlatEnergyCharge-Gas.idf idf @@ -198,33 +215,16 @@ 8DAD6C69 - README.md - md - readme - 27EC34FF - - - LICENSE.md - md - license - 64FFEBDE + EnvelopeAndLoadTestModel_01.osm + osm + test + E11F67BD tariff_selection_generic_test.rb rb test - AB6A7B66 - - - - OpenStudio - 2.0.0 - 2.8.0 - - measure.rb - rb - script - AEAD3B25 + 1077D919 diff --git a/lib/measures/tariff_selection_time_and_date_dependant/measure.rb b/lib/measures/tariff_selection_time_and_date_dependant/measure.rb index a5f84aa6..f7a0d3bc 100644 --- a/lib/measures/tariff_selection_time_and_date_dependant/measure.rb +++ b/lib/measures/tariff_selection_time_and_date_dependant/measure.rb @@ -6,10 +6,6 @@ # see the URL below for information on how to write OpenStudio measures # http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/ -# load OpenStudio measure libraries from openstudio-extension gem -require 'openstudio-extension' -require 'openstudio/extension/core/os_lib_helper_methods' - # start the measure class TariffSelectionTimeAndDateDependant < OpenStudio::Measure::EnergyPlusMeasure # human readable name @@ -49,6 +45,8 @@ def arguments(workspace) summer_start_month.setDisplayName('Month Summer Begins') summer_start_month.setDescription('1-12') summer_start_month.setDefaultValue(5) + summer_start_month.setMinValue(1.0) + summer_start_month.setMaxValue(12.0) args << summer_start_month # adding argument for summer_start_day @@ -56,6 +54,8 @@ def arguments(workspace) summer_start_day.setDisplayName('Day Summer Begins') summer_start_day.setDescription('1-31') summer_start_day.setDefaultValue(1) + summer_start_day.setMinValue(1.0) + summer_start_day.setMaxValue(31.0) args << summer_start_day # adding argument for summer_end_month @@ -63,6 +63,8 @@ def arguments(workspace) summer_end_month.setDisplayName('Month Summer Ends') summer_end_month.setDescription('1-12') summer_end_month.setDefaultValue(9) + summer_end_month.setMinValue(1.0) + summer_end_month.setMaxValue(12.0) args << summer_end_month # adding argument for summer_end_day @@ -70,6 +72,8 @@ def arguments(workspace) summer_end_day.setDisplayName('Day Summer Ends') summer_end_day.setDescription('1-31') summer_end_day.setDefaultValue(1) + summer_end_day.setMinValue(1.0) + summer_end_day.setMaxValue(31.0) args << summer_end_day # adding argument for peak_start_hour @@ -77,6 +81,8 @@ def arguments(workspace) peak_start_hour.setDisplayName('Hour Peak Begins') peak_start_hour.setDescription('1-24') peak_start_hour.setDefaultValue(12) + peak_start_hour.setMinValue(0.0) + peak_start_hour.setMaxValue(24.0) args << peak_start_hour # adding argument for peak_end_hour @@ -84,6 +90,8 @@ def arguments(workspace) peak_end_hour.setDisplayName('Hour Peak Ends') peak_end_hour.setDescription('1-24') peak_end_hour.setDefaultValue(18) + peak_end_hour.setMinValue(0.0) + peak_end_hour.setMaxValue(24.0) args << peak_end_hour # adding argument for elec_rate_sum_peak @@ -163,20 +171,16 @@ def arguments(workspace) def run(workspace, runner, user_arguments) super(workspace, runner, user_arguments) + # use the built-in error checking + if !runner.validateUserArguments(arguments(workspace), user_arguments) + return false + end + # assign the user inputs to variables - args = OsLib_HelperMethods.createRunVariables(runner, workspace, user_arguments, arguments(workspace)) + args = runner.getArgumentValues(arguments(workspace), user_arguments) + args = Hash[args.collect{ |k, v| [k.to_s, v] }] if !args then return false end - # check expected values of double arguments - zero_24 = OsLib_HelperMethods.checkDoubleAndIntegerArguments(runner, user_arguments, 'min' => 0.0, 'max' => 24.0, 'min_eq_bool' => true, 'max_eq_bool' => true, 'arg_array' => ['peak_start_hour', 'peak_end_hour']) - one_31 = OsLib_HelperMethods.checkDoubleAndIntegerArguments(runner, user_arguments, 'min' => 1.0, 'max' => 31.0, 'min_eq_bool' => true, 'max_eq_bool' => true, 'arg_array' => ['summer_start_day', 'summer_end_day']) - one_12 = OsLib_HelperMethods.checkDoubleAndIntegerArguments(runner, user_arguments, 'min' => 1.0, 'max' => 12.0, 'min_eq_bool' => true, 'max_eq_bool' => true, 'arg_array' => ['summer_start_month', 'summer_end_month']) - - # return false if any errors fail - if !zero_24 then return false end - if !one_31 then return false end - if !one_12 then return false end - # reporting initial condition of model starting_tariffs = workspace.getObjectsByType('UtilityCost:Tariff'.to_IddObjectType) runner.registerInitialCondition("The model started with #{starting_tariffs.size} tariff objects.") diff --git a/lib/measures/tariff_selection_time_and_date_dependant/measure.xml b/lib/measures/tariff_selection_time_and_date_dependant/measure.xml index ff0093ae..9a73028b 100644 --- a/lib/measures/tariff_selection_time_and_date_dependant/measure.xml +++ b/lib/measures/tariff_selection_time_and_date_dependant/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 tariff_selection_time_and_date_dependant a890e296-b357-432f-8d53-6428d9bf3c0a - 24b6992e-546d-4d0c-a765-f20dfcd4d0ff - 20221115T223606Z + 3396540c-a309-4ace-9d97-788721c99057 + 2024-07-11T14:32:09Z 135F7E88 TariffSelectionTimeAndDateDependant Tariff Selection-Time and Date Dependant @@ -41,6 +41,8 @@ true false 5 + 1 + 12 summer_start_day @@ -50,6 +52,8 @@ true false 1 + 1 + 31 summer_end_month @@ -59,6 +63,8 @@ true false 9 + 1 + 12 summer_end_day @@ -68,6 +74,8 @@ true false 1 + 1 + 31 peak_start_hour @@ -77,6 +85,8 @@ true false 12 + 0.000000 + 24.000000 peak_end_hour @@ -86,6 +96,8 @@ true false 18 + 0.000000 + 24.000000 elec_rate_sum_peak @@ -252,16 +264,10 @@ - EnvelopeAndLoadTestModel_01.osm - osm - test - E11F67BD - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -270,27 +276,33 @@ C90B29ED - LICENSE.md - md - license - 64FFEBDE - - - tariff_selection_time_and_date_dependant_test.rb - rb - test - ECB359F4 + README.md.erb + erb + readmeerb + 703C9964 OpenStudio 2.0.0 - 2.8.0 + 3.8.0 measure.rb rb script - 68ECF8BF + D8EDD118 + + + EnvelopeAndLoadTestModel_01.osm + osm + test + E11F67BD + + + tariff_selection_time_and_date_dependant_test.rb + rb + test + 54B0534C diff --git a/lib/measures/view_data/measure.xml b/lib/measures/view_data/measure.xml index cb666e6a..6a751873 100644 --- a/lib/measures/view_data/measure.xml +++ b/lib/measures/view_data/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 view_data 18cf0de7-48b8-48dc-ab68-0dd29f0b8bd0 - b9f0e42d-44bf-4eed-b121-15624f67d8d8 - 20221115T223601Z + 97fe9bbd-3ef0-4d15-a901-b9c11840fa4c + 2024-07-11T14:32:05Z 2C8A3EEF ViewData ViewData @@ -91,22 +91,10 @@ - SimpleModel.osm - osm - test - AC094EF8 - - - USA_CO_Golden-NREL.724666_TMY3.epw - epw - test - BDF687C1 - - - README.md.erb - erb - readmeerb - 703C9964 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -115,22 +103,10 @@ 70F4784D - ExampleModel.osm - osm - test - FFFE0281 - - - LICENSE.md - md - license - 64FFEBDE - - - ViewData_Test.rb - rb - test - 6D2F71F0 + README.md.erb + erb + readmeerb + 703C9964 @@ -141,19 +117,43 @@ measure.rb rb script - 39164A78 + 1EFC6775 + + + report.html.in + in + resource + 98BCA605 va3c.rb rb resource - 31AAA47F + 7B8C67AE - report.html.in - in - resource - 98BCA605 + ExampleModel.osm + osm + test + FFFE0281 + + + SimpleModel.osm + osm + test + AC094EF8 + + + USA_CO_Golden-NREL.724666_TMY3.epw + epw + test + BDF687C1 + + + ViewData_Test.rb + rb + test + 1ACDE95E diff --git a/lib/measures/view_model/measure.xml b/lib/measures/view_model/measure.xml index 01764f94..d9d389b7 100644 --- a/lib/measures/view_model/measure.xml +++ b/lib/measures/view_model/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 view_model f4669f10-fda5-489d-8e1c-7ca3c2d40378 - 268f85e6-f86a-480c-b7dd-c75920b3c922 - 20221115T223605Z + 4eb18071-9b24-4e3d-8f78-ae506e8b8a61 + 2024-07-11T14:32:08Z 1E1F8B97 ViewModel ViewModel @@ -30,22 +30,10 @@ - RotationTest.osm - osm - test - B313B958 - - - ExampleModel.osm - osm - test - 10636DB9 - - - SimpleModel.osm - osm - test - AC094EF8 + LICENSE.md + md + license + BFFB1AA6 README.md @@ -59,12 +47,6 @@ readmeerb 703C9964 - - ViewModel_Test.rb - rb - test - 08D44F2F - OpenStudio @@ -74,25 +56,43 @@ measure.rb rb script - D03B01B8 + 343BE407 - LICENSE.md - md - license - 64FFEBDE + report.html.in + in + resource + 7192FF7E va3c.rb rb resource - 31AAA47F + 7B8C67AE - report.html.in - in - resource - 7192FF7E + ExampleModel.osm + osm + test + 10636DB9 + + + RotationTest.osm + osm + test + B313B958 + + + SimpleModel.osm + osm + test + AC094EF8 + + + ViewModel_Test.rb + rb + test + EC1EC2CE diff --git a/lib/openstudio/common_measures/version.rb b/lib/openstudio/common_measures/version.rb index c03ad7d6..1e70c660 100644 --- a/lib/openstudio/common_measures/version.rb +++ b/lib/openstudio/common_measures/version.rb @@ -5,6 +5,6 @@ module OpenStudio module CommonMeasures - VERSION = '0.9.0'.freeze + VERSION = '0.10.0'.freeze end end diff --git a/openstudio-common-measures.gemspec b/openstudio-common-measures.gemspec index 518ef238..997cd40c 100644 --- a/openstudio-common-measures.gemspec +++ b/openstudio-common-measures.gemspec @@ -26,12 +26,19 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.required_ruby_version = '~> 2.7.0' + spec.required_ruby_version = '~> 3.2.2' - spec.add_dependency 'bundler', '>= 2.1' - spec.add_dependency 'openstudio-extension', '~> 0.7.0' - spec.add_dependency 'openstudio-standards', '~> 0.5.0' + spec.add_dependency 'bundler', '~> 2.4.10' + spec.add_dependency 'openstudio-extension', '~> 0.8.0' + spec.add_dependency 'openstudio-standards', '0.6.1' + + # if we need the following dependencies pinned, + # let's set them in extension-gem for next release + spec.add_dependency 'multipart-post', '2.4.0' + spec.add_dependency 'regexp_parser', '2.9.0' + spec.add_dependency 'addressable', '2.8.1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' + spec.add_development_dependency 'octokit', '4.18.0' # for change logs end