Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ example_files/python_deps/python-3.10

*.venv
reopt_project
urbanopt-cli.code-workspace
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'

# if allow_local && File.exist?('../urbanopt-scenario-gem')
# gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
# gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
# elsif allow_local
# gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
# end
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Python dependencies are currently versioned as follows:
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).


## Python Dependency Refactor - uv
## Python Dependency Refactor - uv

Starting with version 1.3.0, there has been a major python dependency refactor.
The CLI now uses `example_files/python_deps/pyproject.toml` as the source of truth for Python tool dependencies and uv for python package management.
Expand Down
8 changes: 4 additions & 4 deletions example_files/reopt_ghp/ghp_assumptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
},
"SpaceHeatingLoad": {
},
"DomesticHotWaterLoad": {
"DomesticHotWaterLoad": {
},
"ElectricLoad": {
"ElectricLoad": {
},
"ElectricTariff": {
"urdb_label": "594976725457a37b1175d089"
"urdb_label": "594976725457a37b1175d089"
},
"GHP":{
"installed_cost_heatpump_per_ton": 1904,
"installed_cost_ghx_per_ft": 17,
"installed_cost_building_hydronic_loop_per_sqft": 0,
"om_cost_per_sqft_year": 0,
"macrs_bonus_fraction": 0.6,
"macrs_bonus_fraction": 0.6,
"macrs_itc_reduction": 0.5,
"federal_itc_fraction": 0.3
},
Expand Down
455 changes: 304 additions & 151 deletions lib/uo_cli.rb

Large diffs are not rendered by default.

Binary file not shown.
24 changes: 15 additions & 9 deletions spec/spec_files/reopt_ghp/system_parameter_ghe_2feature.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,24 @@
"max_eft": 35.0,
"min_eft": 5.0
},
"ghe_specific_params": [
"borehole": {
"buried_depth": 2.0,
"diameter": 0.15,
"length_of_boreholes": 1.0,
"number_of_boreholes": 5
},
"borefields": [
{
"ghe_id": "7932a208-dcb6-4d23-a46f-288896eaa1bc",
"ghe_geometric_params": {
"autosized_rectangle_borefield": {
"b_min": 3.0,
"b_max": 10.0,
"max_height": 135.0,
"min_height": 60.0,
"length_of_ghe": 113.46543484483091,
"width_of_ghe": 99.03456515516909
},
"borehole": {
"buried_depth": 2.0,
"diameter": 0.15,
"length_of_boreholes": 1.0,
"number_of_boreholes": 5
"width_of_ghe": 99.03456515516909,
"borehole_length": 126.31250305283308,
"number_of_boreholes": 78
}
}
]
Expand Down
125 changes: 86 additions & 39 deletions spec/uo_cli_spec.rb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions uo_cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ Gem::Specification.new do |spec|
# use specific versions of urbanopt and openstudio dependencies while under heavy development
spec.add_runtime_dependency 'optimist', '~> 3.2'
spec.add_runtime_dependency 'urbanopt-geojson', '~> 1.2.0'
spec.add_runtime_dependency 'urbanopt-reopt', '~> 1.2.0'
spec.add_runtime_dependency 'urbanopt-reopt', '~> 1.3.1'
spec.add_runtime_dependency 'urbanopt-reporting', '~> 1.2.0'
spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 1.2.0'
spec.add_runtime_dependency 'urbanopt-scenario', '~> 1.2.0'
spec.add_runtime_dependency 'urbanopt-scenario', '~> 1.2.1'

spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rspec', '~> 3.13'
Expand Down
Loading