Merge pull request #2997 from quintel/built-environment-heat

Heat modelling changes for the built environment

Gemfile

@@ -9,13 +9,13 @@ gem 'rake'
 
 group :development, :test do
   gem 'roo'
-  gem 'atlas',    ref: '3c1f70f', github: 'quintel/atlas'
+  gem 'atlas',    ref: 'd5c84b5', github: 'quintel/atlas'
 end
 
 group :test do
   gem 'rspec'
   gem 'rspec_junit_formatter'
 
-  gem 'refinery', ref: '72eacf8', github: 'quintel/refinery'
+  gem 'refinery', ref: '5439199', github: 'quintel/refinery'
   gem 'rubel',    ref: 'e36554a', github: 'quintel/rubel'
 end

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/quintel/atlas.git
-  revision: 3c1f70f1b001cecef89340e20857574fff781dd0
-  ref: 3c1f70f
+  revision: d5c84b505494c92f816624f8b30b4b47941ff75d
+  ref: d5c84b5
   specs:
     atlas (1.0.0)
       activemodel (>= 7)
@@ -13,8 +13,8 @@ GIT
 
 GIT
   remote: https://github.com/quintel/refinery.git
-  revision: 72eacf84c980ef797a0b7e63f55a39f5ca98640b
-  ref: 72eacf8
+  revision: 54391992ee6908712bc2abd5561e244e31a5fbe3
+  ref: 5439199
   specs:
     refinery (0.0.1)
       ruby-graphviz
@@ -31,9 +31,9 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activesupport (7.1.2)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -48,10 +48,10 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.6)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     csv (3.2.8)
     descendants_tracker (0.0.4)
@@ -66,13 +66,14 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     mini_portile2 (2.8.2)
-    minitest (5.20.0)
+    minitest (5.21.2)
     mutex_m (0.2.0)
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     racc (1.6.2)
     rake (12.3.3)
+    rexml (3.2.6)
     roo (2.7.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
@@ -91,16 +92,17 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-graphviz (1.2.4)
+    ruby-graphviz (1.2.5)
+      rexml
     ruby2_keywords (0.0.5)
     rubyzip (1.3.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     thread_safe (0.3.6)
     turbine-graph (0.1.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.6.0)
+    unicode-display_width (2.5.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)

carriers/useable_heat.ad

@@ -1,4 +1,4 @@
 - infinite = false
-- graphviz_color = purple
+- graphviz_color = violet
 
 ~ co2_conversion_per_mj = CARRIER(useable_heat, co2_conversion_per_mj)

config/dynamic_curves.yml

@@ -59,41 +59,6 @@ solar_pv_offshore:
   type: amplify
   curve: weather/solar_pv_offshore
 
-apartment_houses_heat:
-  type: interpolate
-  curves:
-    - weather/insulation_apartments_low
-    - weather/insulation_apartments_medium
-    - weather/insulation_apartments_high
-
-corner_houses_heat:
-  type: interpolate
-  curves:
-    - weather/insulation_corner_houses_low
-    - weather/insulation_corner_houses_medium
-    - weather/insulation_corner_houses_high
-
-detached_houses_heat:
-  type: interpolate
-  curves:
-    - weather/insulation_detached_houses_low
-    - weather/insulation_detached_houses_medium
-    - weather/insulation_detached_houses_high
-
-semi_detached_houses_heat:
-  type: interpolate
-  curves:
-    - weather/insulation_semi_detached_houses_low
-    - weather/insulation_semi_detached_houses_medium
-    - weather/insulation_semi_detached_houses_high
-
-terraced_houses_heat:
-  type: interpolate
-  curves:
-    - weather/insulation_terraced_houses_low
-    - weather/insulation_terraced_houses_medium
-    - weather/insulation_terraced_houses_high
-
 wind_coastal:
   type: amplify
   curve: weather/wind_coastal_baseline