Merge pull request #692 from NREL/3.6.0-rc1

3.6.0 rc1

.github/workflows/openstudio-server-tests.yml

@@ -10,9 +10,9 @@ on: [push, pull_request]
 
 env:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.5.1 
-  OPENSTUDIO_VERSION_SHA: 22e1db7be5
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.6.0 
+  OPENSTUDIO_VERSION_SHA: e8153aa081
+  OPENSTUDIO_VERSION_EXT: "-rc1"
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
@@ -97,7 +97,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.5.1
+          export OPENSTUDIO_TAG=3.6.0-rc1
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all
@@ -106,7 +106,7 @@ jobs:
           docker-compose -f docker-compose.test.yml pull
           docker-compose -f docker-compose.test.yml build --build-arg OPENSTUDIO_VERSION=$OPENSTUDIO_TAG
           docker-compose -f docker-compose.test.yml up -d
-          # set SKIP_URBANOPT_ALGO=false to skip UrbanOpt algo tests
+          # set SKIP_URBANOPT_ALGO=true to skip UrbanOpt algo tests
           docker-compose exec -e SKIP_URBANOPT_ALGO=false -T web /usr/local/bin/run-server-tests
           docker-compose stop
           git checkout -- .dockerignore && git checkout -- Dockerfile

Dockerfile

@@ -4,8 +4,8 @@
 # NOTES:            Currently this is one big dockerfile and non-optimal.
 
 #may include suffix
-ARG OPENSTUDIO_VERSION=3.5.1
-FROM nrel/openstudio:3.5.1 as base
+ARG OPENSTUDIO_VERSION=3.6.0-rc1
+FROM nrel/openstudio:3.6.0-rc1 as base
 MAINTAINER Nicholas Long [email protected]
 
 ENV DEBIAN_FRONTEND=noninteractive

appveyor.yml

@@ -4,9 +4,9 @@ image: Visual Studio 2019
 
 environment:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.5.1
-  OPENSTUDIO_VERSION_SHA: 22e1db7be5
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.6.0
+  OPENSTUDIO_VERSION_SHA: e8153aa081
+  OPENSTUDIO_VERSION_EXT: "-rc1"
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   BUILD_TYPE: "test"
   SKIP_COVERALLS: "true"

ci/appveyor/setup.cmd

@@ -8,8 +8,9 @@ echo Downloading and Installing OpenStudio (develop branch, %OPENSTUDIO_VERSION%
 REM install develop build
 set OS_INSTALL_NAME=OpenStudio-%OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%%%2B%OPENSTUDIO_VERSION_SHA%-Windows.exe
 echo Install name is %OS_INSTALL_NAME%
-REM curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/%OPENSTUDIO_VERSION%/%OS_INSTALL_NAME%
-curl -SLO --insecure  https://github.com/NREL/OpenStudio/releases/download/v3.5.1/%OS_INSTALL_NAME%
+
+REM curl -SLO --insecure https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop/%OS_INSTALL_NAME%
+curl -SLO --insecure  https://github.com/NREL/OpenStudio/releases/download/v3.6.0-rc1/%OS_INSTALL_NAME%
 dir .
 REM Install OpenStudio
 %OS_INSTALL_NAME% --script ci/appveyor/install-windows.qs

ci/github-actions/install_openstudio.sh

@@ -8,9 +8,10 @@ OPENSTUDIO_VERSION_EXT=$3
 
 if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
     # OPENSTUDIO_VERSION_EXT may be empty
-    OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_SHA}-Ubuntu-20.04.deb
+    OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_SHA}-Ubuntu-20.04-x86_64.deb
     echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}"
-    OPENSTUDIO_DOWNLOAD_BASE_URL=https://github.com/NREL/OpenStudio/releases/download/v3.5.1/
+    #OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop
+    OPENSTUDIO_DOWNLOAD_BASE_URL=https://github.com/NREL/OpenStudio/releases/download/v3.6.0-rc1
     OPENSTUDIO_DOWNLOAD_URL=$OPENSTUDIO_DOWNLOAD_BASE_URL/$OPENSTUDIO_DOWNLOAD_FILENAME
 
     # copying this from the docker-openstudio dockerfile

ci/github-actions/setup.sh

@@ -36,7 +36,8 @@ else
         # Install openstudio -- Use the install script that is in this repo now, the one on OpenStudio/develop has changed
         export OS_NAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_VERSION_SHA}-Darwin-x86_64
         export OS_NAME_WITH_PLUS=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_VERSION_SHA}-Darwin-x86_64
-        curl -SL --insecure https://github.com/NREL/OpenStudio/releases/download/v3.5.1/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
+        #curl -SL --insecure https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
+        curl -SL --insecure https://github.com/NREL/OpenStudio/releases/download/v3.6.0-rc1/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
         # OSX downloads with %2B but installs with + sign. These are the encoded chars in url strings.
         #hdiutil attach ${OS_NAME}.dmg
         #sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/github-actions/install-mac.qs

docker-compose.test.yml

@@ -88,7 +88,7 @@ services:
     command: /usr/local/bin/start-workers  
   rserve:
     image: nrel/openstudio-rserve:latest
-    build: ./docker/R
+    #build: ./docker/R
     environment:
       - OS_SERVER_NUMBER_OF_WORKERS=1
       - REDIS_URL=${REDIS_URL}

local_setup_scripts/rebuild_sr.sh

@@ -6,7 +6,7 @@ sleep 5
 docker volume rm -f osdata || true
 docker volume rm -f dbdata || true
 docker image rm 127.0.0.1:5000/openstudio-server -f
-docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.5.1
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.0-rc1
 docker push 127.0.0.1:5000/openstudio-server
 cd docker/R/
 #docker image rm 127.0.0.1:5000/openstudio-rserve -f

local_setup_scripts/win64/rebuild_sr.sh

@@ -6,7 +6,7 @@ sleep 5
 docker volume rm -f osdata || true
 docker volume rm -f dbdata || true
 docker image rm 127.0.0.1:5000/openstudio-server -f
-docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.5.1
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.0-rc1
 docker push 127.0.0.1:5000/openstudio-server
 cd docker/R
 #docker image rm 127.0.0.1:5000/openstudio-rserve -f

local_setup_scripts/win64/rebuild_sr_no_rm.sh

@@ -6,7 +6,7 @@ sleep 5
 docker volume rm -f osdata || true
 docker volume rm -f dbdata || true
 #docker image rm 127.0.0.1:5000/openstudio-server -f
-docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.5.1
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.0-rc1
 docker push 127.0.0.1:5000/openstudio-server
 cd docker/R
 #docker image rm 127.0.0.1:5000/openstudio-rserve -f

server/Gemfile

@@ -71,7 +71,7 @@ gem 'openstudio-workflow', '= 2.3.1'
 gem 'openstudio-analysis', '= 1.3.0'
 
 # Remove urbanopt cli gems for minor for releases as they use different versions of ext gems
-gem 'urbanopt-cli', '= 0.9.1'
+gem 'urbanopt-cli', '= 0.9.2'
 gem 'urbanopt-reopt', '= 0.9.0'
 
 ## End commonly updated gems

server/app/lib/openstudio_server/version.rb

@@ -34,9 +34,9 @@
 # *******************************************************************************
 
 module OpenstudioServer
-  VERSION = '3.5.1'.freeze
+  VERSION = '3.6.0'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = ''.freeze # with preceding - or +
-  OS_SHA = '22e1db7be5'.freeze
+  VERSION_EXT = '-rc1'.freeze # with preceding - or +
+  OS_SHA = 'e8153aa081'.freeze
 end

server/spec/features/docker_stack_urbanopt_algo_spec.rb

@@ -100,7 +100,7 @@
     ]
 
     # run an analysis
-    command = "#{@bundle_cmd} #{@meta_cli} run_analysis --debug --verbose '#{@project}/URBANopt_090_sr.json' 'http://#{@host}' -z 'URBANopt_090' -a single_run"
+    command = "#{@bundle_cmd} #{@meta_cli} run_analysis --debug --verbose '#{@project}/URBANopt_092_sr.json' 'http://#{@host}' -z 'URBANopt_092' -a single_run"
     puts "run command: #{command}"
     run_analysis = system(command)
     expect(run_analysis).to be true

server/spec/files/URBANopt_092_sr.json

