ie3-institute · sebastian-peter · Feb 27, 2025 · Feb 21, 2025 · Feb 27, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactored `CongestionResult`, removed `ModelResultEntity` [#1234](https://github.com/ie3-institute/PowerSystemDataModel/issues/1234)
 - Replaced `LoadProfileInput` with `LoadProfileTimeSeries` [#1228](https://github.com/ie3-institute/PowerSystemDataModel/issues/1228)
 - Enhance `CsvDataSource` [#1246](https://github.com/ie3-institute/PowerSystemDataModel/issues/1246)
+- Updated `_joint_grid` csv files from simona [#750](https://github.com/ie3-institute/PowerSystemDataModel/issues/750)
 
 ## [5.1.0] - 2024-06-24
 

diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/bm_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/bm_input.csv
@@ -1,2 +1,2 @@
-"uuid","cost_controlled","feed_in_tariff","id","market_reaction","node","operates_from","operates_until","operator","q_characteristics","type"
-a3b7576b-cac7-4350-90ff-06316cdca192,true,51.0,BM_Test,true,f5839ade-5968-4879-a824-90b5fb3552cd,,,,"cosPhiFixed:{(0.00,1.00)}",2fdca5f1-c11b-4169-a695-4c98f0e0a84a
+uuid,cost_controlled,feed_in_tariff,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,type
+a3b7576b-cac7-4350-90ff-06316cdca192,true,51.0,BM_Test,true,f5839ade-5968-4879-a824-90b5fb3552cd,,,,"cosPhiFixed:{(0.0,1.0)}",2fdca5f1-c11b-4169-a695-4c98f0e0a84a
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/bm_type_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/bm_type_input.csv
@@ -1,2 +1,2 @@
-"uuid","active_power_gradient","capex","cos_phi_rated","eta_conv","id","opex","s_rated"
+uuid,active_power_gradient,capex,cos_phi_rated,eta_conv,id,opex,s_rated
 2fdca5f1-c11b-4169-a695-4c98f0e0a84a,5.0,0.0,1.0,1.0,typ_01,0.05,190.0
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/evcs_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/evcs_input.csv
@@ -1,3 +1,3 @@
-"uuid","cos_phi_rated","id","node","operates_from","operates_until","operator","q_characteristics","charging_points","type","location_type","v2gSupport"
-06a14909-366e-4e94-a593-1016e1455b30,0.9,test_evcs_1,5f1c776c-6935-40f7-ba9e-60646e08992b,,,,"cosPhiFixed:{(0.00,1.0)}",4,ChargingStationType1,HOME,false
-104acdaa-5dc5-4197-aed2-2fddb3c4f237,0.9,test_evcs_2,ed4697fd-016c-40c2-a66b-e793878dadea,,,,"cosPhiFixed:{(0.00,1.0)}",4,ChargingStationType1,HOME,false
+uuid,charging_points,cos_phi_rated,id,location_type,node,operates_from,operates_until,operator,q_characteristics,type,v_2g_support
+06a14909-366e-4e94-a593-1016e1455b30,4,0.9,test_evcs_1,HOME,5f1c776c-6935-40f7-ba9e-60646e08992b,,,,"cosPhiFixed:{(0.0,1.0)}",ChargingStationType1,true
+104acdaa-5dc5-4197-aed2-2fddb3c4f237,4,0.9,test_evcs_2,HOME,ed4697fd-016c-40c2-a66b-e793878dadea,,,,"cosPhiFixed:{(0.0,1.0)}",ChargingStationType1,true
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/fixed_feed_in_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/fixed_feed_in_input.csv
@@ -1,2 +1,2 @@
-"uuid","cos_phi_rated","id","node","operates_from","operates_until","operator","q_characteristics","s_rated"
-9abe950d-362e-4efe-b686-500f84d8f368,0.9,test_feed_in,5f1c776c-6935-40f7-ba9e-60646e08992b,,,,"cosPhiFixed:{(0.00,0.95)}",200.0
+uuid,cos_phi_rated,id,node,operates_from,operates_until,operator,q_characteristics,s_rated
+9abe950d-362e-4efe-b686-500f84d8f368,0.9,test_feed_in,5f1c776c-6935-40f7-ba9e-60646e08992b,,,,"cosPhiFixed:{(0.0,0.95)}",200.0
diff --git a/...u/ie3/datamodel/io/source/csv/_joint_grid/its_pq_8c04e94e-76b0-4369-a55c-f5e1117fb83e.csv b/...u/ie3/datamodel/io/source/csv/_joint_grid/its_pq_8c04e94e-76b0-4369-a55c-f5e1117fb83e.csv
@@ -1,2 +1,2 @@
-"uuid","p","q","time"
-4df88950-dc48-4905-b41f-63d0757eae03,3.999998968803,0.0,2011-01-01T00:00:00Z
+"p","q","time"
+3.999998968803,0.0,2011-01-01T00:00:00Z
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/line_graphic_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/line_graphic_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/line_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/line_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/line_type_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/line_type_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/load_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/load_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/measurement_unit_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/measurement_unit_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/node_graphic_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/node_graphic_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/node_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/node_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/pv_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/pv_input.csv
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/storage_type_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/storage_type_input.csv
@@ -1,2 +1,2 @@
-"uuid","active_power_gradient","capex","cos_phi_rated","e_storage","eta","id","opex","p_max","s_rated"
-95d4c980-d9e1-4813-9f2a-b0942488a570,1.0,0.0,0.96,16.0,93.0,Typ_1,0.65,4.0,4.166666666666667
+uuid,active_power_gradient,capex,cos_phi_rated,dod,e_storage,eta,id,life_cycle,life_time,opex,p_max,s_rated
+95d4c980-d9e1-4813-9f2a-b0942488a570,1.0,0.0,0.96,8.0,16.0,93.0,Typ_1,5000,5000.0,0.65,4.0,4.166666666666667
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/time_series_mapping.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/time_series_mapping.csv
@@ -1,2 +1,2 @@
-"uuid","participant","time_series"
-e0fa5c16-1078-44d4-a23d-377ccff59c4a,4642d648-b0dd-4597-a3bd-2cc1fce74f27,8c04e94e-76b0-4369-a55c-f5e1117fb83e
+"participant","time_series"
+4642d648-b0dd-4597-a3bd-2cc1fce74f27,8c04e94e-76b0-4369-a55c-f5e1117fb83e
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/transformer_2_w_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/transformer_2_w_input.csv
@@ -1,10 +1,10 @@
-"uuid","auto_tap","id","node_a","node_b","operates_from","operates_until","operator","parallel_devices","tap_pos","type"
-1132dbf4-e8a1-44ae-8415-f42d4497aa1d,true,S3_MS-Trafo,33f29587-f63e-45b7-960b-037bda37a3cb,bb59ca46-1f2e-41c9-9723-90b306f043cd,,,,1,0,14b1798a-6903-49d6-8578-ad2a7d399341
-4ac7f0bd-2ea9-4510-9e71-0da40886d9d3,false,TRA_MS3_06-NS_NET136,39dbc5ed-d874-48a8-9128-e970436a94b4,d29f66a1-dee9-4e3e-9f41-c4bc8d375bbe,,,,1,10,f88989c7-9812-4b3e-9bc0-3df29f1e5ae1
-2cbbd48e-e6d8-40b4-80cc-010157dfbf3e,false,TRA_MS1_06-NS_NET116,b22c9299-5fb4-46a7-b566-fc17e0d51d60,31a2b9bf-e785-4475-aa44-1c34646e8c79,,,,1,10,f88989c7-9812-4b3e-9bc0-3df29f1e5ae1
-18d6ef15-962a-480d-a96a-9ba19ba4b3b3,false,TRA_MS2_06-NS_NET126_ONS,df97c0d1-379b-417a-a473-8e7fe37da99d,2d4beb13-8e6c-46de-9b1c-409c7ca7573a,,,,1,10,f88989c7-9812-4b3e-9bc0-3df29f1e5ae1
-bfa702b1-d4d4-44ff-8c3d-a79c2418b5d3,true,S1_MS-Trafo,00d03670-7833-47ee-ad52-04d18d1c64fd,f5839ade-5968-4879-a824-90b5fb3552cd,,,,1,0,14b1798a-6903-49d6-8578-ad2a7d399341
-d2a3736d-d10b-4f38-88cf-871df43e3665,true,HöS-Trafo_S1,34cd8ee0-e607-4c47-89a7-121c3e32768a,00d03670-7833-47ee-ad52-04d18d1c64fd,,,,1,0,97735722-05cc-4ca8-8a8d-c08ac3ded19a
+uuid,auto_tap,id,node_a,node_b,operates_from,operates_until,operator,parallel_devices,tap_pos,type
 aa5d6bf2-2a88-4cac-9e1f-2a5c19dd2c18,false,TRA_MS4_06-NS_NET146_ONS,fa6d5184-b205-4b1b-839f-7b21ac956c29,3da4fd3d-ac5e-409d-91fa-36516673cf57,,,,1,10,49cfe484-0183-4a23-a922-d72909dba673
-e62b6f82-9a37-49e6-af51-93008df6ea53,true,S2_MS-Trafo,dfae9806-9b44-4995-ba27-d66d8e4a43e0,1a8ba1a5-3cee-4791-b21b-f17b08526873,,,,1,0,14b1798a-6903-49d6-8578-ad2a7d399341
+bfa702b1-d4d4-44ff-8c3d-a79c2418b5d3,true,S1_MS-Trafo,00d03670-7833-47ee-ad52-04d18d1c64fd,f5839ade-5968-4879-a824-90b5fb3552cd,,,,1,0,1214c366-826e-4aeb-88f5-af8f40acaa04
+1132dbf4-e8a1-44ae-8415-f42d4497aa1d,true,S3_MS-Trafo,33f29587-f63e-45b7-960b-037bda37a3cb,bb59ca46-1f2e-41c9-9723-90b306f043cd,,,,1,0,cf7b1102-8dbd-4da2-a469-90800b3394b6
+2cbbd48e-e6d8-40b4-80cc-010157dfbf3e,false,TRA_MS1_06-NS_NET116,b22c9299-5fb4-46a7-b566-fc17e0d51d60,31a2b9bf-e785-4475-aa44-1c34646e8c79,,,,1,10,4984f493-d6e5-4201-a040-c10722b30362
+18d6ef15-962a-480d-a96a-9ba19ba4b3b3,false,TRA_MS2_06-NS_NET126_ONS,df97c0d1-379b-417a-a473-8e7fe37da99d,2d4beb13-8e6c-46de-9b1c-409c7ca7573a,,,,1,10,f88989c7-9812-4b3e-9bc0-3df29f1e5ae1
+e62b6f82-9a37-49e6-af51-93008df6ea53,true,S2_MS-Trafo,dfae9806-9b44-4995-ba27-d66d8e4a43e0,1a8ba1a5-3cee-4791-b21b-f17b08526873,,,,1,0,5901c24c-0c64-4be7-82df-21d4335abdb7
 253a0e3a-c7e0-415e-bdbd-5152aa8f9e27,true,S4_MS-Trafo,401f37f8-6f2c-4564-bc78-6736cb9cbf8d,77fc154f-f41c-4e75-bbb1-b7fca68b2f4e,,,,1,0,14b1798a-6903-49d6-8578-ad2a7d399341
+d2a3736d-d10b-4f38-88cf-871df43e3665,true,HöS-Trafo_S1,34cd8ee0-e607-4c47-89a7-121c3e32768a,00d03670-7833-47ee-ad52-04d18d1c64fd,,,,1,0,97735722-05cc-4ca8-8a8d-c08ac3ded19a
+4ac7f0bd-2ea9-4510-9e71-0da40886d9d3,false,TRA_MS3_06-NS_NET136,39dbc5ed-d874-48a8-9128-e970436a94b4,d29f66a1-dee9-4e3e-9f41-c4bc8d375bbe,,,,1,10,a7a3d9b8-da90-4670-b865-4a527df542bd
diff --git a/...test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/transformer_2_w_type_input.csv b/...test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/transformer_2_w_type_input.csv
@@ -1,5 +1,10 @@
-"uuid","b_m","d_phi","d_v","g_m","id","r_sc","s_rated","tap_max","tap_min","tap_neutr","tap_side","v_rated_a","v_rated_b","x_sc"
-14b1798a-6903-49d6-8578-ad2a7d399341,0.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759
+uuid,b_m,d_phi,d_v,g_m,id,r_sc,s_rated,tap_max,tap_min,tap_neutr,tap_side,v_rated_a,v_rated_b,x_sc
+cf7b1102-8dbd-4da2-a469-90800b3394b6,0.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759
+49cfe484-0183-4a23-a922-d72909dba673,0.0,0.0,0.5,0.0,MS-NS_2,25.0,400.0,10,-10,0,false,20.0,0.4,31.225
+4984f493-d6e5-4201-a040-c10722b30362,0.0,0.0,0.5,0.0,MS-NS_1,10.078,630.0,10,-10,0,false,20.0,0.4,23.312
 97735722-05cc-4ca8-8a8d-c08ac3ded19a,-1.27,0.0,1.5,555.5,HöS-HS_1,5.415,200000.0,5,-5,0,false,380.0,110.0,108.165
+1214c366-826e-4aeb-88f5-af8f40acaa04,0.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759
+14b1798a-6903-49d6-8578-ad2a7d399341,0.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759
 f88989c7-9812-4b3e-9bc0-3df29f1e5ae1,0.0,0.0,0.5,0.0,MS-NS_1,10.078,630.0,10,-10,0,false,20.0,0.4,23.312
-49cfe484-0183-4a23-a922-d72909dba673,0.0,0.0,0.5,0.0,MS-NS_2,25.0,400.0,10,-10,0,false,20.0,0.4,31.225
+5901c24c-0c64-4be7-82df-21d4335abdb7,0.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759
+a7a3d9b8-da90-4670-b865-4a527df542bd,0.0,0.0,0.5,0.0,MS-NS_1,10.078,630.0,10,-10,0,false,20.0,0.4,23.312
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/wec_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/wec_input.csv
@@ -1,3 +1,3 @@
-"uuid","id","market_reaction","node","operates_from","operates_until","operator","q_characteristics","type"
-f9eaec6e-ce25-42d7-8265-2f8f4679a816,HS_NET1_S4_WEA,false,401f37f8-6f2c-4564-bc78-6736cb9cbf8d,,,,"cosPhiFixed:{(0.00,0.90)}",b70374f3-1feb-45af-8011-1304a532d398
-d6ad8c73-716a-4244-9ae2-4a3735e492ab,HS_NET1_S2_WEA,false,dfae9806-9b44-4995-ba27-d66d8e4a43e0,,,,"cosPhiFixed:{(0.00,0.90)}",b70374f3-1feb-45af-8011-1304a532d398
+uuid,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,type
+d6ad8c73-716a-4244-9ae2-4a3735e492ab,HS_NET1_S2_WEA,false,dfae9806-9b44-4995-ba27-d66d8e4a43e0,,,,"cosPhiFixed:{(0.0,0.9)}",b70374f3-1feb-45af-8011-1304a532d398
+f9eaec6e-ce25-42d7-8265-2f8f4679a816,HS_NET1_S4_WEA,false,401f37f8-6f2c-4564-bc78-6736cb9cbf8d,,,,"cosPhiFixed:{(0.0,0.9)}",b70374f3-1feb-45af-8011-1304a532d398
diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/wec_type_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/wec_type_input.csv
@@ -1,2 +1,2 @@
-"uuid","capex","cos_phi_rated","cp_characteristic","eta_conv","hub_height","id","opex","rotor_area","s_rated"
-b70374f3-1feb-45af-8011-1304a532d398,0.0,0.9,"cP:{(0.0,0.0),(1.0,0.0),(2.0,0.115933516),(3.0,0.286255595),(4.0,0.39610618),(5.0,0.430345211),(6.0,0.45944023),(7.0,0.479507331),(8.0,0.492113623),(9.0,0.500417188),(10.0,0.488466547),(11.0,0.420415054),(12.0,0.354241299),(13.0,0.288470591),(14.0,0.230965702),(15.0,0.18778367),(16.0,0.154728976),(17.0,0.128998552),(18.0,0.108671106),(19.0,0.09239975),(20.0,0.079221236),(21.0,0.068434282),(22.0,0.059520087),(23.0,0.052089249),(24.0,0.045845623),(25.0,0.040561273),(26.0,0.036058824),(27.0,0.032198846),(28.0,0.016618264),(29.0,0.010330976),(30.0,0.006091519),(31.0,0.003331177),(32.0,0.001641637),(33.0,0.000705423),(34.0,0.000196644),(35.0,0.0),(36.0,0.0),(37.0,0.0),(38.0,0.0),(39.0,0.0),(40.0,0.0),(41.0,0.0),(42.0,0.0),(43.0,0.0),(44.0,0.0),(45.0,0.0),(46.0,0.0),(47.0,0.0),(48.0,0.0),(49.0,0.0),(50.0,0.0)}",100.0,98.0,EnerconE-82,0.0,5281.02,2222.2
+uuid,capex,cos_phi_rated,cp_characteristic,eta_conv,hub_height,id,opex,rotor_area,s_rated
+b70374f3-1feb-45af-8011-1304a532d398,0.0,0.9,"cP:{(0.0,0.0),(1.0,0.0),(2.0,0.115933516),(3.0,0.286255595),(4.0,0.39610618),(5.0,0.430345211),(6.0,0.45944023),(7.0,0.479507331),(8.0,0.492113623),(9.0,0.500417188),(10.0,0.488466547),(11.0,0.420415054),(12.0,0.354241299),(13.0,0.288470591),(14.0,0.230965702),(15.0,0.18778367),(16.0,0.154728976),(17.0,0.128998552),(18.0,0.108671106),(19.0,0.09239975),(20.0,0.079221236),(21.0,0.068434282),(22.0,0.059520087),(23.0,0.052089249),(24.0,0.045845623),(25.0,0.040561273),(26.0,0.036058824),(27.0,0.032198846),(28.0,0.016618264),(29.0,0.010330976),(30.0,0.006091519),(31.0,0.003331177),(32.0,0.001641637),(33.0,7.05423E-4),(34.0,1.96644E-4),(35.0,0.0),(36.0,0.0),(37.0,0.0),(38.0,0.0),(39.0,0.0),(40.0,0.0),(41.0,0.0),(42.0,0.0),(43.0,0.0),(44.0,0.0),(45.0,0.0),(46.0,0.0),(47.0,0.0),(48.0,0.0),(49.0,0.0),(50.0,0.0)}",100.0,98.0,EnerconE-82,0.0,5281.02,2222.2