diff --git a/docs/dev/SIPS2025-CaseStudies.ipynb b/docs/dev/SIPS2025-CaseStudies.ipynb
index 69e0682..47c5d22 100644
--- a/docs/dev/SIPS2025-CaseStudies.ipynb
+++ b/docs/dev/SIPS2025-CaseStudies.ipynb
@@ -142,7 +142,7 @@
"#Residential case study\n",
"sim1.createScenario(name='Resi_repower', massmodulefile=moduleFile_m, energymodulefile=moduleFile_e) #create the scenario, name and mod file attach\n",
"for mat in MATERIALS:\n",
- " materialfile = os.path.join(baselinesfolder, 'baseline_material_mass_'+str(mat)+'.csv')\n",
+ " materialfile_m = os.path.join(baselinesfolder, 'baseline_material_mass_'+str(mat)+'.csv')\n",
" materialfile_e = os.path.join(baselinesfolder, 'baseline_material_energy_'+str(mat)+'.csv')\n",
" sim1.scenario['Resi_repower'].addMaterial(mat, massmatfile=materialfile_m, energymatfile=materialfile_e) # add all materials listed in MATERIALS"
]
@@ -251,7 +251,7 @@
{
"data": {
"text/plain": [
- ""
+ ""
]
},
"execution_count": 11,
@@ -309,7 +309,9 @@
"********************\n",
"Finished Area+Power Generation Calculations\n",
"==> Working on Material : glass\n",
+ "Recycled surplus End of Sim for Mat glass Scenario Resi_repower = 8.411539478439826e-05 tonnes.\n",
"==> Working on Material : aluminium_frames\n",
+ "Recycled surplus End of Sim for Mat aluminium_frames Scenario Resi_repower = 0.000995863752972422 tonnes.\n",
"==> Working on Material : silver\n",
"==> Working on Material : silicon\n",
"==> Working on Material : copper\n",
@@ -376,7 +378,7 @@
},
{
"cell_type": "code",
- "execution_count": 19,
+ "execution_count": 44,
"id": "6db33248-50a3-4274-a1b3-a9ced04a20e7",
"metadata": {},
"outputs": [
@@ -386,7 +388,7 @@
"Text(0, 0.5, 'Decommissioned Capacity [kW_dc]')"
]
},
- "execution_count": 19,
+ "execution_count": 44,
"metadata": {},
"output_type": "execute_result"
},
@@ -411,7 +413,7 @@
},
{
"cell_type": "code",
- "execution_count": 15,
+ "execution_count": 45,
"id": "eedd27d0-17da-4752-8479-1191cd246ead",
"metadata": {},
"outputs": [
@@ -421,7 +423,7 @@
"Text(0, 0.5, 'Annual Energy Generation [MWh]')"
]
},
- "execution_count": 15,
+ "execution_count": 45,
"metadata": {},
"output_type": "execute_result"
},
@@ -445,7 +447,7 @@
},
{
"cell_type": "code",
- "execution_count": 72,
+ "execution_count": 46,
"id": "5b55fdcd-bfc4-4742-a365-8816b5cc38a9",
"metadata": {},
"outputs": [
@@ -470,13 +472,13 @@
" \n",
" \n",
" | \n",
- " Keep_[MWh] | \n",
- " Repower_[MWh] | \n",
+ " Keep | \n",
+ " Repower | \n",
"
\n",
" \n",
" \n",
" \n",
- " Energy_Gen | \n",
+ " Energy Gen [MWh] | \n",
" 148.307821 | \n",
" 365.792917 | \n",
"
\n",
@@ -485,11 +487,11 @@
""
],
"text/plain": [
- " Keep_[MWh] Repower_[MWh]\n",
- "Energy_Gen 148.307821 365.792917"
+ " Keep Repower\n",
+ "Energy Gen [MWh] 148.307821 365.792917"
]
},
- "execution_count": 72,
+ "execution_count": 46,
"metadata": {},
"output_type": "execute_result"
}
@@ -497,14 +499,14 @@
"source": [
"cumu_energy_gen = sim1_energyGen.cumsum().loc[[2060]]\n",
"cumu_energy_gen_MWh = cumu_energy_gen/1e6\n",
- "cumu_energy_gen_MWh.columns = ['Keep_[MWh]', 'Repower_[MWh]']\n",
- "cumu_energy_gen_MWh.index=['Energy_Gen']\n",
+ "cumu_energy_gen_MWh.columns = ['Keep', 'Repower']\n",
+ "cumu_energy_gen_MWh.index=['Energy Gen [MWh]']\n",
"cumu_energy_gen_MWh"
]
},
{
"cell_type": "code",
- "execution_count": 73,
+ "execution_count": 47,
"id": "245df34e-ddc9-416c-9eb3-512ab8d8341c",
"metadata": {},
"outputs": [],
@@ -516,7 +518,7 @@
},
{
"cell_type": "code",
- "execution_count": 75,
+ "execution_count": 48,
"id": "cce5ad74-8191-4b71-b4f1-dbea5c280317",
"metadata": {},
"outputs": [
@@ -541,46 +543,46 @@
" \n",
" \n",
" | \n",
- " Keep_[MWh] | \n",
- " Repower_[MWh] | \n",
+ " Keep | \n",
+ " Repower | \n",
"
\n",
" \n",
" \n",
" \n",
- " Energy_Gen | \n",
+ " Energy Gen [MWh] | \n",
" 148.307821 | \n",
" 365.792917 | \n",
"
\n",
" \n",
- " Energy_Demand | \n",
+ " Energy Demand [MWh] | \n",
" 22.049576 | \n",
- " 35.809028 | \n",
+ " 37.518583 | \n",
"
\n",
" \n",
"\n",
"
"
],
"text/plain": [
- " Keep_[MWh] Repower_[MWh]\n",
- "Energy_Gen 148.307821 365.792917\n",
- "Energy_Demand 22.049576 35.809028"
+ " Keep Repower\n",
+ "Energy Gen [MWh] 148.307821 365.792917\n",
+ "Energy Demand [MWh] 22.049576 37.518583"
]
},
- "execution_count": 75,
+ "execution_count": 48,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"cumu_energy_MWh = cumu_energy_gen_MWh.copy()\n",
- "cumu_energy_MWh.loc['Energy_Demand','Keep_[MWh]'] = energydemand_keep\n",
- "cumu_energy_MWh.loc['Energy_Demand','Repower_[MWh]'] = energydemand_repower\n",
+ "cumu_energy_MWh.loc['Energy Demand [MWh]','Keep'] = energydemand_keep\n",
+ "cumu_energy_MWh.loc['Energy Demand [MWh]','Repower'] = energydemand_repower\n",
"cumu_energy_MWh"
]
},
{
"cell_type": "code",
- "execution_count": 78,
+ "execution_count": 52,
"id": "6319d6ed-18d2-4869-8d66-4a307731c6d5",
"metadata": {},
"outputs": [
@@ -605,51 +607,51 @@
"
\n",
" \n",
" | \n",
- " Keep_[MWh] | \n",
- " Repower_[MWh] | \n",
+ " Keep | \n",
+ " Repower | \n",
"
\n",
" \n",
"
\n",
" \n",
- " Energy_Gen | \n",
+ " Energy Gen [MWh] | \n",
" 148.307821 | \n",
" 365.792917 | \n",
"
\n",
" \n",
- " Energy_Demand | \n",
+ " Energy Demand [MWh] | \n",
" 22.049576 | \n",
- " 35.809028 | \n",
+ " 37.518583 | \n",
"
\n",
" \n",
" EROI | \n",
" 6.726108 | \n",
- " 10.215103 | \n",
+ " 9.749646 | \n",
"
\n",
" \n",
"\n",
"
"
],
"text/plain": [
- " Keep_[MWh] Repower_[MWh]\n",
- "Energy_Gen 148.307821 365.792917\n",
- "Energy_Demand 22.049576 35.809028\n",
- "EROI 6.726108 10.215103"
+ " Keep Repower\n",
+ "Energy Gen [MWh] 148.307821 365.792917\n",
+ "Energy Demand [MWh] 22.049576 37.518583\n",
+ "EROI 6.726108 9.749646"
]
},
- "execution_count": 78,
+ "execution_count": 52,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"#EROI\n",
- "cumu_energy_MWh.loc['EROI'] = cumu_energy_MWh.loc['Energy_Gen']/cumu_energy_MWh.loc['Energy_Demand']\n",
+ "cumu_energy_MWh.loc['EROI'] = cumu_energy_MWh.loc['Energy Gen [MWh]']/cumu_energy_MWh.loc['Energy Demand [MWh]']\n",
"cumu_energy_MWh"
]
},
{
"cell_type": "code",
- "execution_count": 50,
+ "execution_count": 53,
"id": "77030757-12bb-4e0e-834e-6a23fbd59d8c",
"metadata": {},
"outputs": [],
@@ -661,11 +663,139 @@
},
{
"cell_type": "code",
- "execution_count": null,
- "id": "720d84de-79ee-45bc-976f-4d2261852ea4",
+ "execution_count": 54,
+ "id": "7a822a59-7d0d-4c03-90e6-9fe451be307a",
"metadata": {},
"outputs": [],
- "source": []
+ "source": [
+ "#wastes\n",
+ "modwaste_keep = sim1_cumu.iloc[-1]['WasteAll_Module_SIPS_Resi_keep_[Tonnes]']\n",
+ "modwaste_repower = sim1_cumu.iloc[-1]['WasteAll_Module_SIPS_Resi_repower_[Tonnes]']\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 55,
+ "id": "80bbdad5-bff1-4933-9305-0c1f65ff8349",
+ "metadata": {},
+ "outputs": [
+ {
+ "data": {
+ "text/plain": [
+ "