@@ -0,0 +1,195 @@
+{
+  "analysis": {
+    "display_name": "URBANopt_092_sr",
+    "name": "URBANopt_092_sr",
+    "urbanopt": true,
+    "output_variables": [
+      {
+        "objective_function": true,
+        "objective_function_index": 0,
+        "objective_function_target": 0,
+        "objective_function_group": 1,
+        "scaling_factor": null,
+        "display_name": "electricity",
+        "display_name_short": "electricity",
+        "metadata_id": null,
+        "report_file": "default_scenario_report",
+        "report": "feature_reports",
+        "report_id": "1",
+        "reporting_periods": 0,
+        "var_name": "electricity_kwh",
+        "visualize": true,
+        "export": true,
+        "variable_type": "double"
+      },
+      {
+        "objective_function": true,
+        "objective_function_index": 1,
+        "objective_function_target": 0,
+        "objective_function_group": 2,
+        "scaling_factor": null,
+        "display_name": "natural_gas",
+        "display_name_short": "natural_gas",
+        "metadata_id": null,
+        "report_file": "default_scenario_report",
+        "report": "feature_reports",
+        "report_id": "1",
+        "reporting_periods": 0,
+        "var_name": "natural_gas_kwh",
+        "visualize": true,
+        "export": true,
+        "variable_type": "double"
+      },
+      {
+        "objective_function": true,
+        "objective_function_index": 2,
+        "objective_function_target": 0,
+        "objective_function_group": 3,
+        "scaling_factor": null,
+        "display_name": "electricity_fans",
+        "display_name_short": "electricity_fans",
+        "metadata_id": null,
+        "report_file": "default_scenario_report",
+        "report": "feature_reports",
+        "report_id": "1",
+        "reporting_periods": 0,
+        "var_name": "end_uses",
+        "end_use": "electricity_kwh",
+        "end_use_category": "fans",
+        "visualize": true,
+        "export": true,
+        "variable_type": "double"
+      },
+      {
+        "objective_function": true,
+        "objective_function_index": 3,
+        "objective_function_target": 0,
+        "objective_function_group": 4,
+        "scaling_factor": null,
+        "display_name": "electricity_fans",
+        "display_name_short": "electricity_fans",
+        "metadata_id": null,
+        "report_file": "default_scenario_report",
+        "report": "scenario_report",
+        "report_id": "highefficiency_scenario",
+        "reporting_periods": 0,
+        "var_name": "end_uses",
+        "end_use": "electricity_kwh",
+        "end_use_category": "fans",
+        "visualize": true,
+        "export": true,
+        "variable_type": "double"
+      }
+    ],
+    "problem": {
+      "workflow": [],
+      "algorithm": {
+        "number_of_samples": 2,
+        "seed": 1973,
+        "failed_f_value": 1000000000000000000,
+        "debug_messages": 1,
+        "objective_functions": [
+            "urban_opt_report.electricity",
+            "urban_opt_report_2.natural_gas",
+            "electricity_fans",
+            "electricity_fans2"
+        ]
+      },
+      "analysis_type": "single_run"
+    },
+    "file_format_version": 1,
+    "cli_debug": "--debug",
+    "cli_verbose": "--verbose",
+    "run_workflow_timeout": 28800,
+    "upload_results_timeout": 28800,
+    "initialize_worker_timeout": 28800,
+    "feature_file": "example_project",
+    "scenario_file": "highefficiency_scenario",
+    "urbanopt_variables": [
+        {
+            "name": "lighting_power_reduction_percent",
+            "mapper": "HighEfficiency",
+            "uo_measure": "ReduceLightingLoadsByPercentage",
+            "display_name": "Lighting Power Reduction (%).",
+            "display_name_short": "lighting_power_reduction_percent",
+            "variable_type": "variable",
+            "value_type": "double",
+            "default_value": 0,
+            "value": 0,
+            "minimum": -80,
+            "maximum": 80,
+            "static_value": 0,
+            "uuid": "",
+            "version_uuid": "",
+            "variable": true,
+            "uncertainty_description": {
+                "type": "uniform",
+                "attributes": [
+                    {
+                        "name": "lower_bounds",
+                        "value": -80
+                    },
+                    {
+                        "name": "upper_bounds",
+                        "value": 80
+                    },
+                    {
+                        "name": "modes",
+                        "value": 30
+                    },
+                    {
+                        "name": "delta_x",
+                        "value": 30
+                    },
+                    {
+                        "name": "stddev",
+                        "value": 26.6667
+                    }
+                ]
+            }
+        },
+        {
+            "name": "elecequip_power_reduction_percent",
+            "mapper": "HighEfficiency",
+            "uo_measure": "ReduceElectricEquipmentLoadsByPercentage",
+            "display_name": "Reduce Electric Equipment Loads by Percentage",
+            "display_name_short": "reduce_electric_equipment_loads_by_percentage",
+            "variable_type": "variable",
+            "value_type": "double",
+            "default_value": 0,
+            "value": 0,
+            "minimum": -80,
+            "maximum": 80,
+            "static_value": 0,
+            "uuid": "",
+            "version_uuid": "",
+            "variable": true,
+            "uncertainty_description": {
+                "type": "uniform",
+                "attributes": [
+                    {
+                        "name": "lower_bounds",
+                        "value": -80
+                    },
+                    {
+                        "name": "upper_bounds",
+                        "value": 80
+                    },
+                    {
+                        "name": "modes",
+                        "value": 30
+                    },
+                    {
+                        "name": "delta_x",
+                        "value": 30
+                    },
+                    {
+                        "name": "stddev",
+                        "value": 26.6667
+                    }
+                ]
+            }
+        }
+    ]
+  }
+}