From 3a1151d960ffd7a8874547549b6253585af4935b Mon Sep 17 00:00:00 2001 From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de> Date: Mon, 15 Apr 2024 17:20:07 +0200 Subject: [PATCH] Re-added co2 emission --- Model_Library | 2 +- examples/BusChargingDepot/depot.json | 1 - examples/BusChargingHPC/HPC.json | 1 - examples/BusChargingIMC/IMC.json | 1 - examples/aggregation/prosumer.json | 3 +-- examples/complex_prosumer/prosumer.json | 3 +-- examples/district/asset.json | 3 +-- examples/district/district.json | 3 +-- examples/district/prosumer_1.json | 3 +-- examples/district/prosumer_2.json | 3 +-- examples/simple_prosumer/prosumer.json | 3 +-- 11 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Model_Library b/Model_Library index 1bb1ee8c0b..5432852aff 160000 --- a/Model_Library +++ b/Model_Library @@ -1 +1 @@ -Subproject commit 1bb1ee8c0b26f91df757249989dad0b9ee8baf75 +Subproject commit 5432852affd9514efc9f7a7da2fe20172246ec76 diff --git a/examples/BusChargingDepot/depot.json b/examples/BusChargingDepot/depot.json index f7fa54c353..7f76e743aa 100644 --- a/examples/BusChargingDepot/depot.json +++ b/examples/BusChargingDepot/depot.json @@ -4,7 +4,6 @@ "type": "ElectricalGrid", "price": 0.3046, "injection_price": 0.0, - "emission": 0.401, "peak_power_cost": 0.0456 }, "depot_bus_bar": { diff --git a/examples/BusChargingHPC/HPC.json b/examples/BusChargingHPC/HPC.json index effc76c19d..6deccd23d2 100644 --- a/examples/BusChargingHPC/HPC.json +++ b/examples/BusChargingHPC/HPC.json @@ -4,7 +4,6 @@ "type": "ElectricalGrid", "price": 0.3046, "injection_price": 0.0, - "emission": 0.401, "peak_power_cost": 0.0456 }, "depot_bus_bar": { diff --git a/examples/BusChargingIMC/IMC.json b/examples/BusChargingIMC/IMC.json index 2b18d799df..648ac9e4d2 100644 --- a/examples/BusChargingIMC/IMC.json +++ b/examples/BusChargingIMC/IMC.json @@ -4,7 +4,6 @@ "type": "ElectricalGrid", "price": 0.3046, "injection_price": 0.0, - "emission": 0.401, "peak_power_cost": 0.0384 }, "OHL": { diff --git a/examples/aggregation/prosumer.json b/examples/aggregation/prosumer.json index a316df842a..9fc8899e83 100644 --- a/examples/aggregation/prosumer.json +++ b/examples/aggregation/prosumer.json @@ -15,8 +15,7 @@ "grid": { "type": "ElectricalGrid", "price": 0.3046, - "injection_price": 0.0793, - "emission": 0.401 + "injection_price": 0.0793 }, "consumption": { "type": "ElectricalConsumption" diff --git a/examples/complex_prosumer/prosumer.json b/examples/complex_prosumer/prosumer.json index 95705b533f..2c0d9cc41e 100644 --- a/examples/complex_prosumer/prosumer.json +++ b/examples/complex_prosumer/prosumer.json @@ -27,8 +27,7 @@ "electric_grid": { "type": "ElectricalGrid", "price": 0.3046, - "injection_price": 0.0793, - "emission": 0.401 + "injection_price": 0.0793 }, "electric_consumption": { "type": "ElectricalConsumption" diff --git a/examples/district/asset.json b/examples/district/asset.json index 9d74cf1ac9..ed79b4a7f8 100644 --- a/examples/district/asset.json +++ b/examples/district/asset.json @@ -13,8 +13,7 @@ "max_capacity": 20 }, "grid": { - "type": "ElectricalGrid", - "emission": 0.401 + "type": "ElectricalGrid" } }, "connections": [ diff --git a/examples/district/district.json b/examples/district/district.json index cac7030cf8..4aafcb0e96 100644 --- a/examples/district/district.json +++ b/examples/district/district.json @@ -3,8 +3,7 @@ "assets": ["my_asset"], "components": { "grid": { - "type": "ElectricalGrid", - "emission": 0.401 + "type": "ElectricalGrid" }, "my_prosumer_1_adapter": { "type": "MemberAdapter", diff --git a/examples/district/prosumer_1.json b/examples/district/prosumer_1.json index a316df842a..9fc8899e83 100644 --- a/examples/district/prosumer_1.json +++ b/examples/district/prosumer_1.json @@ -15,8 +15,7 @@ "grid": { "type": "ElectricalGrid", "price": 0.3046, - "injection_price": 0.0793, - "emission": 0.401 + "injection_price": 0.0793 }, "consumption": { "type": "ElectricalConsumption" diff --git a/examples/district/prosumer_2.json b/examples/district/prosumer_2.json index 78b4c6e003..4defdac6bf 100644 --- a/examples/district/prosumer_2.json +++ b/examples/district/prosumer_2.json @@ -27,8 +27,7 @@ "grid": { "type": "ElectricalGrid", "price": 0.3046, - "injection_price": 0.0793, - "emission": 0.401 + "injection_price": 0.0793 }, "consumption": { "type": "ElectricalConsumption" diff --git a/examples/simple_prosumer/prosumer.json b/examples/simple_prosumer/prosumer.json index a316df842a..9fc8899e83 100644 --- a/examples/simple_prosumer/prosumer.json +++ b/examples/simple_prosumer/prosumer.json @@ -15,8 +15,7 @@ "grid": { "type": "ElectricalGrid", "price": 0.3046, - "injection_price": 0.0793, - "emission": 0.401 + "injection_price": 0.0793 }, "consumption": { "type": "ElectricalConsumption" -- GitLab