Remove unnecessary icon ground temperature t_2m and tg.

Author: pierrepetersmeier

src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactoryTest.groovy

@@ -82,10 +82,8 @@ class IconTimeBasedWeatherValueFactoryTest extends Specification {
       "aswdifdS"    : "1.8088226191406245",
       "aswdifuS"    : "0.5713421484374998",
       "aswdirS"     : "2.317613203124999",
-      "t2m"         : "289.1179319051744",
-      "tg"          : "288.4101691197649",
-      "tg_1":"288.4101691197649",
-      "tg_2":"288.4101691197649",
+      "tg_1"         : "289.1179319051744",
+      "tg_2"          : "288.4101691197649",
       "u10m"        : "0.3021732864307963",
       "u131m"       : "2.6058700426057797",
       "u20m"        : "0.32384365019387784",

src/test/resources/edu/ie3/datamodel/io/source/csv/_weather/icon/its_weather_513606bc-539e-445b-9675-2f98be3d9231.csv

@@ -1,6 +1,6 @@
-"time","alb_rad","asob_s","aswdifd_s","aswdifu_s","aswdir_s","t_2m","t_g","tg_1","tg_2","u_10m","u_131m","u_20m","u_216m","u_65m","v_10m","v_131m","v_20m","v_216m","v_65m","w_131m","w_20m","w_216m","w_65m","z0","coordinate_id","p_131m","p_20m","p_65m","sobs_rad","t_131m"
-"2019-08-01T15:00:00Z",13.015240669,503.46974264373205,228.021339757131,80.8246124780934,356.2648859375,297.6241992659816,300.6632065668998,300.6632065668998,289.5,2.594603775363224,3.7658971156831287,2.5812495613105044,3.941521213236469,3.4740205817325034,-0.024078646721241395,-0.029760831916596106,-0.052967885304510534,-0.009698125518755707,-0.04996610799324721,0.004091443774095653,0.0015809058504647026,0.005954484657501378,0.002666343696204668,0.9553221665631989,67775,,,,,
-"2019-08-01T15:00:00Z",13.013334274000002,498.219742300774,245.24079037841295,80.0782271098217,333.0547140625,295.515335568404,297.43684351873816,300.6632065668998,289.2,2.6907481330116054,4.001601219938975,2.6888332994845783,4.140469437423411,3.714032263672762,1.2097386659833593,1.8148233176685413,1.1963736417917374,1.8944592514336933,1.667063608988315,-0.010735134459808796,-0.006350491263316599,-0.012234044440804974,-0.009044908476315713,0.955336762972383,67776,,,,,
-"2019-08-01T16:00:00Z",13.015240669,348.84439309613776,200.46049098038043,56.00436431107297,204.38963365625,297.3200023473353,298.8447737622156,300.6632065668998,289.5,2.557259341952788,4.0165196739267675,2.5543417132442308,4.204610497390883,3.6709121158156393,-0.38463576259530396,-0.5748064219197632,-0.4001297004267148,-0.574231301551345,-0.5484601012731134,0.008420781588303635,0.004028919955548831,0.0103738560877878,0.0064212084500956355,0.9553236526118866,67775,,,,,
-"2019-08-01T16:00:00Z",13.013334274000002,287.1635211775765,241.641483540946,46.18262289142059,91.70939132296976,293.455111314491,294.9876832274387,300.6632065668998,289.2,2.2429257128168105,3.288655459909278,2.2469304566362895,3.456196177795884,3.063505298416552,0.7052856075394569,1.0173658432825086,0.6940309956521304,1.0831645239762804,0.9402700184046242,-0.009609051331189665,-0.0037207462780739073,-0.01264290152206423,-0.006439463432156433,0.9553365723370035,67776,,,,,
-"2019-08-01T17:00:00Z",13.015240669,306.57139450950467,180.73429610400223,49.19860365549343,175.039569078125,296.8287403584074,297.6596017457568,300.6632065668998,289.5,2.2517126616190337,3.650669504895637,2.2438962003705027,3.7980736030429303,3.339152911211416,-0.6950893529619305,-1.1085323450143223,-0.7122478653505989,-1.1293057574368208,-1.0352309009257914,0.012464921655326946,0.0059655751175761145,0.015265360298047703,0.009632113129412919,0.9553227603369525,67775,,,,,
+"time","alb_rad","asob_s","aswdifd_s","aswdifu_s","aswdir_s","tg_1","tg_2","u_10m","u_131m","u_20m","u_216m","u_65m","v_10m","v_131m","v_20m","v_216m","v_65m","w_131m","w_20m","w_216m","w_65m","z0","coordinate_id","p_131m","p_20m","p_65m","sobs_rad","t_131m"
+"2019-08-01T15:00:00Z",13.015240669,503.46974264373205,228.021339757131,80.8246124780934,356.2648859375,297.6241992659816,289.5,2.594603775363224,3.7658971156831287,2.5812495613105044,3.941521213236469,3.4740205817325034,-0.024078646721241395,-0.029760831916596106,-0.052967885304510534,-0.009698125518755707,-0.04996610799324721,0.004091443774095653,0.0015809058504647026,0.005954484657501378,0.002666343696204668,0.9553221665631989,67775,,,,,
+"2019-08-01T15:00:00Z",13.013334274000002,498.219742300774,245.24079037841295,80.0782271098217,333.0547140625,295.515335568404,289.2,2.6907481330116054,4.001601219938975,2.6888332994845783,4.140469437423411,3.714032263672762,1.2097386659833593,1.8148233176685413,1.1963736417917374,1.8944592514336933,1.667063608988315,-0.010735134459808796,-0.006350491263316599,-0.012234044440804974,-0.009044908476315713,0.955336762972383,67776,,,,,
+"2019-08-01T16:00:00Z",13.015240669,348.84439309613776,200.46049098038043,56.00436431107297,204.38963365625,297.3200023473353,289.5,2.557259341952788,4.0165196739267675,2.5543417132442308,4.204610497390883,3.6709121158156393,-0.38463576259530396,-0.5748064219197632,-0.4001297004267148,-0.574231301551345,-0.5484601012731134,0.008420781588303635,0.004028919955548831,0.0103738560877878,0.0064212084500956355,0.9553236526118866,67775,,,,,
+"2019-08-01T16:00:00Z",13.013334274000002,287.1635211775765,241.641483540946,46.18262289142059,91.70939132296976,293.455111314491,289.2,2.2429257128168105,3.288655459909278,2.2469304566362895,3.456196177795884,3.063505298416552,0.7052856075394569,1.0173658432825086,0.6940309956521304,1.0831645239762804,0.9402700184046242,-0.009609051331189665,-0.0037207462780739073,-0.01264290152206423,-0.006439463432156433,0.9553365723370035,67776,,,,,
+"2019-08-01T17:00:00Z",13.015240669,306.57139450950467,180.73429610400223,49.19860365549343,175.039569078125,296.8287403584074,289.5,2.2517126616190337,3.650669504895637,2.2438962003705027,3.7980736030429303,3.339152911211416,-0.6950893529619305,-1.1085323450143223,-0.7122478653505989,-1.1293057574368208,-1.0352309009257914,0.012464921655326946,0.0059655751175761145,0.015265360298047703,0.009632113129412919,0.9553227603369525,67775,,,,,

src/test/resources/edu/ie3/datamodel/io/source/influxdb/_weather/icon/weather.txt

@@ -5,8 +5,8 @@ CREATE DATABASE test_weather
 # CONTEXT-DATABASE: test_weather
 
 
-weather,coordinate_id=67775 alb_rad=13.0152406690000007,asob_s=503.46974264373199,aswdifd_s=228.021339757130988,aswdifu_s=80.8246124780933997,aswdir_s=356.264885937500026,t_2m=297.624199265981986,t_g=300.663206566899987,tg_1=300.663206566899987,tg_2=300.663206566899987,u_10m=2.59460377536322007,u_131m=3.76589711568313001,u_20m=2.58124956131049998,u_216m=3.94152121323647009,u_65m=3.47402058173249983,v_10m=-0.0240786467212413986,v_131m=-0.0297608319165960991,v_20m=-0.0529678853045104994,v_216m=-0.00969812551875571041,v_65m=-0.0499661079932472024,w_131m=0.00409144377409564972,w_20m=0.00158090585046470004,w_216m=0.00595448465750138007,w_65m=0.00266634369620467014,z_0=0.955322166563199016,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564671600000
-weather,coordinate_id=67775 alb_rad=13.0152406690000007,asob_s=348.844393096137992,aswdifd_s=200.460490980380001,aswdifu_s=56.0043643110729974,aswdir_s=204.389633656249998,t_2m=297.320002347334992,t_g=298.844773762215993,tg_1=300.663206566899987,tg_2=300.663206566899987,u_10m=2.55725934195278981,u_131m=4.01651967392677012,u_20m=2.55434171324422987,u_216m=4.20461049739088022,u_65m=3.67091211581564014,v_10m=-0.38463576259530402,v_131m=-0.574806421919763055,v_20m=-0.400129700426714974,v_216m=-0.574231301551345052,v_65m=-0.548460101273112954,w_131m=0.00842078158830364062,w_20m=0.0040289199555488299,w_216m=0.0103738560877878003,w_65m=0.00642120845009563988,z_0=0.955323652611887009,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564675200000
-weather,coordinate_id=67775 alb_rad=13.0152406690000007,asob_s=306.571394509505012,aswdifd_s=180.734296104001999,aswdifu_s=49.1986036554934003,aswdir_s=175.039569078124998,t_2m=296.828740358407003,t_g=297.659601745757016,tg_1=300.663206566899987,tg_2=300.663206566899987,u_10m=2.25171266161903016,u_131m=3.65066950489564013,u_20m=2.24389620037050008,u_216m=3.79807360304292985,u_65m=3.33915291121141999,v_10m=-0.695089352961929974,v_131m=-1.10853234501432008,v_20m=-0.71224786535059903,v_216m=-1.12930575743681993,v_65m=-1.03523090092579007,w_131m=0.0124649216553269007,w_20m=0.00596557511757611018,w_216m=0.0152653602980476998,w_65m=0.00963211312941292079,z_0=0.955322760336951959,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564678800000
-weather,coordinate_id=67776 alb_rad=13.013334274,asob_s=498.219742300773987,aswdifd_s=245.24079037841301,aswdifu_s=80.0782271098216967,aswdir_s=333.054714062500011,t_2m=295.515335568403998,t_g=297.436843518737987,tg_1=300.663206566899987,tg_2=300.663206566899987,u_10m=2.69074813301160987,u_131m=4.00160121993897988,u_20m=2.68883329948458005,u_216m=4.14046943742340989,u_65m=3.71403226367276007,v_10m=1.20973866598336,v_131m=1.81482331766853999,v_20m=1.19637364179174011,v_216m=1.89445925143368998,v_65m=1.66706360898831996,w_131m=-0.0107351344598088008,w_20m=-0.00635049126331660007,w_216m=-0.0122340444408049996,w_65m=-0.00904490847631570991,z_0=0.955336762972383013,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564671600000
-weather,coordinate_id=67776 alb_rad=13.013334274,asob_s=287.163521177577024,aswdifd_s=241.641483540946012,aswdifu_s=46.1826228914205998,aswdir_s=91.7093913229697932,t_2m=293.455111314490978,t_g=294.987683227438993,tg_1=300.663206566899987,tg_2=300.663206566899987,u_10m=2.24292571281681008,u_131m=3.28865545990927988,u_20m=2.24693045663628999,u_216m=3.45619617779588006,u_65m=3.06350529841654984,v_10m=0.705285607539457016,v_131m=1.0173658432825099,v_20m=0.694030995652130001,v_216m=1.08316452397627994,v_65m=0.940270018404623986,w_131m=-0.00960905133118966984,w_20m=-0.00372074627807390985,w_216m=-0.0126429015220642007,w_65m=-0.00643946343215642987,z_0=0.955336572337003975,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564675200000
+weather,coordinate_id=67775 alb_rad=13.0152406690000007,asob_s=503.46974264373199,aswdifd_s=228.021339757130988,aswdifu_s=80.8246124780933997,aswdir_s=356.264885937500026,tg_1=297.624199265981986,tg_2=300.663206566899987,u_10m=2.59460377536322007,u_131m=3.76589711568313001,u_20m=2.58124956131049998,u_216m=3.94152121323647009,u_65m=3.47402058173249983,v_10m=-0.0240786467212413986,v_131m=-0.0297608319165960991,v_20m=-0.0529678853045104994,v_216m=-0.00969812551875571041,v_65m=-0.0499661079932472024,w_131m=0.00409144377409564972,w_20m=0.00158090585046470004,w_216m=0.00595448465750138007,w_65m=0.00266634369620467014,z_0=0.955322166563199016,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564671600000
+weather,coordinate_id=67775 alb_rad=13.0152406690000007,asob_s=348.844393096137992,aswdifd_s=200.460490980380001,aswdifu_s=56.0043643110729974,aswdir_s=204.389633656249998,tg_1=297.320002347334992,tg_2=298.844773762215993,u_10m=2.55725934195278981,u_131m=4.01651967392677012,u_20m=2.55434171324422987,u_216m=4.20461049739088022,u_65m=3.67091211581564014,v_10m=-0.38463576259530402,v_131m=-0.574806421919763055,v_20m=-0.400129700426714974,v_216m=-0.574231301551345052,v_65m=-0.548460101273112954,w_131m=0.00842078158830364062,w_20m=0.0040289199555488299,w_216m=0.0103738560877878003,w_65m=0.00642120845009563988,z_0=0.955323652611887009,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564675200000
+weather,coordinate_id=67775 alb_rad=13.0152406690000007,asob_s=306.571394509505012,aswdifd_s=180.734296104001999,aswdifu_s=49.1986036554934003,aswdir_s=175.039569078124998,tg_1=296.828740358407003,tg_2=297.659601745757016,u_10m=2.25171266161903016,u_131m=3.65066950489564013,u_20m=2.24389620037050008,u_216m=3.79807360304292985,u_65m=3.33915291121141999,v_10m=-0.695089352961929974,v_131m=-1.10853234501432008,v_20m=-0.71224786535059903,v_216m=-1.12930575743681993,v_65m=-1.03523090092579007,w_131m=0.0124649216553269007,w_20m=0.00596557511757611018,w_216m=0.0152653602980476998,w_65m=0.00963211312941292079,z_0=0.955322760336951959,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564678800000
+weather,coordinate_id=67776 alb_rad=13.013334274,asob_s=498.219742300773987,aswdifd_s=245.24079037841301,aswdifu_s=80.0782271098216967,aswdir_s=333.054714062500011,tg_1=295.515335568403998,tg_2=297.436843518737987,u_10m=2.69074813301160987,u_131m=4.00160121993897988,u_20m=2.68883329948458005,u_216m=4.14046943742340989,u_65m=3.71403226367276007,v_10m=1.20973866598336,v_131m=1.81482331766853999,v_20m=1.19637364179174011,v_216m=1.89445925143368998,v_65m=1.66706360898831996,w_131m=-0.0107351344598088008,w_20m=-0.00635049126331660007,w_216m=-0.0122340444408049996,w_65m=-0.00904490847631570991,z_0=0.955336762972383013,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564671600000
+weather,coordinate_id=67776 alb_rad=13.013334274,asob_s=287.163521177577024,aswdifd_s=241.641483540946012,aswdifu_s=46.1826228914205998,aswdir_s=91.7093913229697932,tg_1=293.455111314490978,tg_2=294.987683227438993,u_10m=2.24292571281681008,u_131m=3.28865545990927988,u_20m=2.24693045663628999,u_216m=3.45619617779588006,u_65m=3.06350529841654984,v_10m=0.705285607539457016,v_131m=1.0173658432825099,v_20m=0.694030995652130001,v_216m=1.08316452397627994,v_65m=0.940270018404623986,w_131m=-0.00960905133118966984,w_20m=-0.00372074627807390985,w_216m=-0.0126429015220642007,w_65m=-0.00643946343215642987,z_0=0.955336572337003975,p_131m=42.0,p_20m=42.0,p_65m=42.0,sobsrad=42.0,t_131m=42.0 1564675200000

src/test/resources/edu/ie3/datamodel/io/source/sql/_weather/icon/weather.sql

@@ -48,10 +48,10 @@ CREATE INDEX weather_coordinate_time_idx
     TABLESPACE pg_default;
 
 INSERT INTO
-    public.weather (time, alb_rad, asob_s, aswdifd_s, aswdifu_s, aswdir_s, t_2m, t_g, tg_1, tg_2, u_10m, u_131m, u_20m, u_216m, u_65m, v_10m, v_131m, v_20m, v_216m, v_65m, w_131m, w_20m, w_216m, w_65m, z0, coordinate_id, p_131m, p_20m, p_65m, sobs_rad, t_131m)
+    public.weather (time, alb_rad, asob_s, aswdifd_s, aswdifu_s, aswdir_s, tg_1, tg_2, u_10m, u_131m, u_20m, u_216m, u_65m, v_10m, v_131m, v_20m, v_216m, v_65m, w_131m, w_20m, w_216m, w_65m, z0, coordinate_id, p_131m, p_20m, p_65m, sobs_rad, t_131m)
 VALUES
-('2019-08-01 15:00:00+0', 13.015240669, 503.469742643732, 228.021339757131, 80.8246124780934, 356.2648859375, 297.624199265982, 300.6632065669, 278.019012451172, 278.019012451172, 2.59460377536322, 3.76589711568313, 2.5812495613105, 3.94152121323647, 3.4740205817325, -0.0240786467212414, -0.0297608319165961, -0.0529678853045105, -0.00969812551875571, -0.0499661079932472, 0.00409144377409565, 0.0015809058504647, 0.00595448465750138, 0.00266634369620467, 0.955322166563199, 67775, NULL, NULL, NULL, NULL, NULL),
-('2019-08-01 16:00:00+0', 13.015240669, 348.844393096138, 200.46049098038, 56.004364311073, 204.38963365625, 297.320002347335, 298.844773762216, 278.019012451172, 278.019012451172, 2.55725934195279, 4.01651967392677, 2.55434171324423, 4.20461049739088, 3.67091211581564, -0.384635762595304, -0.574806421919763, -0.400129700426715, -0.574231301551345, -0.548460101273113, 0.00842078158830364, 0.00402891995554883, 0.0103738560877878, 0.00642120845009564, 0.955323652611887, 67775, NULL, NULL, NULL, NULL, NULL),
-('2019-08-01 17:00:00+0', 13.015240669, 306.571394509505, 180.734296104002, 49.1986036554934, 175.039569078125, 296.828740358407, 297.659601745757, 278.019012451172, 278.019012451172, 2.25171266161903, 3.65066950489564, 2.2438962003705, 3.79807360304293, 3.33915291121142, -0.69508935296193, -1.10853234501432, -0.712247865350599, -1.12930575743682, -1.03523090092579, 0.0124649216553269, 0.00596557511757611, 0.0152653602980477, 0.00963211312941292, 0.955322760336952, 67775, NULL, NULL, NULL, NULL, NULL),
-('2019-08-01 15:00:00+0', 13.013334274, 498.219742300774, 245.240790378413, 80.0782271098217, 333.0547140625, 295.515335568404, 297.436843518738, 278.019012451172, 278.019012451172, 2.69074813301161, 4.00160121993898, 2.68883329948458, 4.14046943742341, 3.71403226367276, 1.20973866598336, 1.81482331766854, 1.19637364179174, 1.89445925143369, 1.66706360898832, -0.0107351344598088, -0.0063504912633166, -0.012234044440805, -0.00904490847631571, 0.955336762972383, 67776, NULL, NULL, NULL, NULL, NULL),
-('2019-08-01 16:00:00+0', 13.013334274, 287.163521177577, 241.641483540946, 46.1826228914206, 91.7093913229698, 293.455111314491, 294.987683227439, 278.019012451172, 278.019012451172, 2.24292571281681, 3.28865545990928, 2.24693045663629, 3.45619617779588, 3.06350529841655, 0.705285607539457, 1.01736584328251, 0.69403099565213, 1.08316452397628, 0.940270018404624, -0.00960905133118967, -0.00372074627807391, -0.0126429015220642, -0.00643946343215643, 0.955336572337004, 67776, NULL, NULL, NULL, NULL, NULL);
+('2019-08-01 15:00:00+0', 13.015240669, 503.469742643732, 228.021339757131, 80.8246124780934, 356.2648859375, 297.624199265982, 300.6632065669, 2.59460377536322, 3.76589711568313, 2.5812495613105, 3.94152121323647, 3.4740205817325, -0.0240786467212414, -0.0297608319165961, -0.0529678853045105, -0.00969812551875571, -0.0499661079932472, 0.00409144377409565, 0.0015809058504647, 0.00595448465750138, 0.00266634369620467, 0.955322166563199, 67775, NULL, NULL, NULL, NULL, NULL),
+('2019-08-01 16:00:00+0', 13.015240669, 348.844393096138, 200.46049098038, 56.004364311073, 204.38963365625, 297.320002347335, 298.844773762216,2.55725934195279, 4.01651967392677, 2.55434171324423, 4.20461049739088, 3.67091211581564, -0.384635762595304, -0.574806421919763, -0.400129700426715, -0.574231301551345, -0.548460101273113, 0.00842078158830364, 0.00402891995554883, 0.0103738560877878, 0.00642120845009564, 0.955323652611887, 67775, NULL, NULL, NULL, NULL, NULL),
+('2019-08-01 17:00:00+0', 13.015240669, 306.571394509505, 180.734296104002, 49.1986036554934, 175.039569078125, 296.828740358407, 297.659601745757,2.25171266161903, 3.65066950489564, 2.2438962003705, 3.79807360304293, 3.33915291121142, -0.69508935296193, -1.10853234501432, -0.712247865350599, -1.12930575743682, -1.03523090092579, 0.0124649216553269, 0.00596557511757611, 0.0152653602980477, 0.00963211312941292, 0.955322760336952, 67775, NULL, NULL, NULL, NULL, NULL),
+('2019-08-01 15:00:00+0', 13.013334274, 498.219742300774, 245.240790378413, 80.0782271098217, 333.0547140625, 295.515335568404, 297.436843518738,2.69074813301161, 4.00160121993898, 2.68883329948458, 4.14046943742341, 3.71403226367276, 1.20973866598336, 1.81482331766854, 1.19637364179174, 1.89445925143369, 1.66706360898832, -0.0107351344598088, -0.0063504912633166, -0.012234044440805, -0.00904490847631571, 0.955336762972383, 67776, NULL, NULL, NULL, NULL, NULL),
+('2019-08-01 16:00:00+0', 13.013334274, 287.163521177577, 241.641483540946, 46.1826228914206, 91.7093913229698, 293.455111314491, 294.987683227439,2.24292571281681, 3.28865545990928, 2.24693045663629, 3.45619617779588, 3.06350529841655, 0.705285607539457, 1.01736584328251, 0.69403099565213, 1.08316452397628, 0.940270018404624, -0.00960905133118967, -0.00372074627807391, -0.0126429015220642, -0.00643946343215643, 0.955336572337004, 67776, NULL, NULL, NULL, NULL, NULL);