Skip to content

Commit

Permalink
Merge pull request #342 from NREL/develop
Browse files Browse the repository at this point in the history
/stable points to v2 reo/job
  • Loading branch information
Bill-Becker authored Jul 26, 2022
2 parents f1bea98 + a05a54b commit ea45cd3
Show file tree
Hide file tree
Showing 19 changed files with 1,456 additions and 165 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/pull_request_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ name: Built-in Tests for Pull Requests (Xpress in Ubuntu 18.04)
on:

pull_request:
types:
- opened
- reopened
- ready_for_review
branches:
- master
- develop
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/push_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: Built-in Tests for Push (Xpress in Ubuntu 18.04)
on:

push:
paths-ignore:
- README.md
- CHANGELOG.md

jobs:

Expand Down
52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,58 @@ Classify the change according to the following categories:
##### Removed
### Patches

# v2.1.0
### Minor Updates
##### Changed
- The `/stable` URL now correctly calls the `v2` version of the REopt model (`/job` endpoint)
- Don't trigger Built-in Tests workflow on a push that only changes README.md and/or CHANGELOG.md
- Avoid triggering duplicate GitHub workflows. When pushing to a branch that's in a PR, only trigger tests on the push not on the PR sync also.
`job/models.py`
- **Settings**
- Added **off_grid_flag**
- Changed **run_bau** to be nullable
- **FinancialInputs**
- Added **offgrid_other_capital_costs**
- Added **offgrid_other_annual_costs**
- **FinancialOutputs**
- Added **lifecycle_generation_tech_capital_costs**
- Added **lifecycle_storage_capital_costs**
- Added **lifecycle_om_costs_after_tax**
- Added **lifecycle_fuel_costs_after_tax**
- Added **lifecycle_chp_standby_cost_after_tax**
- Added **lifecycle_elecbill_after_tax**
- Added **lifecycle_production_incentive_after_tax**
- Added **lifecycle_offgrid_other_annual_costs_after_tax**
- Added **lifecycle_offgrid_other_capital_costs**
- Added **lifecycle_outage_cost**
- Added **lifecycle_MG_upgrade_and_fuel_cost**
- Added **replacements_future_cost_after_tax**
- Added **replacements_present_cost_after_tax**
- Added **offgrid_microgrid_lcoe_dollars_per_kwh**
- Changed **lifecycle_capital_costs_plus_om** and **lifecycle_om_costs_bau** field names to include before/after tax
- **ElectricLoadOutputs**
- Added **offgrid_load_met_pct**
- Added **offgrid_annual_oper_res_required_series_kwh**
- Added **offgrid_annual_oper_res_provided_series_kwh**
- Added **offgrid_load_met_series_kw**
- **ElectricTariffInputs**
- Changed all instances of `coincident_peak_load_active_timesteps` to `coincident_peak_load_active_time_steps`
- **ElectricTariffOutputs**
- Changed field names to add suffixes denoting `before_tax` or `after_tax` values
- **ElectricTariffInputs**
- Changed validation of this model to be conditional on **Settings.off_grid_flag** being False
`job/run_jump_model.py` - Remove `run_uuid` key from input dictionary before running REopt to avoid downstream errors from REopt.jl
`job/validators.py`
- Changed **ElectricTariffInputs** to validate if **ElectricTariff** key exists in inputs
- Added message to `messages()` to alert user if valid ElectricTariff input is provided when **Settings.off_grid_flag** is true.
- Added message to `messages()` to alert user of technologies which can be modeled when **Settings.off_grid_flag** is true.
- Added validation error to alert user of input keys which can't be modeled when **Settings.off_grid_flag** is true.
`job/models.py`
- Changed **ElectricTariffInputs** `required inputs` error message to alert user that ElectricTariff inputs are not required if **Settings.off_grid_flag** is true.
`job/views.py` - Changed validation code to try to save **ElectricTariffInputs**
`job/test_job_endpoint.py` - Added test to validate API off-grid functionality
- Added migration file `0005_remove_...` which contains the data model for all Added and Changed fields

# v2.0.3
### Minor Updates
##### Fixed
Expand Down
4 changes: 2 additions & 2 deletions job/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ def obj_create(self, bundle, **kwargs):
run_uuid = str(uuid.uuid4())
meta = {
"run_uuid": run_uuid,
"api_version": 2,
"reopt_version": "0.11.0",
"api_version": 3,
"reopt_version": "0.16.2",
"status": "validating..."
}
bundle.data.update({"APIMeta": meta})
Expand Down
Loading

0 comments on commit ea45cd3

Please sign in to comment.