urbanopt-cli 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3f2e38d0e23b0b01add165d3459f4abf5b37482018d148e89ffeaa024db9b9
-  data.tar.gz: 763bfe69e81be0763235196abb1e2749483fc1f9c6a6718e5a97222cbbd0c5fc
+  metadata.gz: cdbb8ccb8a831bc0fd662c5a4cbcdf4fba8ac395fc783f43a6d6e1e828564b15
+  data.tar.gz: fb06db3924a64118be767d68fa3d336d573f6219cc69ffd6b6d4ec31f0a9c58e
 SHA512:
-  metadata.gz: fd2a7ff86a5ba8442b9b03836c0b299d55ddad8175e9757049cfccab1877efc1cb153b9653b3725735e5d13fc161412e0d62d8d6c9a250e911dc246ef4cff4bc
-  data.tar.gz: 526a186e149cce00eee2ee85694a6d3b84d903d42cf94d6c214698f13c7db05aab04cc8cfef57d6f5ce0f244b55a8ee811cbcba7b3ae63c7105328b4230b5905
+  metadata.gz: 38cf1540424ff83123ad91ca852939c2a232d9d2de822fd391050f6d24d769a1b496a32427fe3202c9fd1c4e133e55ff6c0ff8b2155b53c4de5aadbcb8e3f0d8
+  data.tar.gz: 89c70836f3f3516cd2e59af1ec87d75d456700f60d6da9e8b23a8fe5394065fdc6bf6972041b84a5a849f378d583efe8ac863d7b137ace49da3ee15e3e7d4aca

data/.gitignore

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

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## Versuib 0.7.1
+
+Date Range 11/23/21 - 12/22/21
+
+- Bugfix: update project gemfile dependencies
+
+## Version 0.7.0
+
+Date Range 11/4/21 - 11/22/21
+
+- Fixed [#278]( https://github.com/urbanopt/urbanopt-cli/issues/278 ), Visualizations are broken for scenarios without REopt results
+- Fixed [#275]( https://github.com/urbanopt/urbanopt-cli/issues/275 ), Skip detailed model creation workflow if create bar workflow selected and detailed osm present
+- Fixed [#272]( https://github.com/urbanopt/urbanopt-cli/issues/272 ), looking for simulations run for opendss fails when there are other folders in the run folder
+- Updated dependencies for OpenStudio 3.3
+
+## Version 0.6.4
+
+Date Range 10/29/21 - 11/3/21
+
+- Fixed [#267]( https://github.com/urbanopt/urbanopt-cli/issues/267 ), Default the GCR (ground coverage ratio) for PV to 0.99 in all example assumptions files
+
+## 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

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(UrbanOptCLI VERSION 0.6.1)
+project(URBANoptCLI VERSION 0.7.0)
 
 include(FindOpenStudioSDK.cmake)
 
@@ -56,7 +56,7 @@ else()
   set(GIT_DIR "")
 endif()
 
-# UrbanOpt version: Allows to add a pre1 tag as needed.
+# URBANopt version: Allows to add a pre1 tag as needed.
 set(URBANOPT_CLI_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # TODO JM 2019-07-12: Comment out (or delete) if prerelease tag not needed
 set(URBANOPT_CLI_PRERELEASE_TAG "")
@@ -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-20210709-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "87513383adca79de074cca2ea4ffc4a8")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems=20211217-darwin.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "013879063606d24ccb163304042d704c")
    else()
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210709-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "93ce8920db98344a44abd691567c2c77")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211217-linux.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "25ee39a3ac39c2354eea28194679aea3")
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210709-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "487e0668e92cc44e46a59693ccb910a3")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211217-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "f5a2e6e9d1861c79b7c9de924da2e316")
   endif()
 endif()
 
@@ -109,7 +109,7 @@ if(EXISTS "${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}")
 endif()
 
 if(NOT URBANOPT_CLI_GEMS_ZIP_MD5 STREQUAL URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5)
