updates of Snbc3 run3 dgec new

.gitignore

@@ -19,17 +19,25 @@
 /project/config/validation/
 /project/test
 /project/input/stock/buildingstock_sdes2018_medium_3.csv
+/project/input/stock/20241205_buildingstock_sdes2023_medium_3.csv
+/project/input/stock/20241205_buildingstock_sdes2023_update.csv
 /project/analysis/
 /project/input/macro/_old/
 /project/input/policies/_old/
 /project/input/policies/current/_old/
 /project/input/revealed_data/_old/
 /project/config/coupling/old/
 /project/input/investment/_old/
+/project/input/sfec/
+/project/config/sfec/
+/project/input/stock/
 
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
 **/__pycache__
 *.py[cod]
 /project/config/hidden_cost/
+
+/venv/*
+/.vscode/launch.json

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "console": "integratedTerminal",
+            "cwd": "${workspaceFolder}",
+            "module": "project.main",
+            "args": ["--config","project/config/config.json"]
+        }
+    ]
+}

project/config/config.json

@@ -11,7 +11,7 @@
     "add_policies": null,
     "remove_policies": null,
     "policies_scenarios": null,
-    "no_natural_replacement": null
+    "no_natural_replacement": false
   },
   "sensitivity": {
     "activated": false
@@ -32,7 +32,7 @@
   "Reference": {
     "file": "project/config/reference.json",
     "step": 1,
-    "end": 2020,
+    "end": 2025,
     "policies": {
       "file": "project/input/policies/policies_2024.json",
       "restriction_gas": {
@@ -44,7 +44,8 @@
       }
     },
     "simple": {
-      "no_policy_heater": false
+      "no_policy_heater": false,
+      "quintiles": false
     }
   }
-}
+}

project/config/reference.json

@@ -2,7 +2,7 @@
     "end": 2051,
     "step": 1,
     "output": "full",
-    "start": 2017,
+    "start": 2022,
     "building_stock": "project/input/stock/buildingstock_sdes2018_medium_3.csv",
     "financing_cost": {
       "activated": true,
@@ -103,7 +103,7 @@
       "income": "project/input/macro/income.csv",
       "income_rate": 0.008,
       "rotation_rate": "project/input/macro/rotation_rate.csv",
-      "consumption_ini": "project/input/macro/consumption_ini.csv",
+      "consumption_ini": "project/input/macro/consumption_ini_agg.csv",
       "present_discount_rate": "project/input/investment/present_discount_rate.csv",
       "population": null,
       "surface_built": null,
@@ -118,7 +118,7 @@
     "health_cost_income": "project/input/policies/health_cost_income.csv",
     "carbon_value": "project/input/policies/carbon_value.csv",
     "policies": {
-      "file": "project/input/policies/policies_2021.json"
+      "file": "project/policies/policies_2024.json"
     },
     "simple": {
       "figures": true,
@@ -134,12 +134,12 @@
       "income_constant": false,
       "prices_constant": false,
       "heating_system": {
-        "Oil fuel-Standard boiler": "Oil fuel-Performance boiler",
-        "Natural gas-Standard boiler": "Natural gas-Performance boiler",
-        "Wood fuel-Standard boiler": "Wood fuel-Performance boiler",
-        "Natural gas-Collective boiler": "Natural gas-Performance boiler",
-        "Oil fuel-Collective boiler": "Oil fuel-Performance boiler",
-        "Electricity-Heat pump air": "Electricity-Heat pump water"
+      "Oil fuel-Standard boiler": "Oil fuel-Performance boiler",
+      "Natural gas-Standard boiler": "Natural gas-Performance boiler",
+      "Wood fuel-Standard boiler": "Wood fuel-Performance boiler",
+      "Natural gas-Collective boiler": "Natural gas-Performance boiler",
+      "Oil fuel-Collective boiler": "Oil fuel-Performance boiler",
+      "Electricity-Heat pump air": "Electricity-Heat pump water"
       },
       "insulation": false,
       "no_heating_switch": false,

project/coupling.py

@@ -84,7 +84,7 @@ def ini_res_irf(config=None, path=None, level_logger='DEBUG'):
 
     output = pd.DataFrame()
     # run first year - consumption
-    _, o = buildings.parse_output_run(energy_prices.loc[buildings.first_year, :], inputs_dynamics['post_inputs'])
+    _, o = buildings.parse_output_run(energy_prices.loc[buildings.first_year, :], inputs_dynamics['post_inputs'], pef_elec=inputs_dynamics['pef_elec'].loc[buildings.first_year])
     output = pd.concat((output, o), axis=1)
 
     if config['simple'].get('no_policy_insulation'):

project/input/energy/energy_prices_wt_ame2024.csv

@@ -0,0 +1,35 @@
+,Oil fuel,Natural gas,Electricity,Wood fuel,Heating
+2017,0.0619,0.05937,0.1151,0.056,0.0746
+2018,0.0619,0.05937,0.1151,0.056,0.0746
+2019,0.0619,0.05937,0.1151,0.056,0.0746
+2020, 0.0452,0.048668936,0.115147572,0.0565708,0.0735
+2021,0.0487,0.056204489,0.116998057,0.057266139,0.074403424
+2022,0.0523,0.063740042,0.118848543,0.057961477,0.075306847
+2023,0.0559,0.071275596,0.120699029,0.058656816,0.076210271
+2024,0.0595,0.078811149,0.122549514,0.059352155,0.077113694
+2025,0.0631,0.086346702,0.1244,0.060047493,0.078017118
+2026,0.0642,0.085784187,0.125518041,0.060785566,0.078976063
+2027,0.0653,0.085221672,0.126636083,0.061523638,0.079935009
+2028,0.0664,0.084659157,0.127754124,0.06226171,0.080893954
+2029,0.0675,0.084096642,0.128872166,0.062999783,0.0818529
+2030,0.0687,0.083534127,0.129990207,0.063737855,0.082811846
+2031,0.0698,0.082642417,0.129990207,0.064521288,0.083829726
+2032,0.0709,0.081750708,0.129990207,0.06530472,0.084847605
+2033,0.0720,0.080858998,0.129990207,0.066088152,0.085865485
+2034,0.0731,0.079967288,0.129990207,0.066871585,0.086883365
+2035,0.0742,0.079075578,0.129990207,0.067655017,0.087901245
+2036,0.0745,0.081413004,0.129990207,0.068486597,0.088981681
+2037,0.0748,0.083750431,0.129990207,0.069318177,0.090062117
+2038,0.0751,0.086087858,0.129990207,0.070149757,0.091142553
+2039,0.0754,0.088425284,0.129990207,0.070981337,0.09222299
+2040,0.0757,0.090762711,0.129990207,0.071812917,0.093303426
+2041,0.0768,0.090594567,0.129990207,0.072695604,0.094450263
+2042,0.0778,0.090426423,0.129990207,0.073578291,0.095597099
+2043,0.0789,0.090258279,0.129990207,0.074460978,0.096743936
+2044,0.0799,0.090090134,0.129990207,0.075343665,0.097890773
+2045,0.0810,0.08992199,0.129990207,0.076226351,0.09903761
+2046,0.0828,0.089637982,0.129990207,0.077163286,0.100254929
+2047,0.0847,0.089353973,0.129990207,0.07810022,0.101472247
+2048,0.0865,0.089069964,0.129990207,0.079037155,0.102689566
+2049,0.0884,0.088785956,0.129990207,0.079974089,0.103906884
+2050,0.0903,0.088501947,0.129990207,0.080911024,0.105124203

project/input/energy/primary_energy_factor_electricity.csv

@@ -0,0 +1,3 @@
+Year,Electricity
+2023,2.3
+2026,1.9

project/input/macro/consumption_ini_agg.csv

@@ -0,0 +1,6 @@
+Heating energy,
+Electricity,50
+Natural gas,91
+Oil fuel,31
+Wood fuel,77
+Heating,12

project/input/macro/energy_taxes_ame2021.csv

@@ -0,0 +1,34 @@
+,Oil fuel,Natural gas,Electricity,Wood fuel,Heating
+2018,0.0156,0.0111,0.0358,0,0
+2019,0.0156,0.0111,0.0358,0,0
+2020,0.0156,0.0111,0.0358,0,0
+2021,0.0156,0.0111,0.0358,0,0
+2022,0.0156,0.0111,0.0358,0,0
+2023,0.0156,0.0111,0.0358,0,0
+2024,0.0156,0.0111,0.0358,0,0
+2025,0.0156,0.0111,0.0358,0,0
+2026,0.0156,0.0111,0.0358,0,0
+2027,0.0156,0.0111,0.0358,0,0
+2028,0.0156,0.0111,0.0358,0,0
+2029,0.0156,0.0111,0.0358,0,0
+2030,0.0156,0.0111,0.0358,0,0
+2031,0.0156,0.0111,0.0358,0,0
+2032,0.0156,0.0111,0.0358,0,0
+2033,0.0156,0.0111,0.0358,0,0
+2034,0.0156,0.0111,0.0358,0,0
+2035,0.0156,0.0111,0.0358,0,0
+2036,0.0156,0.0111,0.0358,0,0
+2037,0.0156,0.0111,0.0358,0,0
+2038,0.0156,0.0111,0.0358,0,0
+2039,0.0156,0.0111,0.0358,0,0
+2040,0.0156,0.0111,0.0358,0,0
+2041,0.0156,0.0111,0.0358,0,0
+2042,0.0156,0.0111,0.0358,0,0
+2043,0.0156,0.0111,0.0358,0,0
+2044,0.0156,0.0111,0.0358,0,0
+2045,0.0156,0.0111,0.0358,0,0
+2046,0.0156,0.0111,0.0358,0,0
+2047,0.0156,0.0111,0.0358,0,0
+2048,0.0156,0.0111,0.0358,0,0
+2049,0.0156,0.0111,0.0358,0,0
+2050,0.0156,0.0111,0.0358,0,0

project/input/macro/energy_taxes_ams_run3.csv

@@ -0,0 +1,34 @@
+,Oil fuel,Natural gas,Electricity,Wood fuel,Heating
+2018,0.0156,0.011,0.038,0,0
+2019,0.011,0.014,017,0,0
+2020,0.009,0.014,0.018,0,0
+2021,0.011,0.013,0.019,0,0
+2022,0.017,0.017,0.20,0
+2023,0.015,0.020,0.023,0,0
+2024,0.016,0.019,0.026,0,0
+2025,0.016,0.019,0.037,0,0
+2026,0.016,0.019,0.037,0,0
+2027,0.016,0.019,0.037,0,0
+2028,0.016,0.019,0.037,0,0
+2029,0.016,0.019,0.037,0,0
+2030,0.016,0.019,0.037,0,0
+2031,0.016,0.019,0.037,0,0
+2032,0.016,0.019,0.037,0,0
+2033,0.016,0.019,0.037,0,0
+2034,0.016,0.019,0.037,0,0
+2035,0.016,0.019,0.037,0,0
+2036,0.016,0.019,0.037,0,0
+2037,0.016,0.019,0.038,0,0
+2038,0.016,0.019,0.038,0,0
+2039,0.016,0.019,0.038,0,0
+2040,0.016,0.019,0.038,0,0
+2041,0.016,0.019,0.038,0,0
+2042,0.016,0.019,0.038,0,0
+2043,0.016,0.019,0.038,0,0
+2044,0.016,0.019,0.038,0,0
+2045,0.016,0.019,0.038,0,0
+2046,0.016,0.019,0.038,0,0
+2047,0.016,0.019,0.038,0,0
+2048,0.016,0.019,0.038,0,0
+2049,0.016,0.019,0.038,0,0
+2050,0.016,0.019,0.038,0,0

project/input/macro/energy_vta.csv

@@ -0,0 +1,5 @@
+Oil fuel,0.2
+Natural gas,0.15
+Electricity,0.15
+Wood fuel,0.1
+Heating,0

project/input/macro/energy_vta_ams_run3.csv

@@ -0,0 +1,5 @@
+Oil fuel,0.2
+Natural gas,0.15
+Electricity,0.15
+Wood fuel,0.1
+Heating,0

project/input/policies/current/mpr_insulation.csv

@@ -5,7 +5,7 @@ Single-family,D3,60,20,0,80
 Single-family,D4,60,20,0,80
 Single-family,D5,40,15,0,40
 Single-family,D6,40,15,0,40
-Single-family,D7,40,15,0,40
-Single-family,D8,15,7,0,0
-Single-family,D9,15,7,0,0
-Single-family,D10,15,7,0,0
+Single-family,D7,0,0,0,0
+Single-family,D8,0,0,0,0
+Single-family,D9,0,0,0,0
+Single-family,D10,0,7,0,0

project/input/policies/policies_2024.json

@@ -125,7 +125,8 @@
         "mpr_efficacite",
         "mpr_serenite",
         "mpr_performance",
-        "mpr_multifamily"
+        "mpr_multifamily",
+        "mpr_multifamily_updated"
       ],
       "target": "energy_condition_50",
       "policy": "subsidy_ad_valorem"
@@ -139,6 +140,7 @@
         "mpr_serenite",
         "mpr_performance",
         "mpr_multifamily",
+        "mpr_multifamily_updated",
         "mpr_multifamily_deep",
         "mpr",
         "mpr_efficacite",
@@ -163,6 +165,7 @@
         "mpr_performance",
         "mpr_multifamily",
         "mpr_multifamily_deep",
+        "mpr_multifamily_updated",
         "mpr",
         "mpr_efficacite",
         "cite",