urbanopt-cli 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a33750f7c6d4a272f98b1965ac605a17349f2c31235dac2d539dbd0958844cfc
-  data.tar.gz: 3107b8c5a949a7b2ef9e9cf2da3155ca4dd36a2af04006dc9edaecd1daf8360b
+  metadata.gz: 69e383f8abed971d033f6296a31fbd9d438576db30b80816677d6455b4638ac1
+  data.tar.gz: f25160da58766204b410dd6f71e59a8cb5530ccbc8bd934fa822e12c75e8d6ad
 SHA512:
-  metadata.gz: 8e4fd980a5075d636e26dc758bd184d53357b8d54505a1d23991237606129fd48d4435f4b619cb3f9fa793bc0296b0cc48e19775ff99a1bc8b1d4124296ae764
-  data.tar.gz: ab483f7b04979ff2cb2fb34766fbda90f8ffacc014e1bb450f1d5ef048cba0464b3abe09646307b3fc626fc66f520888e7f846e0e8f232c0c151b2e6763a7197
+  metadata.gz: ea137de61c00c820f19ec8a98b788eac3275333c0406919c801bdd8761cad0f0f71d4b39f2bef354f4c967c6b5d0e33ea0303ae5fb1b629551e40a247aee06c1
+  data.tar.gz: 988c6ede628ff3945e6bb9dcc8ec6325e768e5e64c4218a79ce51f1a4f3657c710dad153994e69508fb97a2ca03fb2b0505e8387328eb9b4db8b3593891f2d5c

data/.gitignore

@@ -20,13 +20,12 @@
 .rspec_status
 
 # rspec test folder
-spec/test_directory
-spec/test_directory_res
-spec/test_directory_elec
-spec/test_directory_*
+spec/test_directory*
 
 Gemfile.lock
 .rubocop*
 