-  message(STATUS "Downloading UrbanOpt-CLI Gems: ${URBANOPT_CLI_GEMS_ZIP_FILENAME}")
+  message(STATUS "Downloading URBANopt-CLI Gems: ${URBANOPT_CLI_GEMS_ZIP_FILENAME}")
   file(DOWNLOAD "https://urbanopt-cli-resources.s3-us-west-2.amazonaws.com/gems/${URBANOPT_CLI_GEMS_ZIP_FILENAME}"
     ${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}
     INACTIVITY_TIMEOUT 300 # 5 minute timeout
@@ -164,19 +164,19 @@ endif()
 ######### Install SDK dependencies here ################
 
 install(DIRECTORY "${OPENSTUDIO_SDK_PATH}/" DESTINATION "OpenStudio" COMPONENT "OpenStudio" USE_SOURCE_PERMISSIONS)
-#install(DIRECTORY "${URBANOPT_CLI_GEMS_DIR}/" DESTINATION ".gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
+#install(DIRECTORY "${URBANOPT_CLI_GEMS_DIR}/" DESTINATION ".gems" COMPONENT "URBANopt" USE_SOURCE_PERMISSIONS)
 
 
 if(UNIX)
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-unix.sh DESTINATION "." COMPONENT "UrbanOpt" RENAME "setup-env.sh")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-unix.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
 elseif(WIN32)
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "UrbanOpt" RENAME "setup-env.sh")
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "UrbanOpt")
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "UrbanOpt")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "URBANopt")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "URBANopt")
 endif()
 
 install(DIRECTORY "${PROJECT_BINARY_DIR}/ruby" DESTINATION "." COMPONENT "Ruby" USE_SOURCE_PERMISSIONS)
-install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt-cli-gems/" DESTINATION "gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
+install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt-cli-gems/" DESTINATION "gems" COMPONENT "URBANopt" USE_SOURCE_PERMISSIONS)
 
 #if(WIN32)
 #  install(PROGRAMS "${OPENSTUDIO_SDK_PATH}/bin/install_utility.exe" DESTINATION bin COMPONENT "CLI")
@@ -193,7 +193,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${URBANOPT_CLI_VERSION_PATCH})
 
 # TODO:/URBANOPT_CLI_VERSION
 # CPACK_DEBIAN_PACKAGE_DESCRIPTION defaults to this one too. dpkg-deb -I xxx.deb will show this description
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "UrbanOptCLI ${URBANOPT_CLI_VERSION} is a CLI software tool to support whole building energy modeling using EnergyPlus and advanced daylight analysis using Radiance")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "URBANoptCLI ${URBANOPT_CLI_VERSION} is a CLI software tool to support whole building energy modeling using EnergyPlus and advanced daylight analysis using Radiance")
 
 # The actual package file name on disk
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${URBANOPT_CLI_LONG_VERSION}-${CMAKE_SYSTEM_NAME}")
@@ -203,8 +203,8 @@ set(CPACK_PACKAGE_CONTACT "openstudio@nrel.gov")
 #install(FILES "${PROJECT_SOURCE_DIR}/LICENSE.md" DESTINATION .)
 
 if (APPLE)
-  #set(CPACK_IFW_TARGET_DIRECTORY "/Applications/UrbanOpt-cli-${URBANOPT_CLI_VERSION}")
-  set(CPACK_IFW_TARGET_DIRECTORY "/Applications/UrbanOptCLI_${URBANOPT_CLI_VERSION}/")
+  #set(CPACK_IFW_TARGET_DIRECTORY "/Applications/URBANopt-cli-${URBANOPT_CLI_VERSION}")
+  set(CPACK_IFW_TARGET_DIRECTORY "/Applications/URBANoptCLI_${URBANOPT_CLI_VERSION}/")
 elseif(UNIX)
 
   # For debug
