urbanopt-cli 0.5.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f500e2347c85052bd7493fcf4fcf2aeb519bec6912f46e28d9602700a8aaaf'
-  data.tar.gz: 024ccfe7a5e88bdb54ffd01a16d216e2c9cded1b3cff52b29d3476753fee8656
+  metadata.gz: 8d3bc5c3b66f12e742fb086cc974985a85222b2bfe94aacda10d9302fb3902ba
+  data.tar.gz: 11da3379b2d12f17024520818e8f9b80be1ec3bfcbf84398562bc0b0e6b20baf
 SHA512:
-  metadata.gz: f6d8b46860126b1f74d970822458581efcb45fcc4ee868446b6fd0df8adea79c43c749eb70d1f05ca24991e72171979b9b17b6cf9accfefcd4e0e2f8f0bf556b
-  data.tar.gz: 2e3981a13ece23e674d60ff43172b6828141c8bf4e4f165d19f069a18666647cc62fdd862afaacb502195ad131fad90d4eef17bb5445d7ac65b9a6d1c084694d
+  metadata.gz: 91448faf7d2f3f4ecf1297a2fde7ce7b01b18268a36f2a8dad5d26c3fa926a9a9348308e83f3ece19581fe83775f9727aacd84e45c52a5941253bd2d4e9c3294
+  data.tar.gz: 12113797957df03e757aaaa5741eabaa7970b4565e3ea2c1ad45650ec556c705a8c6a30e7472cb72e4eae199262915f48531f5818a4292a5415b38bef785f3bc

data/.gitignore

@@ -23,6 +23,7 @@
 spec/test_directory
 spec/test_directory_res
 spec/test_directory_elec
+spec/test_directory_*
 
 Gemfile.lock
 .rubocop*

data/.rubocop.yml

@@ -4,6 +4,6 @@ AllCops:
     - init_templates/**/*
     - lib/measures/**/resources/*
     - lib/openstudio/extension/core/**/*
