urbanopt-rnm-us 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1db14b6e9c51f62e4ff247765fb92fa8024f032a0327af75fd5965cd4bb5572
-  data.tar.gz: 055a8d68963b51b29151d3d71d5dafb732a98e1a94f743b1a7c734456b0e28da
+  metadata.gz: 3d6d3af9851a2d2d27287ebfcff92f6951fd8747beeb35ec32e6b6739b9f2582
+  data.tar.gz: 067ffb458bc07753783766c9457f009581b63a89971390133f6a243953435a36
 SHA512:
-  metadata.gz: e145f3334e9188e802fe9310f4b5baa366d2b951daa5dfa1b10a8be83a9ba185eb24c837b9b209bb0378bdf9fef138274c9df2eebcbd41556bd8de2b489ed862
-  data.tar.gz: 4e561510ff390c78df684f58beee8bfbf76e62c445c3f887d7140af05493e77c8112b696d1b316f488ccba4e610aa816b39e4d2c7c92ed9550339a163bcec632
+  metadata.gz: 3789bcdc78b733b7a64edde02612a8be60f7b546b1c889a550fbeb7497c7c13c3210ed1da35d076e7c848a10cec37f3a449366ae7b178a32667070ca52db014e
+  data.tar.gz: c7b15977b63cf466a5726bb3941b3366e766dc807f331d3830b6ae82d1ce94b737da9b7750675e4509d5dd4ca2f3d9aadf66257be32f6cf2c097f2aa27567c37

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # Changelog
 
+## Version 0.1.3
+
+Date Range 11/02/21 - 11/08/21
+
+- Fix [#11](https://github.com/urbanopt/urbanopt-rnm-us-gem/issues/11), results files are not downloading in project directory for large projects
+
+- Fix [#16](https://github.com/urbanopt/urbanopt-rnm-us-gem/issues/16), fix residential enums to be consistent across files and fix typo in multifamily
+
 ## Version 0.1.2
 
 Date Range 10/29/21 - 11/01/21
 
-- Fix [#13] (https://github.com/urbanopt/urbanopt-rnm-us-gem/issues/13), update rubyzip dependency to fix conflict
+- Fix [#13](https://github.com/urbanopt/urbanopt-rnm-us-gem/issues/13), update rubyzip dependency to fix conflict
 
 ## Version 0.1.1
 

data/Jenkinsfile

@@ -0,0 +1,10 @@
+//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs 
+ 
+@Library('cbci_shared_libs') _
+
+// Build for PR to develop branch only. 
+if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
+
+  urbanopt_rnm_us()
+    
+}

data/lib/urbanopt/rnm/api_client.rb

@@ -177,52 +177,70 @@ module URBANopt
         # prepare results directory
         prepare_results_dir
 
-        max_tries = 10
+        max_tries = 20
         tries = 0
         puts "attempting to retrieve results for simulation #{@sim_id}"
         while !done && (max_tries != tries)
-          resp = conn.get("simulations/#{@sim_id}")
-          if resp.status == 200
-            data = JSON.parse(resp.body)
-            if data['status'] && ['failed', 'completed'].include?(data['status'])
-              # done
-              done = true
-              if data['status'] == 'failed'
-                if data['results'] && data['results']['message']
-                  puts "Simulation Error: #{data['results']['message']}"
+          begin
+            resp = conn.get("simulations/#{@sim_id}")
+            if resp.status == 200
+              data = JSON.parse(resp.body)
+              if data['status'] && ['failed', 'completed'].include?(data['status'])
+                # done
+                done = true
+                if data['status'] == 'failed'
+                  if data['results'] && data['results']['message']
+                    puts "Simulation Error: #{data['results']['message']}"
+                  else
+                    puts 'Simulation Error!'
+                  end
                 else
-                  puts 'Simulation Error!'
+                  # edge case, check for results
+                  if data['results'].nil?
+                    puts "got a 200 but results are null...trying again"
+                    tries += 1
+                    sleep(3)
+                  else
+                    # get results
+                    @results = data['results'] || []
+
+                    puts "downloading results"
+                    # download results
+                    download_results
+                    return @results
+                  end
                 end
               else
-                # get results
-                @results = data['results'] || []
-
-                # download results
-                download_results
-
-                return @results
+                puts "no status yet...trying again"
+                tries += 1
+                sleep(3)
               end
+
             else
+              puts("ERROR retrieving: #{resp.body}")
               tries += 1
-              sleep(1)
-            end
 
-          else
-            puts("ERROR retrieving: #{resp.body}")
-            tries += 1
-
-            if tries == max_tries
-              # now raise the error
-              msg = "Error retrieving simulation #{@sim_id}. error code: #{resp.status}"
-              @@logger.error(msg)
-              raise msg
-            else
-              # try again
-              puts("TRYING AGAIN...#{tries}")
-              sleep(3)
+              if tries == max_tries
+                # now raise the error
+                msg = "Error retrieving simulation #{@sim_id}. error code: #{resp.status}"
+                @@logger.error(msg)
+                raise msg
+              else
+                # try again
+                puts("TRYING AGAIN...#{tries}")
+                sleep(3)
+              end
             end
+          rescue => error
+            @@logger.error("Error retrieving simulation #{@sim_id}.")
+            @@logger.error(error.message)
+            raise error.message
           end
         end
+        if !done
+          @@logger.error("Error retrieving simulation #{@sim_id}.")
+          raise 'Simulation not retrieved...maximum tries reached'
+        end
       end
 
       ##
@@ -243,14 +261,14 @@ module URBANopt
             streamed << chunk
           end
         end
-        # puts("STATUS: #{resp.status}, #{resp.body}")
 
         if resp.status == 200
 
           file_path = File.join(@rnm_dir, 'results', 'results.zip')
 
           File.open(file_path, 'wb') { |f| f.write streamed.join }
-          # puts "RNM-US results.zip downloaded to #{@rnm_dir}"
+          puts "RNM-US results.zip downloaded to #{@rnm_dir}"
+          
           # unzip
           Zip::File.open(file_path) do |zip_file|
             zip_file.each do |f|
@@ -259,7 +277,7 @@ module URBANopt
               zip_file.extract(f, f_path) unless File.exist?(f_path)
             end
           end
-
+          puts "results.zip extracted"
           # delete zip
           File.delete(file_path)
 

data/lib/urbanopt/rnm/consumers.rb

@@ -79,6 +79,7 @@ module URBANopt
           yearly_profile_node_reactive = []
           nodes_per_bldg, area, medium_voltage = av_peak_cons_per_building_type(folder['building_types'])
           # the default variables are defined (i.e. type and rurality type)
+          puts "consumers 82"
           closest_node = building_map[3].split('_')[1].to_i # refers to the node, found in the class above
           node = closest_node
           cont = 1
@@ -219,7 +220,8 @@ module URBANopt
         single_values = Hash.new(0)
         hours = 24 * n_timestep_per_hour -1
         feature_type = json_feature_report['program']['building_types'][0]['building_type']
-        residential_building_types = ["Single-Family Detached", "Single-Family Attached", "Multifamily"]
+        residential_building_types = ['Single-Family Detached', 'Single-Family Attached', 'Multifamily', 'Single-Family', 'Multifamily Detached (2 to 4 units)', 'Multifamily Detached (5 or more units)']
+
         # finding the index where to start computing and saving the info, from the value of the "worst-case hour" for the max peak consumption of the district
         if residential_building_types.include? feature_type
           profile_start_max = hour.hour_index_max_res - ((hour.peak_hour_max_res.split(':')[0].to_i + (hour.peak_hour_max_res.split(':')[1].to_i / 60)) * n_timestep_per_hour)

data/lib/urbanopt/rnm/prosumers.rb

@@ -320,7 +320,8 @@ module URBANopt
         @medium_voltage = false
         hours = 24 * n_timestep_per_hour -1 # change name, maybe to intervals
         feature_type = json_feature_report['program']['building_types'][0]["building_type"]
-        residential_building_types = ["Single-Family Detached", "Single-Family Attached", "Multifamily"]
+        residential_building_types = ['Single-Family Detached', 'Single-Family Attached', 'Multifamily', 'Single-Family', 'Multifamily Detached (2 to 4 units)', 'Multifamily Detached (5 or more units)']
+
         # finding the index where to start computing and saving the info, from the value of the "worst-case hour" for the max peak consumption of the district
         # considering num timestep per hours and the fact that each day starts from 1 am
         if residential_building_types.include? feature_type

data/lib/urbanopt/rnm/scenario_report.rb

@@ -112,7 +112,7 @@ module URBANopt
       def aggregate_consumption(file_csv, file_json, n_feature)
         feature_type = file_json['program']['building_types'][0]['building_type']
         # residential_building_types = "Single-Family Detached" #add the other types
-        residential_building_types = ['Single-Family Detached', 'Single-Family Attached', 'MultiFamily', 'Single-Family', 'Multifamily Detached (2 to 4 units)', 'Multifamily Detached (5 or more units)'] # add the other types
+        residential_building_types = ['Single-Family Detached', 'Single-Family Attached', 'Multifamily', 'Single-Family', 'Multifamily Detached (2 to 4 units)', 'Multifamily Detached (5 or more units)'] # add the other types
         puts feature_type
         j = 0
         CSV.foreach(file_csv, headers: true) do |power|

data/lib/urbanopt/rnm/version.rb

@@ -40,6 +40,6 @@
 
 module URBANopt
   module RNM
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-rnm-us
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Katherine Fleming
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -164,6 +164,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Jenkinsfile
 - LICENSE.md
 - README.md
 - Rakefile