@@ -235,7 +235,7 @@ elseif(UNIX)
   set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CPACK_DEBIAN_BIN_PACKAGE_CONTROL_EXTRA};${POSTINST_FILE};${POSTRM_FILE}")
 
 elseif(WIN32)
-  set(CPACK_PACKAGE_INSTALL_DIRECTORY "UrbanOpt-cli-${URBANOPT_CLI_VERSION}")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "URBANopt-cli-${URBANOPT_CLI_VERSION}")
   set(CPACK_IFW_TARGET_DIRECTORY "C:/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
   set(CPACK_BINARY_IFW ON CACHE BOOL "Enable to build IFW packages")
   set(CPACK_BINARY_NSIS OFF CACHE BOOL "Enable to build NSIS packages")
@@ -243,9 +243,9 @@ endif()
 
 include(CPackIFW)
 
-cpack_add_component(UrbanOpt
-  DISPLAY_NAME "UrbanOpt CLI"
-  DESCRIPTION "UrbanOpt CLI software tool"
+cpack_add_component(URBANopt
+  DISPLAY_NAME "URBANopt CLI"
+  DESCRIPTION "URBANopt CLI software tool"
 )
 
 cpack_add_component(OpenStudio
@@ -253,7 +253,7 @@ cpack_add_component(OpenStudio
   DESCRIPTION "OpenStudio SDK"
 )
 
-cpack_ifw_configure_component(UrbanOpt
+cpack_ifw_configure_component(URBANopt
   REQUIRES_ADMIN_RIGHTS
 )
 

data/FindOpenStudioSDK.cmake

@@ -1,5 +1,5 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 2)
+set(OPENSTUDIO_VERSION_MINOR 3)
 set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
@@ -16,23 +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 "+e11f0a08b2")
+  set(OPENSTUDIO_VERSION_SHA "+ad235ff36e")
 
   if(APPLE)
-    set(OPENSTUDIO_EXPECTED_HASH 883c0f83ab7a09875e851726e32ba591)
+    set(OPENSTUDIO_EXPECTED_HASH 77c2bf77f07dc2e2af7658df55940c49)
     set(OPENSTUDIO_PLATFORM "Darwin")
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(UNIX)
     if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
-      set(OPENSTUDIO_EXPECTED_HASH 25c4cfe614676376581657440ba447ae)
+      set(OPENSTUDIO_EXPECTED_HASH 7fca6ef73399fdb21cde01aca4223d7c)
       set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
     else() # Assumes 18.04
-      set(OPENSTUDIO_EXPECTED_HASH 623d3e10c17f1dc99bb869deb8a2550e)
+      set(OPENSTUDIO_EXPECTED_HASH 24858ac666a3d2fc40d0cff7b4f444b9)
       set(OPENSTUDIO_PLATFORM "Ubuntu-18.04")
     endif()
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(WIN32)
-    set(OPENSTUDIO_EXPECTED_HASH 740d5d8ba67ca914412e12c618d2cc28)
+    set(OPENSTUDIO_EXPECTED_HASH f01ddb50a7ce1f4461e1919350e7c629)
     set(OPENSTUDIO_PLATFORM "Windows")
     set(OPENSTUDIO_EXT "tar.gz")
   endif()

data/Gemfile

@@ -46,9 +46,9 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # 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,13 +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
+# end

data/example_files/Gemfile

@@ -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.4.0'
+  gem 'openstudio-common-measures', '~> 0.5.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.4.0'
+  gem 'openstudio-model-articulation', '~> 0.5.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.3.1'
+  gem 'openstudio-load-flexibility-measures', '~> 0.4.0'
 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.4.0'
+  gem 'openstudio-ee', '~> 0.5.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.4.0'
+  gem 'openstudio-calibration', '~> 0.5.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.6.1'
+  gem 'urbanopt-geojson', '~> 0.7.0'
 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.4.0'
+  gem 'urbanopt-reporting', '~> 0.5.0'
 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",