Prosumer got updated + changes made in Model Library

Model_Library @ 7612ca4f

-Subproject commit 63548cade582a3b21c7f0e120142c6bd5f0ed299
+Subproject commit 7612ca4f9affe24b2235897f376b41b6187ef6d1

input_files/data/market-prices/market_sell_prices.csv

@@ -23,7 +23,7 @@ timestamp,day_ahead_price
 01-01-2019 21:00:00,0.3068
 01-01-2019 22:00:00,0.3027
 01-01-2019 23:00:00,0.2485
-02-01-2019 00:00:00,0.254
+02-01-2019 00:00:00,0.054
 02-01-2019 01:00:00,0.2198
 02-01-2019 02:00:00,0.205
 02-01-2019 03:00:00,0.1879

input_files/models/prosumer_models/jbr_lpe_test/prosumer.json

@@ -3,31 +3,31 @@
         "pv_roof": {
             "type": "PVGenerator",
             "model": "PV2",
-            "min_size": 10.0,
+            "min_size": 0.0,
             "max_size": 10.0
         },
         "inv_pv": {
             "type": "StaticInverter",
             "model": "INVPV",
-            "min_size": 10.0,
+            "min_size": 0.0,
             "max_size": 10.0
         },
         "inv_bat": {
             "type": "StaticBiInverter",
             "model": "INVBAT",
-            "min_size": 10.0,
+            "min_size": 0.0,
             "max_size": 10.0
         },
         "battery": {
             "type": "LiionBattery",
             "model": "BAT1",
-            "min_size": 10.0,
+            "min_size": 0.0,
             "max_size": 10.0
         },
         "grd": {
             "type": "ElectricalGrid",
             "model": "GRD1",
-            "min_size": 10000.0,
+            "min_size": 0.0,
             "max_size": 10000.0,
             "price": 0.3046,
             "injection_price": 0.0793,
@@ -39,25 +39,25 @@
         "bus_bar": {
             "type": "ElectricalBusBar",
             "model": "BUSBAR",
-            "min_size": 10.0,
+            "min_size": 0.0,
             "max_size": 10.0
         },
         "balancing_group": {
             "type": "BalancingGroup",
             "model": "BALANCINGGROUP",
-            "min_size": 10000.0,
+            "min_size": 0.0,
             "max_size": 10000.0
         },
         "market_1": {
             "type": "Market",
             "model": "MARKET",
-            "min_size": 10000.0,
+            "min_size": 0.0,
             "max_size": 10000.0
         },
         "market_2": {
             "type": "PPAMarket",
             "model": "PPAMARKET",
-            "min_size": 10000.0,
+            "min_size": 0.0,
             "max_size": 10000.0
         }
     },
@@ -103,17 +103,17 @@
             "from": "bus_bar",
             "output": 1,
             "to": "inv_bat",
-            "input": 1
+            "input": 2
         },
         {
             "from": "inv_bat",
-            "output": 1,
+            "output": 2,
             "to": "bus_bar",
             "input": 1
         },
         {
             "from": "grd",
-            "output": 1,
+            "output": 2,
             "to": "balancing_group",
             "input": 1
         },
@@ -121,7 +121,7 @@
             "from": "balancing_group",
             "output": 1,
             "to": "grd",
-            "input": 1
+            "input": 2
         },
         {
             "from": "balancing_group",
@@ -129,12 +129,6 @@
             "to": "market_1",
             "input": 1
         },
-        {
-            "from": "balancing_group",
-            "output": 1,
-            "to": "market_2",
-            "input": 1
-        },
         {
             "from": "market_1",
             "output": 1,

runme.py

@@ -37,7 +37,7 @@ class SimulationScope(Enum):
 
 simulation_scope = SimulationScope.PROSUMER
 t_start = pd.Timestamp("2019-05-10 00:00:00") # start time of simulation
-global_dynamic = GlobalDynamic([3600 for i in range(20)])
+global_dynamic = GlobalDynamic([3600 for i in range(200)])
 dynamic = global_dynamic.root()
 
 input_profile_dict = {'irradiance_1': {'type': 'irradiance', 'file': 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'},
@@ -62,16 +62,11 @@ input_profile_dict = {'irradiance_1': {'type': 'irradiance', 'file': 'input_file
 
 input_profiles = Tooling.input_profile_processor.input_profile_processor.process_input_profiles(input_profile_dict, t_start, dynamic)
 
-prosumer_paths = {'SCN2_CAT1_PV11_3000_6000': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/prosumer.json',
-                  'jbr_lpe_test_3000_6000': 'input_files/models/prosumer_models/jbr_lpe_test/prosumer.json'}
-prosumer_profiles = {'SCN2_CAT1_PV11_3000_6000': {'pv_roof': {'irradiance': 'irradiance_1', 'temperature': 'temperature_1'},
-                                                  'elec_cns': {'consumption': 'demand_electric_1'},
-                                                  'therm_cns': {'consumption': 'demand_heat_1'},
-                                                  'dhw_dmd': {'consumption': 'demand_hot_water_1'}},
-                     'jbr_lpe_test_3000_6000': {'pv_roof': {'irradiance': 'irradiance_1', 'temperature': 'temperature_1'},
+prosumer_paths = {'jbr_lpe_test_3000_6000': 'input_files/models/prosumer_models/jbr_lpe_test/prosumer.json'}
+prosumer_profiles = {'jbr_lpe_test_3000_6000': {'pv_roof': {'irradiance': 'irradiance_1', 'temperature': 'temperature_1'},
                                                 'elec_cns': {'consumption': 'demand_electric_1'},
                                                 'market_1': {'elec_price': 'market_buy_price_1', 'injection_price': 'market_sell_price_1'},
-                                                'market_2': {'elec_price': 0, 'injection_price': 0.9, 'power_factors': 'power_factors_1'}}}
+                                                'market_2': {'elec_price': 0.0, 'power_factors': 'power_factors_1'}}}
 prosumer_dict = dict()
 for prosumer_name, prosumer_path in prosumer_paths.items():
     with open(prosumer_path) as f: