From 0a3846e0dc120954b8edb8a46ac0b0e682c0206c Mon Sep 17 00:00:00 2001 From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de> Date: Tue, 10 Jan 2023 11:58:45 +0100 Subject: [PATCH] Removed data_path.csv --- input_files/convert_input_files_TODO.py | 38 ------------------- ...ert_input_files_input_profile_processor.py | 16 ++++++++ .../district_models/example_CA/data_path.csv | 6 --- .../example_community/data_path.csv | 2 - .../district_models/jbr_test_ca/data_path.csv | 6 --- .../jbr_test_comm/data_path.csv | 2 - .../prosumer_models/SCN0_CAT1/data_path.csv | 6 --- .../SCN2_CAT1_PV11/data_path.csv | 6 --- .../SCN2_CAT1_PV12_BA/data_path.csv | 6 --- .../SCN2_CAT1_PV13_BA_HP/data_path.csv | 6 --- .../SCN2_CAT1_PV14_HP/data_path.csv | 6 --- .../SCN2_CAT1_PV31/data_path.csv | 6 --- .../SCN2_CAT1_PV32_BA/data_path.csv | 6 --- .../SCN2_CAT1_PV33_BA_HP/data_path.csv | 6 --- .../SCN2_CAT1_PV34_HP/data_path.csv | 6 --- .../prosumer_models/SCN3_CAT1/data_path.csv | 7 ---- .../SCN3_CAT1_PV11/data_path.csv | 7 ---- .../SCN3_CAT1_PV12_BA/data_path.csv | 7 ---- .../SCN3_CAT1_PV13_BA_HP/data_path.csv | 7 ---- .../SCN3_CAT1_PV14_HP/data_path.csv | 7 ---- .../SCN3_CAT1_PV31/data_path.csv | 7 ---- .../SCN3_CAT1_PV32_BA/data_path.csv | 7 ---- .../SCN3_CAT1_PV33_BA_HP/data_path.csv | 7 ---- .../SCN3_CAT1_PV34_HP/data_path.csv | 7 ---- .../prosumer_models/jbr_test/data_path.csv | 6 --- .../prosumer_models/mfh_quartal/data_path.csv | 6 --- .../office_pv_heatpump/data_path.csv | 6 --- 27 files changed, 16 insertions(+), 189 deletions(-) delete mode 100644 input_files/convert_input_files_TODO.py create mode 100644 input_files/convert_input_files_input_profile_processor.py delete mode 100644 input_files/models/district_models/example_CA/data_path.csv delete mode 100644 input_files/models/district_models/example_community/data_path.csv delete mode 100644 input_files/models/district_models/jbr_test_ca/data_path.csv delete mode 100644 input_files/models/district_models/jbr_test_comm/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN0_CAT1/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV11/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV31/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV11/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV31/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/data_path.csv delete mode 100644 input_files/models/prosumer_models/jbr_test/data_path.csv delete mode 100644 input_files/models/prosumer_models/mfh_quartal/data_path.csv delete mode 100644 input_files/models/prosumer_models/office_pv_heatpump/data_path.csv diff --git a/input_files/convert_input_files_TODO.py b/input_files/convert_input_files_TODO.py deleted file mode 100644 index 210ef1876a..0000000000 --- a/input_files/convert_input_files_TODO.py +++ /dev/null @@ -1,38 +0,0 @@ -""" -This script inspects the input files and modifies them such that they adhere to the new input file specification used by the framework after merge of merge request !TODO TODO. -This script assumes that the file containing the paths to the files containing the input profiles is called "data_path.csv". -DO NOT APPLY THIS SCRIPT TO A FILE TWICE. IT CAN BREAK. -""" - -import os.path -import pandas as pd - -changed_files = [] -invalid_files = [] -for dirpath, dirnames, filenames in os.walk(".\\input_files"): - for filename in filenames: - if filename == "data_path.csv": - try: - print(f"Inspecting file {os.path.join(dirpath, filename)}") - df = pd.read_csv(os.path.join(dirpath, filename)) - file_changed = False - demand_heat_rows = [] - for i in df.index: - if df["type"][i] == "demand_heat": - demand_heat_rows.append((i, df.loc[i,].copy())) - if len(demand_heat_rows) != 0: - file_changed = True - for (i, row) in demand_heat_rows: - df.loc[i + 0.5] = row - df["type"][i + 0.5] = "demand_hot_water" - df.sort_index(inplace = True) - df.reset_index(drop = True, inplace = True) - if file_changed: - changed_files.append(os.path.join(dirpath, filename)) - df.to_csv(os.path.join(dirpath, filename), index = False) - except KeyError: - invalid_files.append(os.path.join(dirpath, filename)) -for file in changed_files: - print(f"Modified file {file}!") -for file in invalid_files: - print(f"File {file} breaks some part of the input file specification that during the implementation!") diff --git a/input_files/convert_input_files_input_profile_processor.py b/input_files/convert_input_files_input_profile_processor.py new file mode 100644 index 0000000000..16873c35a2 --- /dev/null +++ b/input_files/convert_input_files_input_profile_processor.py @@ -0,0 +1,16 @@ +""" +This script inspects the input files and modifies them such that they adhere to the new input file specification used by the framework after merge of merge request !13 Input Profile Processor. +This script assumes that the file containing the paths to the files containing the input profiles is called "data_path.csv". +""" + +import os.path + +changed_files = [] +for dirpath, dirnames, filenames in os.walk(".\\input_files"): + for filename in filenames: + if filename == "data_path.csv": + print(f"Inspecting file {os.path.join(dirpath, filename)}") + changed_files.append(os.path.join(dirpath, filename)) + os.remove(os.path.join(dirpath, filename)) +for file in changed_files: + print(f"Modified file {file}!") diff --git a/input_files/models/district_models/example_CA/data_path.csv b/input_files/models/district_models/example_CA/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/district_models/example_CA/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/district_models/example_community/data_path.csv b/input_files/models/district_models/example_community/data_path.csv deleted file mode 100644 index e0a77e063a..0000000000 --- a/input_files/models/district_models/example_community/data_path.csv +++ /dev/null @@ -1,2 +0,0 @@ -type,path,unit -elec_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/district_models/jbr_test_ca/data_path.csv b/input_files/models/district_models/jbr_test_ca/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/district_models/jbr_test_ca/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/district_models/jbr_test_comm/data_path.csv b/input_files/models/district_models/jbr_test_comm/data_path.csv deleted file mode 100644 index e0a77e063a..0000000000 --- a/input_files/models/district_models/jbr_test_comm/data_path.csv +++ /dev/null @@ -1,2 +0,0 @@ -type,path,unit -elec_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN0_CAT1/data_path.csv b/input_files/models/prosumer_models/SCN0_CAT1/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN0_CAT1/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/data_path.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/data_path.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/data_path.csv deleted file mode 100644 index 1d4e684da9..0000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/data_path.csv +++ /dev/null @@ -1,7 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -day_ahead_price,input_files/data/prices/day-ahead/hourly_price.csv,h diff --git a/input_files/models/prosumer_models/jbr_test/data_path.csv b/input_files/models/prosumer_models/jbr_test/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/jbr_test/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/mfh_quartal/data_path.csv b/input_files/models/prosumer_models/mfh_quartal/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/mfh_quartal/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h diff --git a/input_files/models/prosumer_models/office_pv_heatpump/data_path.csv b/input_files/models/prosumer_models/office_pv_heatpump/data_path.csv deleted file mode 100644 index 1602f00576..0000000000 --- a/input_files/models/prosumer_models/office_pv_heatpump/data_path.csv +++ /dev/null @@ -1,6 +0,0 @@ -type,path,unit -demand_electric,generate,h -demand_heat,generate,h -demand_hot_water,generate,h -irradiance,input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv,min -temperature,input_files/data/temperature/temperature.csv,h -- GitLab