-
+require: rubocop-performance
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## Version 0.6.3
+
+Date Range 7/23/21 - 10/28/21
+
+- Fixed [#248]( https://github.com/urbanopt/urbanopt-cli/issues/248 ), Update example project to make use of commercial hours of operation customization
+- Fixed [#255]( https://github.com/urbanopt/urbanopt-cli/issues/255 ), Look into warning message
+- Fixed [#258]( https://github.com/urbanopt/urbanopt-cli/issues/258 ), added missing feature location arguments to CreateBar & Floorspace workflows
+- Fixed [#260]( https://github.com/urbanopt/urbanopt-cli/issues/260 ), Add support for community PV, and ground-mount PV associated with Features
+- Fixed [#265]( https://github.com/urbanopt/urbanopt-cli/issues/265 ), RNM workflow does not work when specifying the electrical catalog
+- Fixed [#268]( https://github.com/urbanopt/urbanopt-cli/issues/268 ), Sync files from the urbanopt / urbanopt-example-geojson-project repository
+
+## Version 0.6.2
+
+Date Range 7/2/21 - 7/22/21
+
+- Fixed [#246]( https://github.com/urbanopt/urbanopt-cli/issues/246 ), Fix Visualizations for other fuels
+- Fixed [#250]( https://github.com/urbanopt/urbanopt-cli/issues/250 ), Integrate RNM functionality
+- Fixed [#252]( https://github.com/urbanopt/urbanopt-cli/issues/252 ), Utilize ASHRAE 90.1 Laboratory prototype model
+
+## Version 0.6.1
+
+Date Range 5/1/21 - 7/1/21
+
+- Fixed [#222]( https://github.com/urbanopt/urbanopt-cli/issues/222 ), Add a resilience flag to reopt processing
+- Fixed [#224]( https://github.com/urbanopt/urbanopt-cli/issues/224 ), Createbar and Floorspace mappers are out of date
+- Fixed [#227]( https://github.com/urbanopt/urbanopt-cli/issues/227 ), Runtime error when running urbanopt cli example project
+- Fixed [#233]( https://github.com/urbanopt/urbanopt-cli/issues/233 ), update rubocop configs to v4
+- Fixed [#235]( https://github.com/urbanopt/urbanopt-cli/issues/235 ), Re-add old residential types to the commercial hash
+- Fixed [#238]( https://github.com/urbanopt/urbanopt-cli/issues/238 ), Fix BuildingResidentialModel feature_id argument - JSON parse bug
+- Fixed [#240]( https://github.com/urbanopt/urbanopt-cli/issues/240 ), Update example mappers from urbanopt-example-geojson-project
+- Fixed [#242]( https://github.com/urbanopt/urbanopt-cli/issues/242 ), Add load_flexibility require to baseline mapper
+
+## Version 0.6.0
+
+Date Range 3/31/21 - 4/30/21
+
+- Fixed [#179]( https://github.com/urbanopt/urbanopt-cli/issues/179 ), Visualization : Annual End Use graphs, updating end-use tags
+- Fixed [#185]( https://github.com/urbanopt/urbanopt-cli/issues/185 ), Add additional fuels used by the residential workflow to the first chart (when they exist)
+- Updated dependencies for OpenStudio 3.2.0 / Ruby 2.7
+
 ## Version 0.5.2
 
 Date Range 3/9/21 - 3/31/21

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(UrbanOptCLI VERSION 0.5.1)
+project(UrbanOptCLI VERSION 0.6.2)
 
 include(FindOpenStudioSDK.cmake)
 
@@ -89,16 +89,16 @@ option(BUILD_PACKAGE "Build package" OFF)
 # need to  update the MD5sum for each platform and url below
 if(UNIX)
    if(APPLE)
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210315-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "5df336da22c90534c8940c41e6489b37")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210802-darwin.tar.gz ")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "5b607464c5f003477d11ddb73cb7d493")
    else()
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210315-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6e92becdac2d67046340daf16faea8b2")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210802-linux.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "c43152b7235f70d3b875722cb83b5db8")
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210315-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "be2cde77dde2891d8111454bb280bbdc")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210809-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "240892fcd96165ce1e3ef879c0367063")
   endif()
 endif()
 
@@ -125,15 +125,15 @@ set(RUBY_DIR "${PROJECT_BINARY_DIR}/ruby")
 
 if(UNIX)
    if(APPLE)
-     set(RUBY_ZIP_FILENAME "ruby-2.5.5-darwin.tar.gz")
-     set(RUBY_ZIP_EXPECTED_MD5 "27e3e91bd19f4edf1c04d31c7345ce5d")
+     set(RUBY_ZIP_FILENAME "ruby-2.7.2-darwin.tar.gz")
+     set(RUBY_ZIP_EXPECTED_MD5 "1ee27d6381797a5af7398f8eee8edb07")
    else()
-     set(RUBY_ZIP_FILENAME "ruby-2.5.5-linux.tar.gz")
-     set(RUBY_ZIP_EXPECTED_MD5 "5c9ab1aeb3366e6e579592cbb72ddbef")
+     set(RUBY_ZIP_FILENAME "ruby-2.7.2-linux.tar.gz")
+     set(RUBY_ZIP_EXPECTED_MD5 "853425b0c9878b064937f9e49688c6c6")
    endif()
 elseif(WIN32)
-     set(RUBY_ZIP_FILENAME "ruby-2.5.1-win32.tar.gz")
-     set(RUBY_ZIP_EXPECTED_MD5 "96495c32f5933250663df7561fdd6226")
+     set(RUBY_ZIP_FILENAME "ruby-2.7.2-win32.tar.gz")
+     set(RUBY_ZIP_EXPECTED_MD5 "414a24f3ebb074534d2186595683c5b4")
 endif()
 
 set(RUBY_ZIP_LOCAL_PATH "${PROJECT_BINARY_DIR}/${RUBY_ZIP_FILENAME}")

data/FindOpenStudioSDK.cmake

@@ -1,5 +1,5 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 1)
+set(OPENSTUDIO_VERSION_MINOR 2)
 set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
@@ -16,18 +16,23 @@ else()
   set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
     CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
 
-  set(OPENSTUDIO_VERSION_SHA "+e165090621")
+  set(OPENSTUDIO_VERSION_SHA "+e11f0a08b2")
 
   if(APPLE)
-    set(OPENSTUDIO_EXPECTED_HASH 20d74394f0889261ee1c382383461b0b)
+    set(OPENSTUDIO_EXPECTED_HASH 883c0f83ab7a09875e851726e32ba591)
     set(OPENSTUDIO_PLATFORM "Darwin")
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(UNIX)
-    set(OPENSTUDIO_EXPECTED_HASH 866cdac61ca955ce6d13ecf0fa5230a2)
-    set(OPENSTUDIO_PLATFORM "Linux")
+    if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
+      set(OPENSTUDIO_EXPECTED_HASH 25c4cfe614676376581657440ba447ae)
+      set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
+    else() # Assumes 18.04
+      set(OPENSTUDIO_EXPECTED_HASH 623d3e10c17f1dc99bb869deb8a2550e)
+      set(OPENSTUDIO_PLATFORM "Ubuntu-18.04")
+    endif()
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(WIN32)
-    set(OPENSTUDIO_EXPECTED_HASH aa04ed795c6d2b558df6175fad042f1f)
+    set(OPENSTUDIO_EXPECTED_HASH 740d5d8ba67ca914412e12c618d2cc28)
     set(OPENSTUDIO_PLATFORM "Windows")
     set(OPENSTUDIO_EXT "tar.gz")
   endif()

data/Gemfile

@@ -36,19 +36,19 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # if allow_local && File.exist?('../urbanopt-scenario-gem')
 #  gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
 # elsif allow_local
-  #  gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+# gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../urbanopt-geojson-gem')
 #   gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
 # elsif allow_local
-#   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
+#  gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../urbanopt-reopt-gem')
-#   gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
+#  gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
 # elsif allow_local
-#   gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
+#  gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../openstudio-load-flexibility-measures')
@@ -58,7 +58,13 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # end
 
 # if allow_local && File.exist?('../urbanopt-reporting-gem')
-  # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
+#  gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
 # elsif allow_local
-  # gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
+#  gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
+# end
+
+# if allow_local && File.exist?('../urbanopt-rnm-us-gem')
+#  gem 'urbanopt-rnm-us', path: '../urbanopt-rnm-us-gem'
+# elsif allow_local
+#  gem 'urbanopt-rnm-us', github: 'URBANopt/urbanopt-rnm-us-gem', branch: 'develop'
 # end

data/example_files/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-ruby '~> 2.5.0'
+ruby '~> 2.7.0'
 
 # Local gems are useful when developing and integrating the various dependencies.
 # To favor the use of local gems, set the following environment variable:
@@ -31,7 +31,7 @@ if allow_local && File.exist?('../openstudio-common-measures-gem')
 elsif allow_local
   gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
 else
-  gem 'openstudio-common-measures', '~> 0.3.2'
+  gem 'openstudio-common-measures', '~> 0.4.0'
 end
 
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -39,7 +39,7 @@ if allow_local && File.exist?('../openstudio-model-articulation-gem')
 elsif allow_local
   gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
 else
-  gem 'openstudio-model-articulation', '~> 0.3.1'
+  gem 'openstudio-model-articulation', '~> 0.4.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
@@ -47,7 +47,7 @@ if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
 elsif allow_local
   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master'
 else
-  gem 'openstudio-load-flexibility-measures', '~> 0.2.1'
+  gem 'openstudio-load-flexibility-measures', '~> 0.3.2'
 end
 
 if allow_local && File.exist?('../openstudio-ee-gem')
@@ -55,7 +55,7 @@ if allow_local && File.exist?('../openstudio-ee-gem')
 elsif allow_local
   gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop'
 else
-  gem 'openstudio-ee', '~> 0.3.2'
+  gem 'openstudio-ee', '~> 0.4.0'
 end
 
 if allow_local && File.exist?('../openstudio-calibration-gem')
@@ -63,7 +63,7 @@ if allow_local && File.exist?('../openstudio-calibration-gem')
 elsif allow_local
   gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop'
 else
-  gem 'openstudio-calibration', '~> 0.3.1'
+  gem 'openstudio-calibration', '~> 0.4.0'
 end
 
 if allow_local && File.exists?('../urbanopt-geojson-gem')
@@ -71,13 +71,16 @@ if allow_local && File.exists?('../urbanopt-geojson-gem')
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '~> 0.5.0'
+  gem 'urbanopt-geojson', '~> 0.6.6'
 end
 
+# NEVER put SCENARIO-GEM in this file...it will make all simulations fail due to the sqlite dependency
+# gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+
 if allow_local && File.exists?('../urbanopt-reporting-gem')
   gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
 elsif allow_local
   gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 else
-  gem 'urbanopt-reporting', '~> 0.3.6'
+  gem 'urbanopt-reporting', '~> 0.4.2'
 end

data/example_files/base_workflow_res.osw

@@ -129,6 +129,11 @@
         "charge_start": "23:00",
         "inter_sp": 46
         }
+    },{
+      "measure_dir_name":"add_hpwh",
+      "arguments":{
+        "__SKIP__":true
+        }
     },{
       "measure_dir_name": "add_packaged_ice_storage",
       "arguments": {
@@ -144,6 +149,11 @@
         "feature_type": null,
         "feature_location": null
       }
+    },{
+      "measure_dir_name": "openstudio_results",
+      "arguments": {
+        "__SKIP__": true
+      }
     }
   ],
   "name": null,

data/example_files/example_project_combined.json

@@ -147,7 +147,11 @@
         "building_type": "Food service",
         "floor_area": 125631,
         "footprint_area": 41877,
-        "number_of_stories": 3
+        "number_of_stories": 3,
+        "weekday_start_time": "11:00",
+        "weekday_duration": "11:30",
+        "weekend_start_time": "11:00",
+        "weekend_duration": "11:30"
       },
       "geometry": {
         "type": "Polygon",
@@ -186,7 +190,11 @@
         "building_type": "Food service",
         "floor_area": 31623,
         "footprint_area": 10541,
-        "number_of_stories": 3
+        "number_of_stories": 3,
+        "weekday_start_time": "06:00",
+        "weekday_duration": "07:00",
+        "weekend_start_time": "08:00",
+        "weekend_duration": "05:00"
       },
       "geometry": {
         "type": "Polygon",
@@ -225,7 +233,9 @@
         "building_type": "Food service",
         "floor_area": 8804,
         "footprint_area": 8804,
-        "number_of_stories": 1
+        "number_of_stories": 1,
+        "weekday_start_time": "06:00",
+        "weekday_duration": "16:00"
       },
       "geometry": {
         "type": "Polygon",