Merge urbanopt/reopt

Dockerfile

@@ -158,7 +158,6 @@ RUN echo "Running in testing environment - Installing Firefox and Gecko Driver"
 
 COPY /docker/server/run-server-tests.sh /usr/local/bin/run-server-tests
 RUN chmod +x /usr/local/bin/run-server-tests
-
 # Test adding the git repo to the container for coveralls
 # The #TEST# will be removed in the travis test script to be run in the test container
 #TEST#COPY .git /opt/openstudio/.git

docker/R/lib/sobol.R

@@ -155,6 +155,7 @@ for (i in 1:ncol(vars)){
 }
 if(!all(boundary_check)){
   print('SOLUTION SPACE OUT OF BOUNDS, CHECK Grid Jump and Level Values and/or re-run')
+  print(paste("boundary_check:",boundary_check))
   stop(options("show.error.messages"=TRUE),"SOLUTION SPACE OUT OF BOUNDS, CHECK Grid Jump and Level Values and/or re-run")
 }
 print("bounds are satisfied, continuing...")

local_setup_scripts/docker-compose.yml

@@ -42,6 +42,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
     volumes:
       - osdata:/mnt/openstudio
     depends_on:
@@ -63,6 +64,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
     volumes:
       - osdata:/mnt/openstudio
     depends_on:
@@ -86,6 +88,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
     volumes:
       - /mnt/openstudio
     depends_on:
@@ -120,6 +123,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
 volumes:
   osdata:
     external: true

local_setup_scripts/rebuild_sr.sh

@@ -5,8 +5,8 @@ while [ $(docker ps -q | wc -l) != 1 ]; do sleep 5; done
 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.1.0
+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.2.0
 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/docker-compose.yml

@@ -36,6 +36,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
     volumes:
       - osdata:/mnt/openstudio
     depends_on:
@@ -54,6 +55,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
     volumes:
       - osdata:/mnt/openstudio
     depends_on:
@@ -74,6 +76,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
     volumes:
       - /mnt/openstudio
     depends_on:
@@ -102,6 +105,7 @@ services:
       - REDIS_URL=redis://:openstudio@queue:6379
       - MONGO_USER=openstudio
       - MONGO_PASSWORD=openstudio
+      - SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
 volumes:
   osdata:
     external: true

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.1.0
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.2.0
 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.1.0
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.2.0
 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

@@ -67,19 +67,16 @@ gem 'sassc', '~> 2.4.0'
 ## Commonly update gems for testing and development
 
 gem 'openstudio-workflow', '= 2.2.0'
-
 #gem 'openstudio-analysis', :github => 'NREL/OpenStudio-analysis-gem', :ref => '270'
 gem 'openstudio-analysis', '= 1.2.0'
 
 gem 'urbanopt-cli', '= 0.6.0'
-gem 'urbanopt-reporting', '= 0.4.0'
-
+gem 'urbanopt-reopt', '= 0.6.0'
 
 ## End commonly updated gems
 
 gem 'openstudio-aws'
 
-
 # libxml 3.2.0 failing on windows
 gem 'bson', '~> 4.12.0' # bson 4.6.0 requires ruby >= 2.3.0
 #gem 'libxml-ruby'
@@ -93,9 +90,9 @@ gem 'rubyXL', '~> 3.4.17'
 
 # linux based js runtime libraries
 if RUBY_PLATFORM =~ /linux/
-  gem 'execjs'
-  gem 'libv8'
-  gem 'therubyracer'
+  gem 'execjs', '=2.7.0'
+  gem 'libv8', '=3.16.14.19'
+  gem 'therubyracer', '=0.12.3'
 elsif RUBY_PLATFORM =~ /darwin/
   gem 'execjs', github: 'NREL/execjs'
 end

server/app/jobs/dj_jobs/run_simulate_data_point.rb

@@ -254,14 +254,20 @@ def perform
             @sim_logger.error "Workflow #{osw_path} failed with error #{e}"
             run_result = :errored
           ensure
-            if uo_simulation_log
+            if (!uo_simulation_log.nil? && File.exist?(uo_simulation_log))
               @sim_logger.info "UrbanOpt simulation output: #{File.read(uo_simulation_log)}"
+            else
+              @sim_logger.warn "UrbanOpt simulation output: #{uo_simulation_log} does not exist"            
             end
-            if uo_process_log
+            if (!uo_process_log.nil? && File.exist?(uo_process_log))
               @sim_logger.info "UrbanOpt process output: #{File.read(uo_process_log)}"
+            else
+              @sim_logger.warn "UrbanOpt process output: #{uo_process_log} does not exist"
             end
-            if process_log
+            if (!process_log.nil? && File.exist?(process_log))
               @sim_logger.info "Oscli output: #{File.read(process_log)}"
+            else
+              @sim_logger.warn "OSCLI output: #{process_log} does not exist"
             end
             #docker_log = File.join(APP_CONFIG['rails_log_path'], 'docker.log')
             #if File.exist? docker_log