-# python dependencies
-example_files/python_deps
+# python dependencies local  install
+example_files/python_deps/Miniconda*
+example_files/python_deps/python_config.json
+example_files/python_deps/python

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## Version 0.9.0
+Date Range: 07/07/22 - 12/13/22:
+
+- Fixed [#305]( https://github.com/urbanopt/urbanopt-cli/issues/305 ), Expand RNM to OpenDSS connection
+- Fixed [#330]( https://github.com/urbanopt/urbanopt-cli/issues/330 ), Create a UO CLI command to install DISCO 
+- Fixed [#331]( https://github.com/urbanopt/urbanopt-cli/issues/331 ), Install Miniconda Python, pip, and Python dependencies within urbanopt installation
+- Fixed [#361]( https://github.com/urbanopt/urbanopt-cli/issues/361 ), CLI command to update an existing project to latest URBANopt version
+- Fixed [#380]( https://github.com/urbanopt/urbanopt-cli/issues/380 ), Better error handling of uo create command
+- New Feature - Initial DISCO integration
+- CLI command for Class Project creation 
+- Added RNM flag to OpenDSS command for processing RNM-US DSS files
+- New Feature - 3 GEB scenarios: add chilled water storage, EPD reduction during Peak Hours, Adjust Thermostat during Peak Hours
+- Updated dependencies for OpenStudio 3.5.0 and HPXML 1.5.0
+
 ## Version 0.8.3
 Date Range: 07/07/22 - 09/30/22:
 

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(URBANoptCLI VERSION 0.8.2)
+project(URBANoptCLI VERSION 0.8.3)
 
 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-20220711-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bcc9c16f0736838727050564a55b3806")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20221011-darwin.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "9eee6fb77b168d1b2211e1888f733c63")
    else()
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20220711-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6b6054e9d9bf6efecfc4054158f685b6")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20221011-linux.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "5d10dc28cca00bbaed4df8ba0a930868")
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20220711-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "7d1b2cd1d97c177885d41ef07c856e1d")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20221011-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "9c9dff191bc91379ce60923bfe6cfa4a")
   endif()
 endif()
 

data/Gemfile

@@ -15,13 +15,14 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # these are included in the gemspec file
 #
 # if allow_local && File.exist?('../OpenStudio-extension-gem')
-#   gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
+#  gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
 # elsif allow_local
 #   gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../urbanopt-scenario-gem')
 #  gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
+# TODO: COMMENT OUT AFTER RELEASE OF GEM
 # elsif allow_local
 #  gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 # end
@@ -46,6 +47,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 #  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

data/README.md

@@ -166,6 +166,15 @@ Installed CLI version:
 uo --version
 ```
 
+## Current Python Dependencies
+
+Python dependencies are currently versioned as follows:
+
+| Python Package  | Version |
+| ----------- | ----------- |
+| urbanopt-ditto-reader      | 0.4.0       |
+| NREL-disco   |  0.3.4 from https://github.com/NREL/disco.git |
+
 ## Development
 
 To install this gem onto your local machine, clone this repo and run `bundle exec rake install`. If you make changes to this repo, update the version number in `lib/version.rb` in your first commit. When ready to release, [follow the documentation](https://docs.urbanopt.net/developer_resources/release_instructions.html).

data/example_files/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 ruby '~> 2.7.0'
 
@@ -20,18 +20,18 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # end
 
 # if allow_local && File.exist?('../urbanopt-core-gem')
-#   gem 'urbanopt-core', path: '../urbanopt-core-gem'
+#  gem 'urbanopt-core', path: '../../urbanopt-core-gem'
 # elsif allow_local
-#   gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
+#  gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
 # end
-#
+
 
 if allow_local && File.exist?('../openstudio-common-measures-gem')
-  gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
+  gem 'openstudio-common-measures', path: '../../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.6.1'
+  gem 'openstudio-common-measures', '~> 0.7.0'
 end
 
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -39,15 +39,15 @@ 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.6.1'
+  gem 'openstudio-model-articulation', '~> 0.7.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'
 elsif allow_local
-  gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master'
+  gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'develop'
 else
-  gem 'openstudio-load-flexibility-measures', '~> 0.5.0'
+   gem 'openstudio-load-flexibility-measures', '~> 0.6.1'
 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.6.0'
+  gem 'openstudio-ee', '~> 0.7.0'
 end
 
 if allow_local && File.exist?('../openstudio-calibration-gem')
@@ -63,25 +63,32 @@ 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.6.0'
+  gem 'openstudio-calibration', '~> 0.7.0'
 end
 
+if allow_local && File.exist?('../../openstudio-geb')
+  gem 'openstudio-geb', path: '../../../openstudio-geb-gem'
+elsif allow_local
+  gem 'openstudio-geb', github: 'LBNL-ETA/openstudio-geb-gem', branch: 'master'
+else
+  gem 'openstudio-geb', '~> 0.2.1'
+end
 
-if allow_local && File.exist?('../urbanopt-geojson-gem')
- gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
+if allow_local && File.exists?('../urbanopt-geojson-gem')
+  gem 'urbanopt-geojson', path: '../../urbanopt-geojson-gem'
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '~> 0.8.1'
+  gem 'urbanopt-geojson', '~> 0.9.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.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'
 else
- gem 'urbanopt-reporting', '~> 0.6.1'
+  gem 'urbanopt-reporting', '~> 0.7.0'
 end

data/example_files/Gemfile.lock

@@ -0,0 +1,177 @@
+GIT
+  remote: https://github.com/LBNL-ETA/openstudio-geb-gem.git
+  revision: 07321f00809051a1b9c2a1d4dc640bd787f5284d
+  branch: master
+  specs:
+    openstudio-geb (0.2.0)
+      openstudio-extension (~> 0.6.0)
+      openstudio-standards (~> 0.3.0)
+
+GIT
+  remote: https://github.com/URBANopt/urbanopt-core-gem.git
+  revision: 9e155bba21cb638f6141c1e70c82ae62034da4ff
+  branch: OS-3.5
+  specs:
+    urbanopt-core (0.9.0)
+      openstudio-extension (~> 0.6.0)
+
+GIT
+  remote: https://github.com/URBANopt/urbanopt-geojson-gem.git
+  revision: 1e252308a81c2a756de4d03aa36299d5c7f770f9
+  branch: OS-3.5
+  specs:
+    urbanopt-geojson (0.9.0)
+      json-schema (~> 2.8)
+
+GIT
+  remote: https://github.com/URBANopt/urbanopt-reporting-gem.git
+  revision: 7a4dcf4d902890d504f2ab3a8dbd82f1e4791cdd
+  branch: OS-3.5
+  specs:
+    urbanopt-reporting (0.7.0)
+      json-schema (~> 2.8)
+      json_pure (~> 2.3)
+      openstudio-extension (~> 0.6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ansi (1.5.0)
+    ast (2.4.2)
+    bcl (0.7.1)
+      builder (= 3.2.4)
+      faraday (~> 1.0.1)
+      minitar (~> 0.9)
+      openstudio_measure_tester (~> 0.3.1)
+      rexml (= 3.2.5)
+      rubyzip (~> 2.3.2)
+      spreadsheet (= 1.2.9)
+      uuid (~> 2.3.9)
+      yamler (= 0.1.0)
+      zliby (= 0.0.5)
+    builder (3.2.4)
+    docile (1.4.0)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.12.0)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    json_pure (2.6.3)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
+    minitar (0.9)
+    minitest (5.14.4)
+    minitest-reporters (1.4.3)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    multipart-post (2.2.3)
+    octokit (4.18.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    openstudio-calibration (0.7.0)
+      bundler (~> 2.1)
+      openstudio-extension (~> 0.6.0)
+      openstudio-standards (~> 0.3.0)
+    openstudio-common-measures (0.7.0)
+      bundler (>= 2.1)
+      openstudio-extension (~> 0.6.0)
+      openstudio-standards (~> 0.3.0)
+    openstudio-ee (0.7.0)
+      bundler (~> 2.1)
+      openstudio-extension (~> 0.6.0)
+      openstudio-standards (~> 0.3.0)
+    openstudio-extension (0.6.0)
+      bcl (~> 0.7.1)
+      bundler (~> 2.1.0)
+      octokit (~> 4.18.0)
+      openstudio-workflow (~> 2.3.0)
+      openstudio_measure_tester (~> 0.3.1)
+      parallel (~> 1.19.1)
+    openstudio-load-flexibility-measures (0.6.1)
+      bundler (~> 2.1)
+      openstudio-extension (~> 0.6.0)
+      openstudio-standards (~> 0.3.0)
+    openstudio-model-articulation (0.7.0)
+      bundler (~> 2.1)
+      openstudio-extension (~> 0.6.0)
+      openstudio-standards (~> 0.3.0)
+    openstudio-standards (0.3.0)
+    openstudio-workflow (2.3.1)
+    openstudio_measure_tester (0.3.2)
+      git (~> 1.12.0)
+      minitest (~> 5.14.0)
+      minitest-reporters (~> 1.4.2)
+      rake (~> 13.0)
+      rubocop (~> 1.15.0)
+      rubocop-checkstyle_formatter (~> 0.4.0)
+      rubocop-performance (~> 1.11.3)
+      simplecov (~> 0.18.2)
+    parallel (1.19.2)
+    parser (3.1.3.0)
+      ast (~> 2.4.1)
+    public_suffix (5.0.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rubocop (1.15.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.24.0)
+      parser (>= 3.1.1.0)
+    rubocop-checkstyle_formatter (0.4.0)
+      rubocop (>= 0.35.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-ole (1.2.12.2)
+    ruby-progressbar (1.11.0)
+    rubyzip (2.3.2)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    spreadsheet (1.2.9)
+      ruby-ole
+    systemu (2.6.5)
+    unicode-display_width (2.3.0)
+    uuid (2.3.9)
+      macaddr (~> 1.0)
+    yamler (0.1.0)
+    zliby (0.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  openstudio-calibration (~> 0.7.0)
+  openstudio-common-measures (~> 0.7.0)
+  openstudio-ee (~> 0.7.0)
+  openstudio-geb!
+  openstudio-load-flexibility-measures (~> 0.6.1)
+  openstudio-model-articulation (~> 0.7.0)
+  urbanopt-core!
+  urbanopt-geojson!
+  urbanopt-reporting!
+
+RUBY VERSION
+   ruby 2.7.2p137
+
+BUNDLED WITH
+   2.1.4

data/example_files/base_workflow_res.osw

@@ -108,6 +108,20 @@
         "add_hvac": true,
         "use_upstream_args": false
       }
+    },{
+      "measure_dir_name": "add_chilled_water_storage_tank",
+      "arguments": {
+        "__SKIP__": true,
+        "objective": "Partial Storage",
+        "primary_loop_sp": 6.7,
+        "secondary_loop_sp": 6.7,
+        "primary_delta_t": "Use Existing Loop Value",
+        "discharge_start": "08:00",
+        "discharge_end": "21:00",
+        "charge_start": "23:00",
+        "charge_end": "07:00",
+        "run_output_path": "."
+      }
     },{
       "measure_dir_name": "add_ems_emissions_reporting",
       "arguments": {
@@ -128,6 +142,34 @@
         "clothingSchedule":"Clothing Schedule",
         "airVelocitySchedule":"Air Velocity Schedule"
       }
+    },{
+      "measure_dir_name": "reduce_epd_by_percentage_for_peak_hours",
+      "arguments": {
+        "__SKIP__": true,
+        "epd_reduce_percent": 50,
+        "start_time": "17:00:00",
+        "end_time": "21:00:00",
+        "start_date1": "07-01",
+        "end_date1": "08-31"
+      }
+    },
+    {
+      "measure_dir_name": "AdjustThermostatSetpointsByDegreesForPeakHours",
+      "arguments": {
+        "__SKIP__": true,
+        "cooling_adjustment": 2,
+        "cooling_daily_starttime": "16:01:00",
+        "cooling_daily_endtime": "20:00:00",
+        "cooling_startdate": "06-01",
+        "cooling_enddate": "09-30",
+        "heating_adjustment": 2,
+        "heating_daily_starttime": "16:01:00",
+        "heating_daily_endtime": "20:00:00",
+        "heating_startdate_1": "01-01",
+        "heating_enddate_1": "05-31",
+        "heating_startdate_2": "10-01",
+        "heating_enddate_2": "12-31"
+      }
     },{
       "measure_dir_name": "IncreaseInsulationRValueForExteriorWalls",
       "arguments": {
@@ -168,7 +210,8 @@
         "size_mult": "0.75",
         "charge_start": "23:00"
       }
-    },{
+    },
+    {
       "measure_dir_name":"export_time_series_modelica",
       "arguments":{
         "__SKIP__":false
@@ -178,19 +221,6 @@
       "arguments":{
         "__SKIP__":false
       }
-    },{
-      "measure_dir_name": "default_feature_reports",
-      "arguments": {
-        "feature_id": null,
-        "feature_name": null,
-        "feature_type": null,
-        "feature_location": null
-      }
-    },{
-      "measure_dir_name": "openstudio_results",
-      "arguments": {
-        "__SKIP__": true
-      }
     },
     {
       "measure_dir_name": "envelope_and_internal_load_breakdown",
@@ -226,6 +256,19 @@
         "check_supply_air_and_thermostat_temp_difference_tol": 4.0,
         "__SKIP__": true
       }
+    },{
+      "measure_dir_name": "default_feature_reports",
+      "arguments": {
+        "feature_id": null,
+        "feature_name": null,
+        "feature_type": null,
+        "feature_location": null
+      }
+    },{
+      "measure_dir_name": "openstudio_results",
+      "arguments": {
+        "__SKIP__": true
+      }
     }
   ],
   "name": null,