fixing

FZJ-IEK3-VSA · Jan 19, 2024 · d9c24fb · d9c24fb
1 parent 73d0f25
commit d9c24fb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/obsolete/household_with_gas_heater.py b/obsolete/household_with_gas_heater.py
@@ -69,8 +69,7 @@ def setup_function(
 
     # Set Occupancy
     name = "UTSPConnector"
-    url = my_config.lpg_url
-    api_key = my_config.api_key
+    data_acquisition_mode = loadprofilegenerator_utsp_connector.LpgDataAcquisitionMode.USE_UTSP
     household = my_config.household_type
     energy_intensity = my_config.energy_intensity
     result_path = my_config.result_path
@@ -91,8 +90,7 @@ def setup_function(
     # Build Occupancy
     my_occupancy_config = loadprofilegenerator_utsp_connector.UtspLpgConnectorConfig(
         name=name,
-        url=url,
-        api_key=api_key,
+        data_acquisition_mode=data_acquisition_mode,
         household=household,
         energy_intensity=energy_intensity,
         result_dir_path=result_path,

diff --git a/obsolete/household_with_gas_heater_with_controller.py b/obsolete/household_with_gas_heater_with_controller.py
@@ -60,8 +60,7 @@ def setup_function(
     seconds_per_timestep = 60
 
     # Set Occupancy
-    url = my_config.lpg_url
-    api_key = my_config.api_key
+    data_acquisition_mode = my_config.data_acquisition_mode
     household = my_config.household_type
     energy_intensity = my_config.energy_intensity
     result_path = my_config.result_path
@@ -81,8 +80,7 @@ def setup_function(
 
     # Build Occupancy
     my_occupancy_config = loadprofilegenerator_utsp_connector.UtspLpgConnectorConfig(
-        url=url,
-        api_key=api_key,
+        data_acquisition_mode=data_acquisition_mode,
         household=household,
         energy_intensity=energy_intensity,
         result_dir_path=result_path,

diff --git a/obsolete/household_with_gas_heater_with_new_controller.py b/obsolete/household_with_gas_heater_with_new_controller.py
@@ -62,8 +62,7 @@ def setup_function(
     seconds_per_timestep = 60
 
     # Set Occupancy
-    url = my_config.lpg_url
-    api_key = my_config.api_key
+    data_acquisition_mode = my_config.data_acquisition_mode
     household = my_config.household_type
     energy_intensity = my_config.energy_intensity
     result_path = my_config.result_path
@@ -83,8 +82,7 @@ def setup_function(
 
     # Build Occupancy
     my_occupancy_config = loadprofilegenerator_utsp_connector.UtspLpgConnectorConfig(
-        url=url,
-        api_key=api_key,
+        data_acquisition_mode=data_acquisition_mode,
         household=household,
         energy_intensity=energy_intensity,
         result_dir_path=result_path,

diff --git a/obsolete/household_with_heatpump_and_pv.py b/obsolete/household_with_heatpump_and_pv.py
@@ -41,11 +41,10 @@ class HouseholdPVConfig:
     building_type: str
     household_type: JsonReference
     energy_intensity: EnergyIntensityType
-    lpg_url: str
     result_path: str
     travel_route_set: JsonReference
     simulation_parameters: SimulationParameters
-    api_key: str
+    data_acquisition_mode: loadprofilegenerator_utsp_connector.LpgDataAcquisitionMode
     transportation_device_set: JsonReference
     charging_station_set: JsonReference
     pv_azimuth: float
@@ -62,8 +61,7 @@ def get_default(cls):
             building_type="blub",
             household_type=Households.CHR01_Couple_both_at_Work,
             energy_intensity=EnergyIntensityType.EnergySaving,
-            lpg_url=get_environment_variable("UTSP_URL"),
-            api_key=get_environment_variable("UTSP_API_KEY"),
+            data_acquisition_mode = loadprofilegenerator_utsp_connector.LpgDataAcquisitionMode.USE_UTSP,
             simulation_parameters=SimulationParameters.one_day_only(2022),
             result_path="mypath",
             travel_route_set=TravelRouteSets.Travel_Route_Set_for_10km_Commuting_Distance,
@@ -111,8 +109,7 @@ def setup_function(
     seconds_per_timestep = 60
 
     # Set Occupancy
-    url = my_config.lpg_url
-    api_key = my_config.api_key
+    data_acquisition_mode = my_config.data_acquisition_mode
     household = my_config.household_type
     energy_intensity = my_config.energy_intensity
     result_path = my_config.result_path
@@ -141,8 +138,7 @@ def setup_function(
     # Build occupancy
     my_occupancy_config = loadprofilegenerator_utsp_connector.UtspLpgConnectorConfig(
         name="UTSPConnector",
-        url=url,
-        api_key=api_key,
+        data_acquisition_mode=data_acquisition_mode,
         household=household,
         energy_intensity=energy_intensity,
         result_dir_path=result_path,