diff --git a/Model_Library b/Model_Library index 1bb1ee8c0b26f91df757249989dad0b9ee8baf75..5432852affd9514efc9f7a7da2fe20172246ec76 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 f7fa54c353cd989924421adc14eb28661d251e42..7f76e743aa15189112c9d6af232caa95de71fe62 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 effc76c19d994c74ff398918ed79975062ac3296..6deccd23d2c5ac1add244152d7e7927085621501 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 2b18d799df3646be5455e6b668a067092b5c33c2..648ac9e4d2d7f70c9c663f8381538ca320ebe71e 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 a316df842a506983581b92866a341b7e629742ed..9fc8899e8359d040c7e1249deccd24e9364f9ec1 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 95705b533f80b9d26abbf2d989a2ab0bf00d3b05..2c0d9cc41e50a4b9752348494011a4e74edcacf1 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 9d74cf1ac97289ced382a1bb0c0f20782daad49e..ed79b4a7f8ab6c7d0ab22f24757c865e0c75d668 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 cac7030cf8d0377df386c51ce6b244936ba2bb05..4aafcb0e96fe97025508f98a92de140cf2e3f980 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 a316df842a506983581b92866a341b7e629742ed..9fc8899e8359d040c7e1249deccd24e9364f9ec1 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 78b4c6e0037ad2bc9cf276097822506e1ad060b5..4defdac6bf16e2759e9f96b8cdd87e1bdbe3edf6 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 a316df842a506983581b92866a341b7e629742ed..9fc8899e8359d040c7e1249deccd24e9364f9ec1 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"