diff --git a/CHANGELOG.md b/CHANGELOG.md index 32982ed..4ff6b9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # OpenStudio EE Gem +## Version 0.4.0 + +* Support Ruby ~> 2.7 +* Support for OpenStudio 3.2 (upgrade to extension gem 0.4.2 and standards gem 0.2.13) + ## Version 0.3.2 * Bump openstudio-extension-gem version to 0.3.2 to support updated workflow-gem diff --git a/Gemfile b/Gemfile index fdf2324..c99db30 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,12 @@ gemspec # checkout the latest version (develop) from github. allow_local = ENV['FAVOR_LOCAL_GEMS'] +# uncomment when you want CI to use develop branch of extension gem +# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' + +# uncomment when you want CI to use develop branch of openstudio-standards gem +# gem 'openstudio-standards', github: 'NREL/OpenStudio-standards', branch: 'master' + if allow_local && File.exist?('../OpenStudio-extension-gem') gem 'openstudio-extension', path: '../OpenStudio-extension-gem' elsif allow_local diff --git a/LICENSE.md b/LICENSE.md index 3293feb..78354a9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Rakefile b/Rakefile index 10f9edc..d0156f3 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,5 @@ # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md index 3293feb..78354a9 100644 --- a/doc_templates/LICENSE.md +++ b/doc_templates/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt index f4270cc..99fdc2a 100644 --- a/doc_templates/copyright_erb.txt +++ b/doc_templates/copyright_erb.txt @@ -1,6 +1,6 @@ <% # ******************************************************************************* - # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. + # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/doc_templates/copyright_js.txt b/doc_templates/copyright_js.txt index 21fa220..cf03085 100644 --- a/doc_templates/copyright_js.txt +++ b/doc_templates/copyright_js.txt @@ -1,4 +1,4 @@ /* @preserve - * OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. + * OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. * Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license. */ \ No newline at end of file diff --git a/doc_templates/copyright_ruby.txt b/doc_templates/copyright_ruby.txt index ffa08ae..1ec2201 100644 --- a/doc_templates/copyright_ruby.txt +++ b/doc_templates/copyright_ruby.txt @@ -1,5 +1,5 @@ # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/AddDaylightSensors/LICENSE.md b/lib/measures/AddDaylightSensors/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/AddDaylightSensors/LICENSE.md +++ b/lib/measures/AddDaylightSensors/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/AddDaylightSensors/measure.rb b/lib/measures/AddDaylightSensors/measure.rb index 170633f..b9a23be 100644 --- a/lib/measures/AddDaylightSensors/measure.rb +++ b/lib/measures/AddDaylightSensors/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/AddDaylightSensors/measure.xml b/lib/measures/AddDaylightSensors/measure.xml index 16c6dc1..35f891b 100644 --- a/lib/measures/AddDaylightSensors/measure.xml +++ b/lib/measures/AddDaylightSensors/measure.xml @@ -3,8 +3,8 @@ 3.0 add_daylight_sensors 62babdc7-c81e-4dfd-96e8-af1628a55167 - 4cb39c28-b1c9-4a77-a1cc-06304e73cb41 - 20200316T215554Z + 81ebd731-7cf6-4f7a-a07a-25a99d42ce53 + 20210423T161941Z 0AC58119 AddDaylightSensors Add Daylight Sensor at the Center of Spaces with a Specified Space Type Assigned @@ -211,7 +211,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -222,13 +222,13 @@ measure.rb rb script - 6265A583 + D887DC57 AddDaylightSensors_Test.rb rb test - 4298E1F6 + AFBE30AE diff --git a/lib/measures/AddDaylightSensors/tests/AddDaylightSensors_Test.rb b/lib/measures/AddDaylightSensors/tests/AddDaylightSensors_Test.rb index deeaee1..1fd7585 100644 --- a/lib/measures/AddDaylightSensors/tests/AddDaylightSensors_Test.rb +++ b/lib/measures/AddDaylightSensors/tests/AddDaylightSensors_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/AddOverhangsByProjectionFactor/LICENSE.md b/lib/measures/AddOverhangsByProjectionFactor/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/AddOverhangsByProjectionFactor/LICENSE.md +++ b/lib/measures/AddOverhangsByProjectionFactor/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/AddOverhangsByProjectionFactor/measure.rb b/lib/measures/AddOverhangsByProjectionFactor/measure.rb index 32e9ad5..dc35845 100644 --- a/lib/measures/AddOverhangsByProjectionFactor/measure.rb +++ b/lib/measures/AddOverhangsByProjectionFactor/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/AddOverhangsByProjectionFactor/measure.xml b/lib/measures/AddOverhangsByProjectionFactor/measure.xml index 41a9c93..4b66c77 100644 --- a/lib/measures/AddOverhangsByProjectionFactor/measure.xml +++ b/lib/measures/AddOverhangsByProjectionFactor/measure.xml @@ -1,9 +1,10 @@ + 3.0 add_overhangs_by_projection_factor 1e29e117-3916-4368-b24d-75da54045956 - f128deed-eaa4-40fe-8dab-bfd2775a1743 - 20200325T031059Z + aa2afdfd-a9a2-499e-91c7-00d742dcc20c + 20210423T161941Z 6DE831F7 AddOverhangsByProjectionFactor Add Overhangs by Projection Factor @@ -71,8 +72,8 @@ false - - + + Envelope.Fenestration @@ -121,7 +122,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -132,13 +133,13 @@ measure.rb rb script - F171A410 + 4481FEE3 AddOverhangsByProjectionFactor_Test.rb rb test - 1247729F + 992455A5 diff --git a/lib/measures/AddOverhangsByProjectionFactor/tests/AddOverhangsByProjectionFactor_Test.rb b/lib/measures/AddOverhangsByProjectionFactor/tests/AddOverhangsByProjectionFactor_Test.rb index c8d2952..e9c9cbe 100644 --- a/lib/measures/AddOverhangsByProjectionFactor/tests/AddOverhangsByProjectionFactor_Test.rb +++ b/lib/measures/AddOverhangsByProjectionFactor/tests/AddOverhangsByProjectionFactor_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/EnableDemandControlledVentilation/LICENSE.md b/lib/measures/EnableDemandControlledVentilation/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/EnableDemandControlledVentilation/LICENSE.md +++ b/lib/measures/EnableDemandControlledVentilation/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/EnableDemandControlledVentilation/measure.rb b/lib/measures/EnableDemandControlledVentilation/measure.rb index d7db5d7..8119844 100644 --- a/lib/measures/EnableDemandControlledVentilation/measure.rb +++ b/lib/measures/EnableDemandControlledVentilation/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/EnableDemandControlledVentilation/measure.xml b/lib/measures/EnableDemandControlledVentilation/measure.xml index 8fb533b..b1cc094 100644 --- a/lib/measures/EnableDemandControlledVentilation/measure.xml +++ b/lib/measures/EnableDemandControlledVentilation/measure.xml @@ -3,8 +3,8 @@ 3.0 enable_demand_controlled_ventilation 3ff4b412-8689-4b11-a588-935c621dc97d - c40cd373-fb86-47c8-91ab-c4506345ab99 - 20200316T215553Z + 3b270b50-ce1b-48ea-bf84-b16e2d8ac857 + 20210423T161942Z ECE70A70 EnableDemandControlledVentilation Enable Demand Controlled Ventilation @@ -97,7 +97,7 @@ The cost arguments are user arguments that start with a default of $0.LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -108,13 +108,13 @@ The cost arguments are user arguments that start with a default of $0.measure.rb rb script - D051868A + EB09CF2A EnableDemandControlledVentilation_Test.rb rb test - 12A588F9 + 3AD85053 diff --git a/lib/measures/EnableDemandControlledVentilation/tests/EnableDemandControlledVentilation_Test.rb b/lib/measures/EnableDemandControlledVentilation/tests/EnableDemandControlledVentilation_Test.rb index 91f33bb..bd556b6 100644 --- a/lib/measures/EnableDemandControlledVentilation/tests/EnableDemandControlledVentilation_Test.rb +++ b/lib/measures/EnableDemandControlledVentilation/tests/EnableDemandControlledVentilation_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/EnableEconomizerControl/LICENSE.md b/lib/measures/EnableEconomizerControl/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/EnableEconomizerControl/LICENSE.md +++ b/lib/measures/EnableEconomizerControl/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/EnableEconomizerControl/measure.rb b/lib/measures/EnableEconomizerControl/measure.rb index eca3808..353617e 100644 --- a/lib/measures/EnableEconomizerControl/measure.rb +++ b/lib/measures/EnableEconomizerControl/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/EnableEconomizerControl/measure.xml b/lib/measures/EnableEconomizerControl/measure.xml index 759a9c2..c632912 100644 --- a/lib/measures/EnableEconomizerControl/measure.xml +++ b/lib/measures/EnableEconomizerControl/measure.xml @@ -3,8 +3,8 @@ 3.0 enable_economizer_control f8cc920d-8ae3-411a-922f-e6fed3223c4d - fd6ffeff-a00b-4a6d-9c13-0e04dd7dd70f - 20200316T215553Z + ebeb626e-1040-44a2-a180-cddf660cf7d0 + 20210423T161942Z ECE70A70 EnableEconomizerControl Enable Economizer Control @@ -154,7 +154,7 @@ The cost arguments are user arguments that start with a default of $0. LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -165,13 +165,13 @@ The cost arguments are user arguments that start with a default of $0. measure.rb rb script - 73FC90AD + F5A5B16C measure_Test.rb rb test - E5072CB7 + 08FB3A6E diff --git a/lib/measures/EnableEconomizerControl/tests/measure_Test.rb b/lib/measures/EnableEconomizerControl/tests/measure_Test.rb index bb55ebc..482ed40 100644 --- a/lib/measures/EnableEconomizerControl/tests/measure_Test.rb +++ b/lib/measures/EnableEconomizerControl/tests/measure_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/LICENSE.md b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/LICENSE.md +++ b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.rb b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.rb index 240c6fe..c7289bc 100644 --- a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.rb +++ b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.xml b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.xml index 523c95a..743b0e7 100644 --- a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.xml +++ b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.xml @@ -3,8 +3,8 @@ 3.0 glhe_pro_export_loadsfor_ground_heat_exchanger_sizing 7bb0ce67-cffb-4ef6-b7fb-093c7c43e263 - ba9023aa-374a-4a78-9c7d-09cbd752e093 - 20200714T172140Z + fdd78344-2bb4-416c-abc6-50dbfec0d4f1 + 20210423T161943Z 2C8A3EEF GLHEProExportLoadsforGroundHeatExchangerSizing GLHEProExportLoadsforGroundHeatExchangerSizing @@ -137,23 +137,29 @@ doc B2BD6A64 - - LICENSE.md - md - license - E0468DD6 - README.md.erb erb readmeerb 703C9964 + + README.md + md + readme + CA89050A + + + LICENSE.md + md + license + A21A3ED2 + GLHEProExportLoadsforGroundHeatExchangerSizing_Test.rb rb test - EB40F738 + 0AB56C4A @@ -164,13 +170,7 @@ measure.rb rb script - 496F92E3 - - - README.md - md - readme - 0B68E96D + 8A852CDA diff --git a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/tests/GLHEProExportLoadsforGroundHeatExchangerSizing_Test.rb b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/tests/GLHEProExportLoadsforGroundHeatExchangerSizing_Test.rb index 6e8dc7b..376a5ca 100644 --- a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/tests/GLHEProExportLoadsforGroundHeatExchangerSizing_Test.rb +++ b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/tests/GLHEProExportLoadsforGroundHeatExchangerSizing_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProGFunctionImport/LICENSE.md b/lib/measures/GLHEProGFunctionImport/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/GLHEProGFunctionImport/LICENSE.md +++ b/lib/measures/GLHEProGFunctionImport/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProGFunctionImport/measure.rb b/lib/measures/GLHEProGFunctionImport/measure.rb index 2a8d6dc..0370923 100644 --- a/lib/measures/GLHEProGFunctionImport/measure.rb +++ b/lib/measures/GLHEProGFunctionImport/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProGFunctionImport/measure.xml b/lib/measures/GLHEProGFunctionImport/measure.xml index b479443..07040f7 100644 --- a/lib/measures/GLHEProGFunctionImport/measure.xml +++ b/lib/measures/GLHEProGFunctionImport/measure.xml @@ -3,8 +3,8 @@ 3.0 glhe_pro_g_function_import 001536d4-5048-4bc7-a327-57852f33c263 - 527a7edd-5e69-4ebe-89a2-6def8694d653 - 20200316T215552Z + d69d85b4-193f-4dea-bf03-ed80ecf60b5f + 20210423T161944Z 4435983D GLHEProGFunctionImport GLHEProGFunctionImport @@ -60,7 +60,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -71,13 +71,13 @@ measure.rb rb script - 037C4D30 + 3204785B GLHEProGFunctionImport_Test.rb rb test - 20D188BC + E0539635 diff --git a/lib/measures/GLHEProGFunctionImport/tests/GLHEProGFunctionImport_Test.rb b/lib/measures/GLHEProGFunctionImport/tests/GLHEProGFunctionImport_Test.rb index a6f25bc..15ed418 100644 --- a/lib/measures/GLHEProGFunctionImport/tests/GLHEProGFunctionImport_Test.rb +++ b/lib/measures/GLHEProGFunctionImport/tests/GLHEProGFunctionImport_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/LICENSE.md b/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/LICENSE.md +++ b/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.rb b/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.rb index 315f402..66e8a98 100644 --- a/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.rb +++ b/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.xml b/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.xml index a448484..7397d4f 100644 --- a/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.xml +++ b/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.xml @@ -3,8 +3,8 @@ 3.0 glhe_pro_setup_export_loadsfor_ground_heat_exchanger_sizing 9fd3ea9b-ed9f-423a-95dd-fb2bcea0d641 - cdf5e532-06bf-40e7-bded-6ab8957fc773 - 20200316T215552Z + 8ab3d6a9-b1ce-40e2-b8e2-58618794cbea + 20210423T161944Z 9DEA48C0 GLHEProSetupExportLoadsforGroundHeatExchangerSizing GLHEProSetupExportLoadsforGroundHeatExchangerSizing @@ -55,7 +55,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -66,7 +66,7 @@ measure.rb rb script - 4254094E + 9F53BA25 diff --git a/lib/measures/ImproveFanBeltEfficiency/LICENSE.md b/lib/measures/ImproveFanBeltEfficiency/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ImproveFanBeltEfficiency/LICENSE.md +++ b/lib/measures/ImproveFanBeltEfficiency/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ImproveFanBeltEfficiency/measure.rb b/lib/measures/ImproveFanBeltEfficiency/measure.rb index ef3cbb0..0b55a48 100644 --- a/lib/measures/ImproveFanBeltEfficiency/measure.rb +++ b/lib/measures/ImproveFanBeltEfficiency/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ImproveFanBeltEfficiency/measure.xml b/lib/measures/ImproveFanBeltEfficiency/measure.xml index 47122af..1e74170 100644 --- a/lib/measures/ImproveFanBeltEfficiency/measure.xml +++ b/lib/measures/ImproveFanBeltEfficiency/measure.xml @@ -3,8 +3,8 @@ 3.0 improve_fan_belt_efficiency ebeca0aa-a432-4283-a714-17116f7c8f8c - 3a76e922-3b73-464c-bd84-36ec1413808c - 20200316T215559Z + 94962475-cabc-434f-ae65-ef81505ad287 + 20210423T161944Z F78494F2 ImproveFanBeltEfficiency Improve Fan Belt Efficiency @@ -47,10 +47,10 @@ Well-adjusted belts run cooler, last longer, and operate at higher efficiency th Choice true false - {faf426ca-0bae-4419-9742-a1c5a6fcc592} + {55f6c8f3-3504-400d-a2ad-a18259f18f06} - {faf426ca-0bae-4419-9742-a1c5a6fcc592} + {55f6c8f3-3504-400d-a2ad-a18259f18f06} *All Air Loops* @@ -188,7 +188,7 @@ Well-adjusted belts run cooler, last longer, and operate at higher efficiency th LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -199,13 +199,13 @@ Well-adjusted belts run cooler, last longer, and operate at higher efficiency th measure.rb rb script - 8A140FD2 + 660AE4CC ImproveFanBeltEfficiency_Test.rb rb test - 3F864F1D + 0F634326 diff --git a/lib/measures/ImproveFanBeltEfficiency/tests/ImproveFanBeltEfficiency_Test.rb b/lib/measures/ImproveFanBeltEfficiency/tests/ImproveFanBeltEfficiency_Test.rb index 6091251..6a6a74f 100644 --- a/lib/measures/ImproveFanBeltEfficiency/tests/ImproveFanBeltEfficiency_Test.rb +++ b/lib/measures/ImproveFanBeltEfficiency/tests/ImproveFanBeltEfficiency_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ImproveMotorEfficiency/LICENSE.md b/lib/measures/ImproveMotorEfficiency/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ImproveMotorEfficiency/LICENSE.md +++ b/lib/measures/ImproveMotorEfficiency/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ImproveMotorEfficiency/measure.rb b/lib/measures/ImproveMotorEfficiency/measure.rb index a2dbdcc..7993c41 100644 --- a/lib/measures/ImproveMotorEfficiency/measure.rb +++ b/lib/measures/ImproveMotorEfficiency/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ImproveMotorEfficiency/measure.xml b/lib/measures/ImproveMotorEfficiency/measure.xml index fc4f698..075ed8a 100644 --- a/lib/measures/ImproveMotorEfficiency/measure.xml +++ b/lib/measures/ImproveMotorEfficiency/measure.xml @@ -3,8 +3,8 @@ 3.0 improve_motor_efficiency 52013ba9-7b9b-4ffd-bc67-d4c0fa05d7ae - c4e4527d-3b59-4591-a6ac-f820a82e0a51 - 20200316T215557Z + aac6ec90-36aa-4bfd-8a48-a97e6c8cfeed + 20210423T161945Z F78494F2 ImproveMotorEfficiency Improve Motor Efficiency in Selected Fans and Pumps @@ -31,10 +31,10 @@ The cost arguments are user arguments that start with a default of $0. Operation Choice true false - {a7bc53ae-325b-48c9-bae3-4d95a2838e39} + {f20984c1-6a96-4c69-b514-994f82fc002c} - {a7bc53ae-325b-48c9-bae3-4d95a2838e39} + {f20984c1-6a96-4c69-b514-994f82fc002c} *All Plant and Air Loops* @@ -172,7 +172,7 @@ The cost arguments are user arguments that start with a default of $0. Operation LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -183,13 +183,13 @@ The cost arguments are user arguments that start with a default of $0. Operation measure.rb rb script - 06B60D3C + 77562095 ImproveMotorEfficiency_Test.rb rb test - 0A54E6F9 + 75FA2C22 diff --git a/lib/measures/ImproveMotorEfficiency/tests/ImproveMotorEfficiency_Test.rb b/lib/measures/ImproveMotorEfficiency/tests/ImproveMotorEfficiency_Test.rb index 350de9b..5d09baa 100644 --- a/lib/measures/ImproveMotorEfficiency/tests/ImproveMotorEfficiency_Test.rb +++ b/lib/measures/ImproveMotorEfficiency/tests/ImproveMotorEfficiency_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWalls/LICENSE.md b/lib/measures/IncreaseInsulationRValueForExteriorWalls/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWalls/LICENSE.md +++ b/lib/measures/IncreaseInsulationRValueForExteriorWalls/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.rb b/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.rb index 7801c46..ae0c5bd 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.rb +++ b/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.xml b/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.xml index ed8be1d..a515dfb 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.xml +++ b/lib/measures/IncreaseInsulationRValueForExteriorWalls/measure.xml @@ -1,9 +1,10 @@ + 3.0 increase_insulation_r_value_for_exterior_walls 3fdf9c39-d305-449b-a4b5-077166af5a67 - 5912ea03-d7cd-451f-97a9-32d544a40628 - 20200331T153741Z + 2e1d30e3-feb9-4d73-aa75-c94dbd72d50f + 20210423T161946Z 0F858D9E IncreaseInsulationRValueForExteriorWalls Increase R-value of Insulation for Exterior Walls to a Specific Value @@ -79,8 +80,8 @@ The resulting construction will retain the cost data from the source constructio 0 - - + + Envelope.Opaque @@ -141,7 +142,7 @@ The resulting construction will retain the cost data from the source constructio LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -152,13 +153,13 @@ The resulting construction will retain the cost data from the source constructio measure.rb rb script - B1B01DC6 + 784F3C37 IncreaseInsulationRValueForExteriorWalls_01_Test.rb rb test - 118F0485 + 83E2104B diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWalls/tests/IncreaseInsulationRValueForExteriorWalls_01_Test.rb b/lib/measures/IncreaseInsulationRValueForExteriorWalls/tests/IncreaseInsulationRValueForExteriorWalls_01_Test.rb index 133036f..69e87b9 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWalls/tests/IncreaseInsulationRValueForExteriorWalls_01_Test.rb +++ b/lib/measures/IncreaseInsulationRValueForExteriorWalls/tests/IncreaseInsulationRValueForExteriorWalls_01_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/LICENSE.md b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/LICENSE.md +++ b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.rb b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.rb index 739a656..1a0cbd8 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.rb +++ b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.rb @@ -1,5 +1,5 @@ # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.xml b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.xml index 93db72e..61e1590 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.xml +++ b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/measure.xml @@ -1,9 +1,10 @@ + 3.0 increase_insulation_r_value_for_exterior_walls_by_percentage 7508c563-22bd-49f4-b646-aac69b02a82d - 9ef20b5d-2bdd-417b-a5d9-b7f77d509133 - 20200229T024318Z + cdfe86e2-e7f6-4c93-baaa-a652d5b1606c + 20210423T161946Z EB1A0C08 IncreaseInsulationRValueForExteriorWallsByPercentage Increase R-value of Insulation for Exterior Walls By a Specified Percentage @@ -19,8 +20,8 @@ 30 - - + + Envelope.Opaque @@ -75,7 +76,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -86,13 +87,13 @@ measure.rb rb script - 478DC9B7 + A244C0D7 IncreaseInsulationRValueForExteriorWalls_Test.rb rb test - 01E73CC1 + 939614F6 diff --git a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/tests/IncreaseInsulationRValueForExteriorWalls_Test.rb b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/tests/IncreaseInsulationRValueForExteriorWalls_Test.rb index f387fe6..d2e9a3d 100644 --- a/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/tests/IncreaseInsulationRValueForExteriorWalls_Test.rb +++ b/lib/measures/IncreaseInsulationRValueForExteriorWallsByPercentage/tests/IncreaseInsulationRValueForExteriorWalls_Test.rb @@ -1,5 +1,5 @@ # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForRoofs/LICENSE.md b/lib/measures/IncreaseInsulationRValueForRoofs/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofs/LICENSE.md +++ b/lib/measures/IncreaseInsulationRValueForRoofs/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForRoofs/measure.rb b/lib/measures/IncreaseInsulationRValueForRoofs/measure.rb index b51dea2..43b9852 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofs/measure.rb +++ b/lib/measures/IncreaseInsulationRValueForRoofs/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForRoofs/measure.xml b/lib/measures/IncreaseInsulationRValueForRoofs/measure.xml index 1629cb7..ebaf2a9 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofs/measure.xml +++ b/lib/measures/IncreaseInsulationRValueForRoofs/measure.xml @@ -3,8 +3,8 @@ 3.0 increase_insulation_r_value_for_roofs 65b798f4-207f-4aed-987a-386c865d0ccd - 7308c224-985c-41be-8f49-61bbefa1ace7 - 20200316T215552Z + 4dab4355-ee2b-4237-a73e-e76329022494 + 20210423T161947Z 0F858D9E IncreaseInsulationRValueForRoofs Increase R-value of Insulation for Roofs to a Specific Value @@ -136,13 +136,13 @@ The resulting construction will retain the cost data from the source constructio LICENSE.md md license - E0468DD6 + A21A3ED2 IncreaseInsulationRValueForRoofs_Test.rb rb test - 36D70584 + AB462C3B @@ -153,7 +153,7 @@ The resulting construction will retain the cost data from the source constructio measure.rb rb script - 1F8CBEE2 + E07D8BA0 diff --git a/lib/measures/IncreaseInsulationRValueForRoofs/tests/IncreaseInsulationRValueForRoofs_Test.rb b/lib/measures/IncreaseInsulationRValueForRoofs/tests/IncreaseInsulationRValueForRoofs_Test.rb index a22d19c..849796f 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofs/tests/IncreaseInsulationRValueForRoofs_Test.rb +++ b/lib/measures/IncreaseInsulationRValueForRoofs/tests/IncreaseInsulationRValueForRoofs_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/LICENSE.md b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/LICENSE.md +++ b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.rb b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.rb index f16ec6d..a11a443 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.rb +++ b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.rb @@ -1,5 +1,5 @@ # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.xml b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.xml index 04f5f44..db2c87e 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.xml +++ b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/measure.xml @@ -1,9 +1,10 @@ + 3.0 increase_insulation_r_value_for_roofs_by_percentage 807d3ebf-c89b-4b93-b400-110ca060b2bb - 9845f31c-01a7-4db1-9a3c-8e773f01a860 - 20200229T024315Z + df020820-8068-4341-b3db-4fd3e187c409 + 20210423T161947Z EB1A0C08 IncreaseInsulationRValueForRoofsByPercentage Increase R-value of Insulation for Roofs by a Specified Percentage. @@ -19,8 +20,8 @@ 30 - - + + Envelope.Opaque @@ -75,7 +76,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -86,13 +87,13 @@ measure.rb rb script - 4F106AF3 + 8A7AB7E6 IncreaseInsulationRValueForRoofs_Test.rb rb test - 62EC1368 + CC15F8EA diff --git a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/tests/IncreaseInsulationRValueForRoofs_Test.rb b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/tests/IncreaseInsulationRValueForRoofs_Test.rb index 6abdeb6..aa2db82 100644 --- a/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/tests/IncreaseInsulationRValueForRoofs_Test.rb +++ b/lib/measures/IncreaseInsulationRValueForRoofsByPercentage/tests/IncreaseInsulationRValueForRoofs_Test.rb @@ -1,5 +1,5 @@ # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/LICENSE.md b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/LICENSE.md +++ b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.rb b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.rb index 0610c68..2254035 100644 --- a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.rb +++ b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.xml b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.xml index 1a6093e..99a1610 100644 --- a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.xml +++ b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/measure.xml @@ -3,8 +3,8 @@ 3.0 reduce_electric_equipment_loads_by_percentage 0902e302-70db-4339-99b0-17f08bc93629 - 5a5c83a1-1847-4b93-969b-bf78c64fcbd7 - 20200316T215557Z + 7a9cb1c5-368b-4163-9cfd-d9606ec884b5 + 20210423T161948Z F9A5B8F0 ReduceElectricEquipmentLoadsByPercentage Reduce Electric Equipment Loads by Percentage @@ -18,10 +18,10 @@ Choice true false - {62946157-540d-4cd0-9a2c-14d9582d8624} + {1a4decff-840b-4471-aaf1-7d28a8d5ac9d} - {62946157-540d-4cd0-9a2c-14d9582d8624} + {1a4decff-840b-4471-aaf1-7d28a8d5ac9d} *Entire Building* @@ -164,13 +164,13 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 ReduceElectricEquipmentLoadsByPercentage_Test.rb rb test - 71D4F26D + FC261EC6 @@ -181,7 +181,7 @@ measure.rb rb script - C4BD878E + 37C0DA10 diff --git a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/tests/ReduceElectricEquipmentLoadsByPercentage_Test.rb b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/tests/ReduceElectricEquipmentLoadsByPercentage_Test.rb index 61dda5e..f310395 100644 --- a/lib/measures/ReduceElectricEquipmentLoadsByPercentage/tests/ReduceElectricEquipmentLoadsByPercentage_Test.rb +++ b/lib/measures/ReduceElectricEquipmentLoadsByPercentage/tests/ReduceElectricEquipmentLoadsByPercentage_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceLightingLoadsByPercentage/LICENSE.md b/lib/measures/ReduceLightingLoadsByPercentage/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ReduceLightingLoadsByPercentage/LICENSE.md +++ b/lib/measures/ReduceLightingLoadsByPercentage/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceLightingLoadsByPercentage/measure.rb b/lib/measures/ReduceLightingLoadsByPercentage/measure.rb index 173b0e7..77204ac 100644 --- a/lib/measures/ReduceLightingLoadsByPercentage/measure.rb +++ b/lib/measures/ReduceLightingLoadsByPercentage/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceLightingLoadsByPercentage/measure.xml b/lib/measures/ReduceLightingLoadsByPercentage/measure.xml index e9a9b3d..68bbdda 100644 --- a/lib/measures/ReduceLightingLoadsByPercentage/measure.xml +++ b/lib/measures/ReduceLightingLoadsByPercentage/measure.xml @@ -3,8 +3,8 @@ 3.0 reduce_lighting_loads_by_percentage 791f3404-a28b-4a80-ba3f-e15b339e39ea - a8b83ef3-2795-4ba9-a779-1c4b023009b1 - 20200316T215558Z + 239a84da-0ad9-4cb6-ac2b-d8f5984a12cf + 20210423T161948Z 293730A7 ReduceLightingLoadsByPercentage Reduce Lighting Loads by Percentage @@ -17,10 +17,10 @@ Choice true false - {0faaf6de-f6eb-439b-93e3-629931ece083} + {e2856f3d-b633-44ca-b6f0-110b42ff7fb7} - {0faaf6de-f6eb-439b-93e3-629931ece083} + {e2856f3d-b633-44ca-b6f0-110b42ff7fb7} *Entire Building* @@ -169,13 +169,13 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 ReduceLightingLoadsByPercentage_Test.rb rb test - 668C3D29 + 01B9ACC2 @@ -186,7 +186,7 @@ measure.rb rb script - DBC40E16 + 8278EF29 diff --git a/lib/measures/ReduceLightingLoadsByPercentage/tests/ReduceLightingLoadsByPercentage_Test.rb b/lib/measures/ReduceLightingLoadsByPercentage/tests/ReduceLightingLoadsByPercentage_Test.rb index 993e85e..5e492c8 100644 --- a/lib/measures/ReduceLightingLoadsByPercentage/tests/ReduceLightingLoadsByPercentage_Test.rb +++ b/lib/measures/ReduceLightingLoadsByPercentage/tests/ReduceLightingLoadsByPercentage_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceNightTimeElectricEquipmentLoads/LICENSE.md b/lib/measures/ReduceNightTimeElectricEquipmentLoads/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ReduceNightTimeElectricEquipmentLoads/LICENSE.md +++ b/lib/measures/ReduceNightTimeElectricEquipmentLoads/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.rb b/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.rb index a1ee2aa..5f03a74 100644 --- a/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.rb +++ b/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.xml b/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.xml index be4b615..d6d1205 100644 --- a/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.xml +++ b/lib/measures/ReduceNightTimeElectricEquipmentLoads/measure.xml @@ -3,8 +3,8 @@ 3.0 reduce_night_time_electric_equipment_loads 7bde0d05-3714-43e2-91b4-aa1e12e714bf - cb3bda03-f000-4985-a04e-a87f7b00583f - 20200316T215553Z + 4c062e52-d062-4ba9-a1b0-f55cb2b4bd91 + 20210423T161949Z F4EB279D ReduceNightTimeElectricEquipmentLoads Reduce Night Time Electric Equipment Loads @@ -219,7 +219,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -230,13 +230,13 @@ measure.rb rb script - E2664449 + 41152788 ReduceNightTimeElectricEquipmentLoads_Test.rb rb test - 2DFF7716 + 7478DA46 diff --git a/lib/measures/ReduceNightTimeElectricEquipmentLoads/tests/ReduceNightTimeElectricEquipmentLoads_Test.rb b/lib/measures/ReduceNightTimeElectricEquipmentLoads/tests/ReduceNightTimeElectricEquipmentLoads_Test.rb index 8994b39..6a1ad36 100644 --- a/lib/measures/ReduceNightTimeElectricEquipmentLoads/tests/ReduceNightTimeElectricEquipmentLoads_Test.rb +++ b/lib/measures/ReduceNightTimeElectricEquipmentLoads/tests/ReduceNightTimeElectricEquipmentLoads_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceNightTimeLightingLoads/LICENSE.md b/lib/measures/ReduceNightTimeLightingLoads/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ReduceNightTimeLightingLoads/LICENSE.md +++ b/lib/measures/ReduceNightTimeLightingLoads/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceNightTimeLightingLoads/measure.rb b/lib/measures/ReduceNightTimeLightingLoads/measure.rb index a734e26..3f76f08 100644 --- a/lib/measures/ReduceNightTimeLightingLoads/measure.rb +++ b/lib/measures/ReduceNightTimeLightingLoads/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceNightTimeLightingLoads/measure.xml b/lib/measures/ReduceNightTimeLightingLoads/measure.xml index 5d9d33b..9b2c978 100644 --- a/lib/measures/ReduceNightTimeLightingLoads/measure.xml +++ b/lib/measures/ReduceNightTimeLightingLoads/measure.xml @@ -3,8 +3,8 @@ 3.0 reduce_night_time_lighting_loads acce8fde-a5d7-4c27-af89-28327132bafa - 6563f080-71b9-4740-8843-f027d9525fee - 20200316T215559Z + c36deef9-10b4-4079-b07c-c50f8b9191f0 + 20210423T161949Z 0AC58119 ReduceNightTimeLightingLoads Reduce Night Time Lighting Loads @@ -219,7 +219,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -230,13 +230,13 @@ measure.rb rb script - 7DC74222 + C9245C6C ReduceNightTimeLightingLoads_Test.rb rb test - 7E16BB99 + EAAE58F2 diff --git a/lib/measures/ReduceNightTimeLightingLoads/tests/ReduceNightTimeLightingLoads_Test.rb b/lib/measures/ReduceNightTimeLightingLoads/tests/ReduceNightTimeLightingLoads_Test.rb index 21d36a6..beaf198 100644 --- a/lib/measures/ReduceNightTimeLightingLoads/tests/ReduceNightTimeLightingLoads_Test.rb +++ b/lib/measures/ReduceNightTimeLightingLoads/tests/ReduceNightTimeLightingLoads_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceSpaceInfiltrationByPercentage/LICENSE.md b/lib/measures/ReduceSpaceInfiltrationByPercentage/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ReduceSpaceInfiltrationByPercentage/LICENSE.md +++ b/lib/measures/ReduceSpaceInfiltrationByPercentage/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.rb b/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.rb index 0c44548..a1769de 100644 --- a/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.rb +++ b/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.xml b/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.xml index c4fe560..54b5e53 100644 --- a/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.xml +++ b/lib/measures/ReduceSpaceInfiltrationByPercentage/measure.xml @@ -3,8 +3,8 @@ 3.0 reduce_space_infiltration_by_percentage 6e9de4b1-aa97-4010-80c8-529e53ffe943 - a80fe19c-7db4-47c4-ba4e-bb02f009fb3a - 20200316T215553Z + 5a6e9e1e-43d3-42ba-988e-7725dd74729b + 20210423T161950Z EACB548E ReduceSpaceInfiltrationByPercentage ReduceSpaceInfiltrationByPercentage @@ -17,10 +17,10 @@ Choice true false - {8e1a19d3-c36c-478d-8904-39f6f35e2996} + {136d1959-e409-4a50-8e90-aea4f881ac9b} - {8e1a19d3-c36c-478d-8904-39f6f35e2996} + {136d1959-e409-4a50-8e90-aea4f881ac9b} *Entire Building* @@ -159,13 +159,13 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 ReduceSpaceInfiltrationByPercentage_Test.rb rb test - 738F3681 + 61CD07EE @@ -176,7 +176,7 @@ measure.rb rb script - B7E7CB97 + A291F10F diff --git a/lib/measures/ReduceSpaceInfiltrationByPercentage/tests/ReduceSpaceInfiltrationByPercentage_Test.rb b/lib/measures/ReduceSpaceInfiltrationByPercentage/tests/ReduceSpaceInfiltrationByPercentage_Test.rb index d54dd50..a052b45 100644 --- a/lib/measures/ReduceSpaceInfiltrationByPercentage/tests/ReduceSpaceInfiltrationByPercentage_Test.rb +++ b/lib/measures/ReduceSpaceInfiltrationByPercentage/tests/ReduceSpaceInfiltrationByPercentage_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceVentilationByPercentage/LICENSE.md b/lib/measures/ReduceVentilationByPercentage/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/ReduceVentilationByPercentage/LICENSE.md +++ b/lib/measures/ReduceVentilationByPercentage/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceVentilationByPercentage/measure.rb b/lib/measures/ReduceVentilationByPercentage/measure.rb index 466bb3e..a37f5f9 100644 --- a/lib/measures/ReduceVentilationByPercentage/measure.rb +++ b/lib/measures/ReduceVentilationByPercentage/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/ReduceVentilationByPercentage/measure.xml b/lib/measures/ReduceVentilationByPercentage/measure.xml index 5156b64..c0c8d5c 100644 --- a/lib/measures/ReduceVentilationByPercentage/measure.xml +++ b/lib/measures/ReduceVentilationByPercentage/measure.xml @@ -3,8 +3,8 @@ 3.0 reduce_ventilation_by_percentage f0859a47-fddf-4962-9035-2f9fc9d6e283 - 66790178-4cdf-44e0-bcf3-e1d2be03b294 - 20200316T215553Z + 2d725ada-1924-4ddb-b789-6e767cea3904 + 20210423T161950Z ECE70A70 ReduceVentilationByPercentage ReduceVentilationByPercentage @@ -17,10 +17,10 @@ Choice true false - {aee36b4d-8f14-4c70-96eb-826b20529af6} + {af08eb62-820d-4a9a-a172-6e961acf5def} - {aee36b4d-8f14-4c70-96eb-826b20529af6} + {af08eb62-820d-4a9a-a172-6e961acf5def} *Entire Building* @@ -74,7 +74,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -85,13 +85,13 @@ measure.rb rb script - 7C468276 + 029426AA ReduceVentilationByPercentage_Test.rb rb test - F335DB3B + 48B5C761 diff --git a/lib/measures/ReduceVentilationByPercentage/tests/ReduceVentilationByPercentage_Test.rb b/lib/measures/ReduceVentilationByPercentage/tests/ReduceVentilationByPercentage_Test.rb index 58089a3..55c22b5 100644 --- a/lib/measures/ReduceVentilationByPercentage/tests/ReduceVentilationByPercentage_Test.rb +++ b/lib/measures/ReduceVentilationByPercentage/tests/ReduceVentilationByPercentage_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/add_variable_speed_rtu_control_logic/LICENSE.md b/lib/measures/add_variable_speed_rtu_control_logic/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/add_variable_speed_rtu_control_logic/LICENSE.md +++ b/lib/measures/add_variable_speed_rtu_control_logic/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/add_variable_speed_rtu_control_logic/measure.rb b/lib/measures/add_variable_speed_rtu_control_logic/measure.rb index e32b307..4597480 100755 --- a/lib/measures/add_variable_speed_rtu_control_logic/measure.rb +++ b/lib/measures/add_variable_speed_rtu_control_logic/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/add_variable_speed_rtu_control_logic/measure.xml b/lib/measures/add_variable_speed_rtu_control_logic/measure.xml index add461a..9b2565e 100755 --- a/lib/measures/add_variable_speed_rtu_control_logic/measure.xml +++ b/lib/measures/add_variable_speed_rtu_control_logic/measure.xml @@ -3,8 +3,8 @@ 3.0 add_variable_speed_rtu_control_logic 7d0aebdd-58c5-4e0e-9217-5dbdc82886fd - 05fd1f5d-06a9-4268-aaad-156f1e7ab953 - 20200331T185756Z + 9a01cf02-1800-48e0-b2c1-5d4eac1ed646 + 20210423T161951Z A310923F AddVariableSpeedRTUControlLogic Add Variable Speed RTU Control Logic @@ -126,12 +126,6 @@ The measure is set up so that a separate block of EMS code is inserted for each - - LICENSE.md - md - license - E0468DD6 - README.md.erb erb @@ -144,11 +138,17 @@ The measure is set up so that a separate block of EMS code is inserted for each readme 86416F37 + + LICENSE.md + md + license + A21A3ED2 + add_variable_speed_rtu_control_logic_test.rb rb test - 3CDC4AA3 + B83F1BFB @@ -159,7 +159,7 @@ The measure is set up so that a separate block of EMS code is inserted for each measure.rb rb script - 7C55F07E + F1C51D0F diff --git a/lib/measures/add_variable_speed_rtu_control_logic/tests/add_variable_speed_rtu_control_logic_test.rb b/lib/measures/add_variable_speed_rtu_control_logic/tests/add_variable_speed_rtu_control_logic_test.rb index 08ffdcc..2fdb094 100755 --- a/lib/measures/add_variable_speed_rtu_control_logic/tests/add_variable_speed_rtu_control_logic_test.rb +++ b/lib/measures/add_variable_speed_rtu_control_logic/tests/add_variable_speed_rtu_control_logic_test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/create_variable_speed_rtu/LICENSE.md b/lib/measures/create_variable_speed_rtu/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/create_variable_speed_rtu/LICENSE.md +++ b/lib/measures/create_variable_speed_rtu/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/create_variable_speed_rtu/measure.rb b/lib/measures/create_variable_speed_rtu/measure.rb index d8bef76..bc2679d 100644 --- a/lib/measures/create_variable_speed_rtu/measure.rb +++ b/lib/measures/create_variable_speed_rtu/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/create_variable_speed_rtu/measure.xml b/lib/measures/create_variable_speed_rtu/measure.xml index 7a5e328..6659b66 100644 --- a/lib/measures/create_variable_speed_rtu/measure.xml +++ b/lib/measures/create_variable_speed_rtu/measure.xml @@ -1,9 +1,10 @@ + 3.0 create_variable_speed_rtu 7fb36b3a-5591-4627-a2b0-7709fbeae593 - 886ef5ed-aeb1-4dc8-9d02-2f38076cd48d - 20200325T031058Z + 1a0259b5-f805-4ecf-bada-6402f13d28a8 + 20210423T161951Z A9D5932A CreateVariableSpeedRTU Create Variable Speed RTU @@ -16,10 +17,10 @@ Choice true false - *All CAV Air Loops* + {dc560b89-a61a-442a-aab6-944ce5c639bf} - {617cea75-f64e-4a2a-be06-702cd1654500} + {dc560b89-a61a-442a-aab6-944ce5c639bf} *All CAV Air Loops* @@ -124,8 +125,8 @@ false - - + + HVAC.Whole System @@ -184,13 +185,13 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 create_variable_speed_rtu_test.rb rb test - E2BD8597 + 9034497B @@ -201,7 +202,7 @@ measure.rb rb script - D2CA3B8A + DC25874E diff --git a/lib/measures/create_variable_speed_rtu/tests/create_variable_speed_rtu_test.rb b/lib/measures/create_variable_speed_rtu/tests/create_variable_speed_rtu_test.rb index a3a0cfe..d3bbce9 100644 --- a/lib/measures/create_variable_speed_rtu/tests/create_variable_speed_rtu_test.rb +++ b/lib/measures/create_variable_speed_rtu/tests/create_variable_speed_rtu_test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/fan_assist_night_ventilation/LICENSE.md b/lib/measures/fan_assist_night_ventilation/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/fan_assist_night_ventilation/LICENSE.md +++ b/lib/measures/fan_assist_night_ventilation/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/fan_assist_night_ventilation/measure.rb b/lib/measures/fan_assist_night_ventilation/measure.rb index 8a0dc53..48bf05d 100644 --- a/lib/measures/fan_assist_night_ventilation/measure.rb +++ b/lib/measures/fan_assist_night_ventilation/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/fan_assist_night_ventilation/measure.xml b/lib/measures/fan_assist_night_ventilation/measure.xml index f387de7..0474f7e 100644 --- a/lib/measures/fan_assist_night_ventilation/measure.xml +++ b/lib/measures/fan_assist_night_ventilation/measure.xml @@ -3,8 +3,8 @@ 3.0 fan_assist_night_ventilation 5e77cb11-0fa9-432b-97bd-87c40949ee1f - 9ad3d64e-8adc-46c2-b8a0-bef3e55c5072 - 20200316T215558Z + 30d3946a-6681-4f2c-b86f-e3dc27ed7494 + 20210423T161952Z 26DDAE64 FanAssistNightVentilation Fan Assist Night Ventilation @@ -143,7 +143,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -154,13 +154,13 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds measure.rb rb script - B7BB2EC9 + A9F5C173 fan_assist_night_ventilation_test.rb rb test - 32D2B043 + FD7832B8 diff --git a/lib/measures/fan_assist_night_ventilation/tests/fan_assist_night_ventilation_test.rb b/lib/measures/fan_assist_night_ventilation/tests/fan_assist_night_ventilation_test.rb index c504362..bc7a90c 100644 --- a/lib/measures/fan_assist_night_ventilation/tests/fan_assist_night_ventilation_test.rb +++ b/lib/measures/fan_assist_night_ventilation/tests/fan_assist_night_ventilation_test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/nze_hvac/LICENSE.md b/lib/measures/nze_hvac/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/nze_hvac/LICENSE.md +++ b/lib/measures/nze_hvac/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/nze_hvac/measure.rb b/lib/measures/nze_hvac/measure.rb index 9fed1c6..5cbe113 100644 --- a/lib/measures/nze_hvac/measure.rb +++ b/lib/measures/nze_hvac/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/nze_hvac/measure.xml b/lib/measures/nze_hvac/measure.xml index 85d4b29..434aeb9 100644 --- a/lib/measures/nze_hvac/measure.xml +++ b/lib/measures/nze_hvac/measure.xml @@ -3,8 +3,8 @@ 3.0 nze_hvac f060dff2-b28d-4194-a6af-e66d88ddb33c - 6d156aab-dd02-41ed-9285-82c07a45707c - 20201112T192500Z + 7697ad4e-7392-40cd-aa0d-ba4163efd1c3 + 20210423T162015Z 0E5E4776 NzeHvac NZEHVAC @@ -307,13 +307,13 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 NZEHVAC_Test.rb rb test - 1BA0611D + B98D8DC5 @@ -324,7 +324,7 @@ measure.rb rb script - CF08F01B + 59C3DBB0 diff --git a/lib/measures/nze_hvac/tests/NZEHVAC_Test.rb b/lib/measures/nze_hvac/tests/NZEHVAC_Test.rb index 34edc53..2419f42 100644 --- a/lib/measures/nze_hvac/tests/NZEHVAC_Test.rb +++ b/lib/measures/nze_hvac/tests/NZEHVAC_Test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/LICENSE.md b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/LICENSE.md index 3293feb..78354a9 100644 --- a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/LICENSE.md +++ b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/LICENSE.md @@ -1,4 +1,4 @@ -OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved. +OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.rb b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.rb index 8cbf93b..2893540 100644 --- a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.rb +++ b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.xml b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.xml index 23cae3e..a9b4a47 100644 --- a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.xml +++ b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.xml @@ -3,8 +3,8 @@ 3.0 replace_water_heater_mixed_with_thermal_storage_chilled_water f219279a-96b6-4636-b663-467d554e42a5 - 270c6535-e5aa-4c70-9ffb-595483890848 - 20200316T215554Z + 67c1bca5-8c39-48cb-8f11-0acade3f0b13 + 20210423T162016Z D48F381B ReplaceWaterHeaterMixedWithThermalStorageChilledWater Replace Water Heater Mixed with Thermal Storage Chilled Water @@ -71,7 +71,7 @@ LICENSE.md md license - E0468DD6 + A21A3ED2 @@ -82,13 +82,13 @@ measure.rb rb script - 33D3F733 + 3817176B replace_water_heater_mixed_with_thermal_storage_chilled_water_test.rb rb test - 5B2FDB99 + 70141309 diff --git a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/tests/replace_water_heater_mixed_with_thermal_storage_chilled_water_test.rb b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/tests/replace_water_heater_mixed_with_thermal_storage_chilled_water_test.rb index 667454b..efb7d94 100644 --- a/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/tests/replace_water_heater_mixed_with_thermal_storage_chilled_water_test.rb +++ b/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/tests/replace_water_heater_mixed_with_thermal_storage_chilled_water_test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/openstudio-ee-measures.rb b/lib/openstudio-ee-measures.rb index 1ae3947..7effe59 100644 --- a/lib/openstudio-ee-measures.rb +++ b/lib/openstudio-ee-measures.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/openstudio/ee_measures.rb b/lib/openstudio/ee_measures.rb index 326971b..2b9c91e 100644 --- a/lib/openstudio/ee_measures.rb +++ b/lib/openstudio/ee_measures.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/openstudio/ee_measures/extension.rb b/lib/openstudio/ee_measures/extension.rb index eb022f6..314842b 100644 --- a/lib/openstudio/ee_measures/extension.rb +++ b/lib/openstudio/ee_measures/extension.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/lib/openstudio/ee_measures/version.rb b/lib/openstudio/ee_measures/version.rb index 51d47a2..3baf16a 100644 --- a/lib/openstudio/ee_measures/version.rb +++ b/lib/openstudio/ee_measures/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -37,6 +37,6 @@ module OpenStudio module EeMeasures - VERSION = '0.3.2' + VERSION = '0.4.0' end end diff --git a/openstudio-ee.gemspec b/openstudio-ee.gemspec index 5f8ab17..ff07296 100644 --- a/openstudio-ee.gemspec +++ b/openstudio-ee.gemspec @@ -25,11 +25,11 @@ 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.5.0' + spec.required_ruby_version = '~> 2.7.0' spec.add_dependency 'bundler', '~> 2.1' - spec.add_dependency 'openstudio-extension', '~> 0.3.2' - spec.add_dependency 'openstudio-standards', '~> 0.2.12' + spec.add_dependency 'openstudio-extension', '~> 0.4.2' + spec.add_dependency 'openstudio-standards', '~> 0.2.13' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2062971..97e147b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/spec/tests/ee_measures_spec.rb b/spec/tests/ee_measures_spec.rb index fc4793a..8fdf39b 100644 --- a/spec/tests/ee_measures_spec.rb +++ b/spec/tests/ee_measures_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # ******************************************************************************* -# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. +# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: