fixed bug in dw stock

nismod · May 20, 2019 · 396aebf · 396aebf
1 parent 030d1c6
commit 396aebf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/energy_demand/dwelling_stock/dw_stock.py b/energy_demand/dwelling_stock/dw_stock.py
@@ -54,7 +54,7 @@ def __init__(
         self.curr_yr = curr_yr
         self.enduses = enduses
         self.longitude = coordinates['longitude']
-        self.latitude = coordinates['longitude']
+        self.latitude = coordinates['latitude']
         self.dwtype = dwtype
         self.age = age
         self.population = population
@@ -517,7 +517,7 @@ def rs_dw_stock(
 
         # Get floor area per person for every simulation year
         data_floorarea_pp = get_floorare_pp(
-            floorarea_by,
+            tot_floorarea_cy,
             scenario_data['population'][base_yr][region],
             base_yr,
             sim_yrs,

diff --git a/energy_demand/model.py b/energy_demand/model.py
@@ -77,18 +77,13 @@ def __init__(
         logging.debug("... generating dwelling stocks")
         lookups = lookup_tables.basic_lookups()
 
-        #if criterias['virtual_building_stock_criteria']:
         rs_dw_stock, ss_dw_stock = create_virtual_dwelling_stocks(
             regions, assumptions.curr_yr, data, criterias)
 
         data['dw_stocks'] = {
             lookups['submodels_names'][0]: rs_dw_stock,
             lookups['submodels_names'][1]: ss_dw_stock,
             lookups['submodels_names'][2]: None}
-        #else:
-            # Create dwelling stock from imported data from newcastle
-        #    data = create_dwelling_stock(
-        #        regions, assumptions.curr_yr, data)
 
         # Initialise result container to aggregate results
         aggr_results = initialise_result_container(

diff --git a/energy_demand/wrapper_model.py b/energy_demand/wrapper_model.py
@@ -137,7 +137,6 @@ def load_data_before_simulation(
         data['scenario_data']['floor_area']['rs_floorarea'] = data['scenario_data']['rs_floorarea']
         data['scenario_data']['floor_area']['ss_floorarea'] = data['scenario_data']['ss_floorarea']
         data['scenario_data']['service_building_count'][data['assumptions'].base_yr] = {}
-        #pass
 
     return data