Skip to content

Commit

Permalink
Merge branch 'develop' into proforma
Browse files Browse the repository at this point in the history
  • Loading branch information
rathod-b committed May 8, 2024
2 parents 008653e + 2b0ac75 commit 2c5fac3
Show file tree
Hide file tree
Showing 26 changed files with 557 additions and 311 deletions.
8 changes: 4 additions & 4 deletions .helm/values.production.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
appEnv: production
djangoSettingsModule: reopt_api.production_settings
djangoReplicas: 10
djangoMemoryRequest: "2800Mi"
djangoMemoryLimit: "2800Mi"
djangoMemoryRequest: "2000Mi"
djangoMemoryLimit: "2000Mi"
celeryReplicas: 10
celeryMemoryRequest: "900Mi"
celeryMemoryLimit: "900Mi"
juliaReplicas: 15
juliaCpuRequest: "1000m"
juliaCpuLimit: "4000m"
juliaMemoryRequest: "12000Mi"
juliaMemoryLimit: "12000Mi"
juliaMemoryRequest: "8000Mi"
juliaMemoryLimit: "8000Mi"
6 changes: 3 additions & 3 deletions .helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ celeryCpuLimit: "2000m"
celeryMemoryRequest: "700Mi"
celeryMemoryLimit: "700Mi"
juliaReplicas: 2
juliaCpuRequest: "300m"
juliaCpuRequest: "1000m"
juliaCpuLimit: "4000m"
juliaMemoryRequest: "3000Mi"
juliaMemoryLimit: "3000Mi"
juliaMemoryRequest: "8000Mi"
juliaMemoryLimit: "8000Mi"
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,21 @@ Classify the change according to the following categories:
##### Removed
### Patches

## v3.8.0
### Minor Updates
#### Changed
- In `core/pv.jl` a change was made to make sure we are using the same assumptions as PVWatts guidelines, the default `tilt` angle for a fixed array should be 20 degrees, irrespective of it being a rooftop `(0)` or ground-mounted (open-rack)`(1)` system. By default the `tilt` will be set to 20 degrees for fixed ground-mount and rooftop, and 0 degrees for axis-tracking (`array_type = (2), (3), or (4)`)
- Added **soc_min_applies_during_outages** boolean field to **ElectricStorageInputs** (defaults to _false_)

## v3.7.0
### Minor Updates
#### Changed
- Default `Settings.solver_name` = `HiGHS`
- See updates from REopt.jl v0.44.0: https://github.com/NREL/REopt.jl/releases/tag/v0.44.0
- HiGHS, Cbc, and SCIP solvers use Big M notation constraints only in REopt.jl
#### Deprecated
- End-of-Life for v1 and v2 of the API for external/public interfacing from NREL servers. See https://github.com/NREL/REopt-Analysis-Scripts/discussions/148 for more details.

## v3.6.1
### Minor Updates
#### Fixed
Expand Down
18 changes: 9 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@ pipeline {
WERF_SYNCHRONIZATION = ":local"
XPRESS_LICENSE_HOST = credentials("reopt-api-xpress-license-host")
LICENSESERVER_URL = credentials("reopt-api-xpress-licenseserver-url")
XPRESS_INSTALLED = "True"
XPRESS_INSTALLED = "False"
NREL_ROOT_CERT_URL_ROOT = credentials("reopt-api-nrel-root-cert-url-root")
}

stages {
stage("deploy") {
stages {
stage("solver setup") {
steps {
dir("julia_src/licenseserver") {
git url: env.LICENSESERVER_URL
}
sh "cp julia_src/licenseserver/Dockerfile.xpress julia_src/"
}
}
// stage("solver setup") {
// steps {
// dir("julia_src/licenseserver") {
// git url: env.LICENSESERVER_URL
// }
// sh "cp julia_src/licenseserver/Dockerfile.xpress julia_src/"
// }
// }

stage("lint") {
steps {
Expand Down
2 changes: 1 addition & 1 deletion julia_src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM julia:1.8.5
FROM julia:1.10.2

# Install NREL root certs for machines running on NREL's network.
ARG NREL_ROOT_CERT_URL_ROOT=""
Expand Down

0 comments on commit 2c5fac3

Please sign in to comment.