urbanopt-cli 1.0.0 → 1.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/ISSUE_TEMPLATE/bug_report.md +9 -3
- data/.github/ISSUE_TEMPLATE/feature_request.md +8 -8
- data/.github/pull_request_template.md +1 -1
- data/.github/workflows/nightly_ci_build.yml +3 -4
- data/CHANGELOG.md +29 -4
- data/CMakeLists.txt +40 -29
- data/FindOpenStudioSDK.cmake +9 -29
- data/Gemfile +2 -2
- data/LICENSE.md +1 -1
- data/example_files/python_deps/dependencies.json +2 -2
- data/example_files/reopt/base_assumptions.json +1 -0
- data/example_files/reopt/multiPV_assumptions.json +1 -1
- data/lib/uo_cli/version.rb +1 -1
- data/lib/uo_cli.rb +9 -3
- data/scripts/setup-env-gitbash.sh +5 -3
- data/scripts/setup-env-unix.sh +5 -3
- data/scripts/setup-env.bat +26 -0
- data/scripts/setup-env.ps1 +6 -4
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dd16fe195a9014ad52a171b87c12e10ccf1f9942b1e62b51d9ef4c67146fd90c
|
|
4
|
+
data.tar.gz: 614400588206d4dbff3ff475354024574c52bc7b0abd6377dc2de2b0253c33a3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2ba4f20f27f986b872db5fcdcc37f682e2472da8050d3274f4b9f9e32d76fd0480e197f174eef170e657e82ee859463ea323021d989a00451d15f659af2eb100
|
|
7
|
+
data.tar.gz: 003d8b90b21e95de0a8cf5db27558dbc41e373e50ae49e2d11ac7f44326b024346dd022a8f1f12ddd2cbc129e365d21d88a12b3ec4d2c06bd081ea80c2b79c79
|
|
@@ -9,11 +9,11 @@ assignees: ''
|
|
|
9
9
|
|
|
10
10
|
### Expected behavior
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
<!--A clear and concise description of what you expected to happen.-->
|
|
13
13
|
|
|
14
14
|
### Actual behavior
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
<!--A clear and concise description of what actually happens.-->
|
|
17
17
|
|
|
18
18
|
### To Reproduce
|
|
19
19
|
|
|
@@ -23,6 +23,12 @@ Steps to reproduce the behavior:
|
|
|
23
23
|
1. Enter '...'
|
|
24
24
|
1. Enter '...'
|
|
25
25
|
|
|
26
|
+
### Version
|
|
27
|
+
<!--Please fill in your version of URBANopt to help us diagnose the issue.-->
|
|
28
|
+
<!--If you are not on the [newest version](https://docs.urbanopt.net/developer_resources/compatibility_matrix.html), please update.-->
|
|
29
|
+
<!--Review the [release notes](https://docs.urbanopt.net/developer_resources/known_issues.html) for help with known issues.-->
|
|
30
|
+
URBANopt: `X.Y.Z`
|
|
31
|
+
|
|
26
32
|
### Additional context
|
|
27
33
|
|
|
28
|
-
|
|
34
|
+
<!--Are you behind a firewall? Do you have additional security constraints?-->
|
|
@@ -7,14 +7,14 @@ assignees: ''
|
|
|
7
7
|
|
|
8
8
|
---
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
|
10
|
+
### Is your feature request related to a problem? Please describe
|
|
11
|
+
<!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
A clear and concise description of what you want to happen
|
|
13
|
+
### The solution you'd like
|
|
14
|
+
<!--A clear and concise description of what you want to happen.-->
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
A clear and concise description of any alternative solutions or features you've considered
|
|
16
|
+
### Alternatives you've considered
|
|
17
|
+
<!--A clear and concise description of any alternative solutions or features you've considered.-->
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
Add any other context or screenshots about the feature request here
|
|
19
|
+
### Additional context
|
|
20
|
+
<!--Add any other context or screenshots about the feature request here.-->
|
|
@@ -8,5 +8,5 @@
|
|
|
8
8
|
|
|
9
9
|
- [ ] Unit tests have been added or updated
|
|
10
10
|
- [ ] All ci tests pass (green)
|
|
11
|
-
- [ ]
|
|
11
|
+
- [ ] This PR has been labeled appropriately (which will be used for the changelog)
|
|
12
12
|
- [ ] This branch is up-to-date with develop
|
|
@@ -13,7 +13,7 @@ env:
|
|
|
13
13
|
# Favor_Local_Gems enforces develop branch of all Ruby dependencies
|
|
14
14
|
# This is our canary in the coal mine! If any simulation tests fail, comment this and retry.
|
|
15
15
|
# If CI is then successful, we have a breaking change in a dependency somewhere.
|
|
16
|
-
|
|
16
|
+
FAVOR_LOCAL_GEMS: true
|
|
17
17
|
GEM_DEVELOPER_KEY: ${{ secrets.GEM_DEVELOPER_KEY }}
|
|
18
18
|
UO_NUM_PARALLEL: 4
|
|
19
19
|
# GHA machines have 4 cores. Trying to run more concurrently will slow everything down.
|
|
@@ -56,11 +56,10 @@ jobs:
|
|
|
56
56
|
run: bundle exec rspec -e 'Run and work with a small ${{ matrix.simulation-type }} simulation'
|
|
57
57
|
- name: Upload artifacts
|
|
58
58
|
# Save results for examination - useful for debugging
|
|
59
|
-
uses: actions/upload-artifact@
|
|
60
|
-
# Using v4 would mean we have to change our path design, and/or the test dir names
|
|
59
|
+
uses: actions/upload-artifact@v4
|
|
61
60
|
# Only upload if a previous step fails
|
|
62
61
|
if: failure()
|
|
63
62
|
with:
|
|
64
|
-
name:
|
|
63
|
+
name: rspec_results_${{ matrix.simulation-type }}
|
|
65
64
|
path: artifact.zip
|
|
66
65
|
retention-days: 7 # save for 1 week then delete
|
data/CHANGELOG.md
CHANGED
|
@@ -1,26 +1,52 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## Version 1.0.2
|
|
4
|
+
|
|
5
|
+
### Exciting New Features 🎉
|
|
6
|
+
|
|
7
|
+
* Upgrade GMT to v0.11.0 and TN to v0.4.0 by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/518
|
|
8
|
+
* GMT dependency is now added via the new URBANopt-DES python dependency (v0.1.1)
|
|
9
|
+
|
|
10
|
+
### Other Changes
|
|
11
|
+
|
|
12
|
+
* Restore windows bat by @tijcolem in https://github.com/urbanopt/urbanopt-cli/pull/513
|
|
13
|
+
|
|
14
|
+
## Version 1.0.1
|
|
15
|
+
|
|
16
|
+
## What's Changed
|
|
17
|
+
|
|
18
|
+
* Update reopt assumptions file to work with REopt-api v3.11 by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/504
|
|
19
|
+
|
|
20
|
+
**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v1.0.0...v1.0.1
|
|
21
|
+
|
|
22
|
+
## Version 1.0.0
|
|
23
|
+
|
|
24
|
+
* Update to support ruby 3.2.2 and OpenStudio 3.9.0
|
|
25
|
+
|
|
26
|
+
**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.14.0...v1.0.0
|
|
27
|
+
|
|
3
28
|
## Version 0.14.0
|
|
4
29
|
Date Range: 06/27/2024 - 11/15/2024
|
|
5
30
|
|
|
6
|
-
## What's Changed
|
|
7
31
|
### Exciting New Features 🎉
|
|
32
|
+
|
|
8
33
|
* Upgrade version of ThermalNetwork Python dependency by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/493
|
|
9
34
|
* Upgrade miniconda by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/492
|
|
10
35
|
* Use new version of GMT by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/489
|
|
36
|
+
|
|
11
37
|
### Other Changes
|
|
38
|
+
|
|
12
39
|
* Update installer patch by @tijcolem in https://github.com/urbanopt/urbanopt-cli/pull/476
|
|
13
40
|
* Fix installer path bug by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/485
|
|
14
41
|
* Remove unnecessary default user-entry for DES commands by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/486
|
|
15
42
|
|
|
16
|
-
|
|
17
43
|
**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.13.0...v0.14.0
|
|
18
44
|
|
|
19
45
|
## Version 0.13.0
|
|
20
46
|
Date Range: 05/15/2024 - 06/27/2024
|
|
21
47
|
|
|
22
48
|
### Exciting New Features 🎉
|
|
23
|
-
* Resstock
|
|
49
|
+
* Resstock connection by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/472
|
|
24
50
|
|
|
25
51
|
**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.12.0...v0.13.0
|
|
26
52
|
|
|
@@ -42,7 +68,6 @@ Date Range: 01/26/2024 - 02/08/2024
|
|
|
42
68
|
|
|
43
69
|
* Call GMT-cli correctly by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/449
|
|
44
70
|
|
|
45
|
-
|
|
46
71
|
**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.11.0...v0.11.1
|
|
47
72
|
|
|
48
73
|
## Version 0.11.0
|
data/CMakeLists.txt
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
cmake_minimum_required(VERSION 3.10.2)
|
|
2
2
|
cmake_policy(SET CMP0048 NEW)
|
|
3
3
|
|
|
4
|
-
project(URBANoptCLI VERSION 0.
|
|
4
|
+
project(URBANoptCLI VERSION 1.0.1)
|
|
5
5
|
|
|
6
6
|
include(FindOpenStudioSDK.cmake)
|
|
7
7
|
|
|
@@ -88,22 +88,27 @@ option(BUILD_PACKAGE "Build package" OFF)
|
|
|
88
88
|
# CI will build and upload urbanopt-cli-gems to s3 at (TBD)
|
|
89
89
|
# need to update the MD5sum for each platform and url below
|
|
90
90
|
if(UNIX)
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
91
|
+
if(APPLE)
|
|
92
|
+
if (ARCH MATCHES "arm64")
|
|
93
|
+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250206-darwin_arm64.tar.gz")
|
|
94
|
+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bd2aba33de9d42240a5327ee6b9fd397")
|
|
95
|
+
else()
|
|
96
|
+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250206-darwin_x86_64.tar.gz")
|
|
97
|
+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bd2aba33de9d42240a5327ee6b9fd397")
|
|
98
|
+
endif()
|
|
99
|
+
else()
|
|
100
|
+
if (ARCH MATCHES "arm64")
|
|
101
|
+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250205-linux_arm64.tar.gz")
|
|
102
|
+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "4a5f74315a2d0cb541eb2a419859db23")
|
|
103
|
+
else()
|
|
104
|
+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250205-linux.tar.gz")
|
|
105
|
+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "fde4c0ac38789da809df040c5ce000b8")
|
|
106
|
+
endif()
|
|
107
|
+
endif()
|
|
103
108
|
elseif(WIN32)
|
|
104
109
|
if(CMAKE_CL_64)
|
|
105
|
-
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-
|
|
106
|
-
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "
|
|
110
|
+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250212-windows.tar")
|
|
111
|
+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6b6ffa03f66776f0e8fbbffef4278f61")
|
|
107
112
|
endif()
|
|
108
113
|
endif()
|
|
109
114
|
|
|
@@ -129,21 +134,26 @@ endif()
|
|
|
129
134
|
set(RUBY_DIR "${PROJECT_BINARY_DIR}/ruby")
|
|
130
135
|
|
|
131
136
|
if(UNIX)
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
137
|
+
if(APPLE)
|
|
138
|
+
if(ARCH MATCHES "arm64")
|
|
139
|
+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-darwin_arm64.tar.gz")
|
|
140
|
+
set(RUBY_ZIP_EXPECTED_MD5 "01ccfb8acbf67b3e172795301767dde3")
|
|
141
|
+
else()
|
|
142
|
+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-darwin_x86_64.tar.gz")
|
|
143
|
+
set(RUBY_ZIP_EXPECTED_MD5 "e431eb4e78391d29d7ed0c138f59125c")
|
|
144
|
+
endif()
|
|
145
|
+
else() # Linux
|
|
146
|
+
if (ARCH MATCHES "arm64")
|
|
147
|
+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-linux_arm64.tar.gz")
|
|
148
|
+
set(RUBY_ZIP_EXPECTED_MD5 "7a777f6a4fdbf7b8d561156a94e677b8")
|
|
149
|
+
else()
|
|
150
|
+
set(RUBY_ZIP_EXPECTED_MD5 "74c9f8f4c693df02a361730dcf780a99")
|
|
151
|
+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-linux_x86_64.tar.gz")
|
|
152
|
+
endif()
|
|
153
|
+
endif()
|
|
144
154
|
elseif(WIN32)
|
|
145
|
-
|
|
146
|
-
|
|
155
|
+
set(RUBY_ZIP_FILENAME "ruby-3.2.2_win32.tar.gz")
|
|
156
|
+
set(RUBY_ZIP_EXPECTED_MD5 "c67bda97ad696d66561c3f39387fd5d1")
|
|
147
157
|
endif()
|
|
148
158
|
|
|
149
159
|
set(RUBY_ZIP_LOCAL_PATH "${PROJECT_BINARY_DIR}/${RUBY_ZIP_FILENAME}")
|
|
@@ -182,6 +192,7 @@ if(UNIX)
|
|
|
182
192
|
elseif(WIN32)
|
|
183
193
|
install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
|
|
184
194
|
install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "URBANopt")
|
|
195
|
+
install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "URBANopt")
|
|
185
196
|
endif()
|
|
186
197
|
|
|
187
198
|
install(DIRECTORY "${PROJECT_BINARY_DIR}/ruby" DESTINATION "." COMPONENT "Ruby" USE_SOURCE_PERMISSIONS)
|
data/FindOpenStudioSDK.cmake
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
set(OPENSTUDIO_VERSION_MAJOR 3)
|
|
2
|
-
set(OPENSTUDIO_VERSION_MINOR
|
|
2
|
+
set(OPENSTUDIO_VERSION_MINOR 9)
|
|
3
3
|
set(OPENSTUDIO_VERSION_PATCH 0)
|
|
4
4
|
set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
|
|
5
5
|
|
|
@@ -12,45 +12,25 @@ else()
|
|
|
12
12
|
# This will make it throw, which an informative message
|
|
13
13
|
# find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG REQUIRED)
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
set(OPENSTUDIO_VERSION_SHA "+c77fbb9569")
|
|
16
16
|
set(OPENSTUDIO_BASELINK "https://github.com/NREL/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}"
|
|
17
17
|
CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
|
|
18
18
|
|
|
19
|
-
set(OPENSTUDIO_VERSION_SHA "+d5269793f1")
|
|
20
|
-
|
|
21
19
|
if(APPLE)
|
|
22
|
-
set(OPENSTUDIO_EXPECTED_HASH
|
|
20
|
+
set(OPENSTUDIO_EXPECTED_HASH 39c5ae27eeb840472e36b728ab906315)
|
|
23
21
|
set(OPENSTUDIO_PLATFORM "Darwin-x86_64")
|
|
24
22
|
set(OPENSTUDIO_EXT "tar.gz")
|
|
25
23
|
elseif(UNIX)
|
|
26
|
-
if(
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
set(OPENSTUDIO_EXPECTED_HASH 1e48f36417d3d118d6a10f1a7d61f46e)
|
|
32
|
-
endif()
|
|
33
|
-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
|
|
24
|
+
if (ARCH MATCHES "arm64")
|
|
25
|
+
set(OPENSTUDIO_EXPECTED_HASH fd1ba05628eb55b3bb72923a8395e267)
|
|
26
|
+
set(OPENSTUDIO_PLATFORM "Ubuntu-22.04-arm64")
|
|
27
|
+
else()
|
|
28
|
+
set(OPENSTUDIO_EXPECTED_HASH 67522b9a1ba5749cf0b3cf101a6131cf)
|
|
34
29
|
set(OPENSTUDIO_PLATFORM "Ubuntu-22.04-x86_64")
|
|
35
|
-
else() # Assumes 20.04
|
|
36
|
-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
|
|
37
|
-
set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
|
|
38
|
-
endif()
|
|
39
|
-
if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
|
|
40
|
-
if (ARCH MATCHES "arm64")
|
|
41
|
-
set(OPENSTUDIO_EXPECTED_HASH d98b3d3d133a7c5bc1b9581553d23811)
|
|
42
|
-
else()
|
|
43
|
-
set(OPENSTUDIO_EXPECTED_HASH 1e48f36417d3d118d6a10f1a7d61f46e)
|
|
44
|
-
endif()
|
|
45
|
-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
|
|
46
|
-
set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
|
|
47
|
-
else() # Assumes 20.04
|
|
48
|
-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
|
|
49
|
-
set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
|
|
50
30
|
endif()
|
|
51
31
|
set(OPENSTUDIO_EXT "tar.gz")
|
|
52
32
|
elseif(WIN32)
|
|
53
|
-
set(OPENSTUDIO_EXPECTED_HASH
|
|
33
|
+
set(OPENSTUDIO_EXPECTED_HASH c3a1ec4bc98d7418780a702036ce0edb)
|
|
54
34
|
set(OPENSTUDIO_PLATFORM "Windows")
|
|
55
35
|
set(OPENSTUDIO_EXT "tar.gz")
|
|
56
36
|
endif()
|
data/Gemfile
CHANGED
|
@@ -24,7 +24,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
|
|
|
24
24
|
# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'master'
|
|
25
25
|
|
|
26
26
|
if allow_local && File.exist?('../urbanopt-scenario-gem')
|
|
27
|
-
|
|
27
|
+
gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
|
|
28
28
|
elsif allow_local
|
|
29
29
|
gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
|
|
30
30
|
end
|
|
@@ -36,7 +36,7 @@ elsif allow_local
|
|
|
36
36
|
end
|
|
37
37
|
|
|
38
38
|
if allow_local && File.exist?('../urbanopt-reopt-gem')
|
|
39
|
-
|
|
39
|
+
gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
|
|
40
40
|
elsif allow_local
|
|
41
41
|
gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
|
|
42
42
|
end
|
data/LICENSE.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
URBANopt (tm), Copyright (c) 2019-
|
|
1
|
+
URBANopt (tm), Copyright (c) 2019-2025, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
|
|
2
2
|
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
4
4
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[
|
|
2
|
-
{ "name": "ThermalNetwork", "version": "0.
|
|
2
|
+
{ "name": "ThermalNetwork", "version": "0.4.0"},
|
|
3
3
|
{ "name": "urbanopt-ditto-reader", "version": "0.6.4"},
|
|
4
4
|
{ "name": "NREL-disco", "version": "0.5.1"},
|
|
5
|
-
{ "name": "
|
|
5
|
+
{ "name": "urbanopt-des", "version": "0.1.1"}
|
|
6
6
|
]
|
data/lib/uo_cli/version.rb
CHANGED
data/lib/uo_cli.rb
CHANGED
|
@@ -911,7 +911,8 @@ module URBANopt
|
|
|
911
911
|
pip_path: nil,
|
|
912
912
|
ditto_path: nil,
|
|
913
913
|
gmt_path: nil,
|
|
914
|
-
ghe_path: nil
|
|
914
|
+
ghe_path: nil,
|
|
915
|
+
des_output_path: nil,
|
|
915
916
|
}
|
|
916
917
|
|
|
917
918
|
# get location
|
|
@@ -933,6 +934,7 @@ module URBANopt
|
|
|
933
934
|
pvars[:gmt_path] = configs[:gmt_path]
|
|
934
935
|
pvars[:disco_path] = configs[:disco_path]
|
|
935
936
|
pvars[:ghe_path] = configs[:ghe_path]
|
|
937
|
+
pvars[:des_output_path] = configs[:des_output_path]
|
|
936
938
|
end
|
|
937
939
|
return pvars
|
|
938
940
|
end
|
|
@@ -1084,13 +1086,15 @@ module URBANopt
|
|
|
1084
1086
|
pvars[:gmt_path] = File.join(mac_path_base, 'bin', 'uo_des')
|
|
1085
1087
|
pvars[:disco_path] = File.join(mac_path_base, 'bin', 'disco')
|
|
1086
1088
|
pvars[:ghe_path] = File.join(mac_path_base, 'bin', 'thermalnetwork')
|
|
1089
|
+
pvars[:des_output_path] = File.join(mac_path_base, 'bin', 'des-output')
|
|
1087
1090
|
configs = {
|
|
1088
1091
|
python_path: pvars[:python_path],
|
|
1089
1092
|
pip_path: pvars[:pip_path],
|
|
1090
1093
|
ditto_path: pvars[:ditto_path],
|
|
1091
1094
|
gmt_path: pvars[:gmt_path],
|
|
1092
1095
|
disco_path: pvars[:disco_path],
|
|
1093
|
-
ghe_path: pvars[:ghe_path]
|
|
1096
|
+
ghe_path: pvars[:ghe_path],
|
|
1097
|
+
des_output_path: pvars[:des_output_path]
|
|
1094
1098
|
}
|
|
1095
1099
|
else
|
|
1096
1100
|
# windows
|
|
@@ -1118,6 +1122,7 @@ module URBANopt
|
|
|
1118
1122
|
pvars[:gmt_path] = File.join(windows_path_base, 'Scripts', 'uo_des.exe')
|
|
1119
1123
|
pvars[:disco_path] = File.join(windows_path_base, 'Scripts', 'disco.exe')
|
|
1120
1124
|
pvars[:ghe_path] = File.join(windows_path_base, 'Scripts', 'thermalnetwork.exe')
|
|
1125
|
+
pvars[:des_output_path] = File.join(windows_path_base, 'Scripts', 'des-output.exe')
|
|
1121
1126
|
|
|
1122
1127
|
configs = {
|
|
1123
1128
|
python_path: pvars[:python_path],
|
|
@@ -1125,7 +1130,8 @@ module URBANopt
|
|
|
1125
1130
|
ditto_path: pvars[:ditto_path],
|
|
1126
1131
|
gmt_path: pvars[:gmt_path],
|
|
1127
1132
|
disco_path: pvars[:disco_path],
|
|
1128
|
-
ghe_path: pvars[:ghe_path]
|
|
1133
|
+
ghe_path: pvars[:ghe_path],
|
|
1134
|
+
des_output_path: pvars[:des_output_path]
|
|
1129
1135
|
}
|
|
1130
1136
|
end
|
|
1131
1137
|
|
|
@@ -5,13 +5,15 @@
|
|
|
5
5
|
# Then you can use this env.sh to setup the environment.
|
|
6
6
|
# (e.g. source ~/.env_uo.sh)
|
|
7
7
|
|
|
8
|
+
RUBY_BASE_VERSION="3.2.0"
|
|
9
|
+
MINICONDA_VERSION="24.9.2-0"
|
|
8
10
|
|
|
9
11
|
BASE_DIR_NAME=$(dirname `which $0`)
|
|
10
12
|
UO_DIR_NAME=$(basename "$BASE_DIR_NAME")
|
|
11
13
|
|
|
12
|
-
GEM_HOME=${BASE_DIR_NAME}/gems/ruby
|
|
13
|
-
GEM_PATH=${BASE_DIR_NAME}/gems/ruby
|
|
14
|
-
PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/
|
|
14
|
+
GEM_HOME=${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}
|
|
15
|
+
GEM_PATH=${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}
|
|
16
|
+
PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}/bin:${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-${MINICONDA_VERSION}/bin:$PATH
|
|
15
17
|
RUBYLIB=${BASE_DIR_NAME}/OpenStudio/Ruby
|
|
16
18
|
RUBY_DLL_PATH=${BASE_DIR_NAME}/OpenStudio/Ruby
|
|
17
19
|
|
data/scripts/setup-env-unix.sh
CHANGED
|
@@ -5,12 +5,14 @@
|
|
|
5
5
|
# Then you can use this env.sh to setup the environment.
|
|
6
6
|
# (e.g. . env.sh)
|
|
7
7
|
|
|
8
|
+
RUBY_BASE_VERSION="3.2.0"
|
|
9
|
+
MINICONDA_VERSION="24.9.2-0"
|
|
8
10
|
UO_DIR=$(dirname "$(realpath "$0")")
|
|
9
11
|
UO_DIR_NAME=$(basename "$UO_DIR")
|
|
10
12
|
|
|
11
|
-
GEM_HOME=${UO_DIR}/gems/ruby
|
|
12
|
-
GEM_PATH=${UO_DIR}/gems/ruby
|
|
13
|
-
PATH=${UO_DIR}/ruby/bin:${UO_DIR}/gems/ruby/
|
|
13
|
+
GEM_HOME=${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}
|
|
14
|
+
GEM_PATH=${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}
|
|
15
|
+
PATH=${UO_DIR}/ruby/bin:${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}/bin:${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-${MINICONDA_VERSION}/bin:$PATH
|
|
14
16
|
RUBYLIB=${UO_DIR}/OpenStudio/Ruby
|
|
15
17
|
RUBY_DLL_PATH=${UO_DIR}/OpenStudio/Ruby
|
|
16
18
|
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
IF "%HOMEPATH%"=="" ECHO HOMEPATH is NOT defined. Please set this env value to your home directory before running this script.
|
|
2
|
+
IF "%HOMEPATH%"=="" exit /B
|
|
3
|
+
|
|
4
|
+
SET RUBY_BASE_VERSION=3.2.0
|
|
5
|
+
SET MINICONDA_VERSION=24.9.2-0
|
|
6
|
+
SET BASE_DIR_NAME=%~d0%~p0
|
|
7
|
+
|
|
8
|
+
SET GEM_HOME=%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%
|
|
9
|
+
SET GEM_PATH=%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%
|
|
10
|
+
SET PATH=%BASE_DIR_NAME%\ruby\bin;%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%\bin;%PATH%
|
|
11
|
+
SET RUBYLIB=%BASE_DIR_NAME%\OpenStudio\Ruby
|
|
12
|
+
SET RUBY_DLL_PATH=%BASE_DIR_NAME%\OpenStudio\Ruby
|
|
13
|
+
|
|
14
|
+
%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%\gems\$%BASE_DIR_NAME%/example_files/python_deps/Miniconda-%MINICONDA_VERSION=%/bin
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
IF EXIST %HOMEPATH%\.env_uo.bat (
|
|
18
|
+
del "%HOMEPATH%\.env_uo.bat"
|
|
19
|
+
)
|
|
20
|
+
|
|
21
|
+
echo SET "GEM_HOME=%GEM_HOME%">> "%HOMEPATH%\.env_uo.bat"
|
|
22
|
+
echo SET "GEM_PATH=%GEM_PATH%">> "%HOMEPATH%\.env_uo.bat"
|
|
23
|
+
echo SET "PATH=%PATH%">> "%HOMEPATH%\.env_uo.bat"
|
|
24
|
+
echo SET "RUBYLIB=%RUBYLIB%">> "%HOMEPATH%\.env_uo.bat"
|
|
25
|
+
echo SET "RUBY_DLL_PATH=%RUBY_DLL_PATH%">> "%HOMEPATH%\.env_uo.bat"
|
|
26
|
+
|
data/scripts/setup-env.ps1
CHANGED
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
if (-not (Test-Path $HOME)) { echo "env HOME needs to be set before running this script" }
|
|
9
9
|
if (-not (Test-Path $HOME)) { exit }
|
|
10
10
|
|
|
11
|
+
|
|
12
|
+
$RUBY_BASE_VERSION = "3.2.0"
|
|
11
13
|
# uo install_python will install its own python within the gem directories so we need to find the python path and add it to $env.PATH
|
|
12
14
|
$output = Get-ChildItem -ErrorAction SilentlyContinue -Directory "C:\URBANopt*" -Recurse -Filter "python-3.10" | Select-Object FullName
|
|
13
15
|
|
|
@@ -21,9 +23,9 @@ else {
|
|
|
21
23
|
|
|
22
24
|
$BASE_DIR_NAME = $PSScriptRoot
|
|
23
25
|
|
|
24
|
-
$GEM_HOME = "$BASE_DIR_NAME\gems\ruby
|
|
25
|
-
$GEM_PATH = "$BASE_DIR_NAME\gems\ruby
|
|
26
|
-
$PATH += ";$BASE_DIR_NAME\ruby\bin;$BASE_DIR_NAME\gems\ruby\
|
|
26
|
+
$GEM_HOME = "$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION"
|
|
27
|
+
$GEM_PATH = "$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION"
|
|
28
|
+
$PATH += ";$BASE_DIR_NAME\ruby\bin;$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION\bin;$RUBY_PYTHON_PATH;$env::PATH"
|
|
27
29
|
$RUBYLIB = "$BASE_DIR_NAME\OpenStudio\Ruby"
|
|
28
30
|
$RUBY_DLL_PATH = "$BASE_DIR_NAME\OpenStudio\Ruby"
|
|
29
31
|
|
|
@@ -42,4 +44,4 @@ Remove-Item $HOME/.env_uo.bat -ErrorAction Ignore
|
|
|
42
44
|
'SET "GEM_PATH=' + $GEM_PATH + '"' >> $HOME/.env_uo.bat
|
|
43
45
|
'SET "PATH=' + $PATH + '"' >> $HOME/.env_uo.bat
|
|
44
46
|
'SET "RUBYLIB=' + $RUBYLIB + '"' >> $HOME/.env_uo.bat
|
|
45
|
-
'SET "RUBY_DLL_PATH=' + $RUBY_DLL_PATH + '"' >> $HOME/.env_uo.bat
|
|
47
|
+
'SET "RUBY_DLL_PATH=' + $RUBY_DLL_PATH + '"' >> $HOME/.env_uo.bat
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: urbanopt-cli
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- NREL URBANopt team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-
|
|
11
|
+
date: 2025-07-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: optimist
|
|
@@ -1597,6 +1597,7 @@ files:
|
|
|
1597
1597
|
- lib/uo_cli/version.rb
|
|
1598
1598
|
- scripts/setup-env-gitbash.sh
|
|
1599
1599
|
- scripts/setup-env-unix.sh
|
|
1600
|
+
- scripts/setup-env.bat
|
|
1600
1601
|
- scripts/setup-env.ps1
|
|
1601
1602
|
- uo_cli.gemspec
|
|
1602
1603
|
homepage: https://docs.urbanopt.net/
|