add ground temperature 1m as option to weather data #1351

pierrepetersmeier · 2025-06-26T09:27:31Z

Resolves #1343

…eather-data

…to-weather-data

danielfeismann

Didn't get to all of it. Just a first view thoughts that imho needs to be adapted. As well it might get easier since it would reduce the amount of changes.

src/test/groovy/edu/ie3/test/helper/WeatherSourceTestHelper.groovy

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

...t/groovy/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactoryTest.groovy

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy

…to-weather-data

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

…eatherValueFactory and IconTimeBasedWeatherValueFactory

…to-weather-data

danielfeismann

This looks already quite ok, but I guess some parts can be improved.

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/models/value/GroundTemperatureValue.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

…to-weather-data

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

…to-weather-data

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

…to-weather-data

danielfeismann · 2025-11-26T09:22:20Z

@pierrepetersmeier it looks to me that there are some points still open.
please check my comments above on
src/test/resources/edu/ie3/datamodel/io/source/influxdb/_weather/icon/weather.txt
src/test/groovy/edu/ie3/test/common/CosmoWeatherTestData.groovy
src/test/groovy/edu/ie3/test/common/IconWeatherTestData.groovy

…to-weather-data

pierrepetersmeier · 2025-12-03T15:27:21Z

@danielfeismann could you please take a look? I don't understand why the four tests are still failing.deprecated

…to-weather-data # Conflicts: # src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy

danielfeismann · 2025-12-04T10:20:51Z

@pierrepetersmeier I don't see any failing tests in the pipeline. Maybe you can give me some details where and what is failing.

pierrepetersmeier · 2025-12-04T10:30:28Z

It's outdated. I fixed it.

danielfeismann

Thanks for including my points. Guess we are almost there, just some minor things. Could you please also check for SonarQube issues?

.../groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy

src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceCosmoIT.groovy

src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceIconIT.groovy

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceCosmoTest.groovy

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

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

…to-weather-data

pierrepetersmeier · 2025-12-05T19:46:34Z

"Note: In CsvWeatherSourceIconTest, the windvelocity comparison fails using Objects.equals. Appending a "5" to the decimal value did not resolve the issue. The other 3 tests have the same problem. " It's Outdated.

…ation tests

danielfeismann

Alright I found some more improvements, sorry for another round :)

Please note, I also found some minor improvements I directly pushed, hope this is fine for you.

src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceCosmoIT.groovy

src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceIconIT.groovy

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceCosmoTest.groovy

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy

src/test/groovy/edu/ie3/datamodel/io/source/influxdb/InfluxDbWeatherSourceCosmoIT.groovy

src/test/groovy/edu/ie3/datamodel/io/source/influxdb/InfluxDbWeatherSourceIconIT.groovy

src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlWeatherSourceCosmoIT.groovy

src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlWeatherSourceIconIT.groovy

…e formatting

danielfeismann · 2025-12-09T16:29:07Z

@pierrepetersmeier: Please have a look to WeatherSourceTestHelper where equalsIgnoreUUID is defined.

danielfeismann

Please also see my changes

danielfeismann · 2025-12-09T18:18:29Z

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceCosmoTest.groovy

+      "groundTemperaturLevel1" : "8.0",
+      "groundTemperatureLevel2": "9.5"


This is not needed imho.

danielfeismann · 2025-12-09T18:23:12Z

...3/datamodel/io/source/csv/_weather/icon/its_weather_513606bc-539e-445b-9675-2f98be3d9231.csv

-2019-08-01T16:00:00Z,13.013334274000002,287.1635211775765,241.641483540946,46.18262289142059,91.70939132296976,293.455111314491,294.9876832274387,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,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","t_2m","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,288.4101691197649,285.524199265982,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,,,,,


With the experience of the last puzzle, I would suggest to use also different, maybe just forward counting, temperatures also for

csv icon

sql cosmo and icon

txt cosmo and icon

json cosmo and icon

Sorry, also got confused. only for icon of course. Test should now fail on unmatched conditions also.
Same has to be done for ICON.

pierrepetersmeier added 2 commits June 18, 2025 16:26

Add ground temperature (1m) as option to weather data.

6bb6984

Merge branch 'dev' into 1343-add-ground-temperature-1m-as-option-to-w…

0342ae2

…eather-data

pierrepetersmeier self-assigned this Jun 26, 2025

danielfeismann added enhancement New feature or request labels Jun 26, 2025

pierrepetersmeier added 2 commits July 2, 2025 16:43

Address review feedback and align test suite

920be80

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

e259bee

…to-weather-data

danielfeismann requested changes Jul 3, 2025

View reviewed changes

pierrepetersmeier added 4 commits July 9, 2025 23:20

fixing the comments and tests.

1b8dd09

fmt

6a77ffc

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

d46b0d1

…to-weather-data

Meeting

9f767ed

danielfeismann reviewed Jul 14, 2025

View reviewed changes

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java Outdated Show resolved Hide resolved

pierrepetersmeier added 2 commits July 16, 2025 10:23

Add GroundTemperatureValue and refactor WeatherValue, CosmoTimeBasedW…

b015b66

…eatherValueFactory and IconTimeBasedWeatherValueFactory

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

8e33409

…to-weather-data

danielfeismann added this to the Version 8.2 milestone Jul 25, 2025

pierrepetersmeier added 4 commits July 28, 2025 11:16

Remove logger.warn

b0d87d9

fmt

0399aa3

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

813cdbe

…to-weather-data

fmt

88191d1

danielfeismann requested changes Aug 14, 2025

View reviewed changes

pierrepetersmeier added 9 commits August 18, 2025 14:58

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

47ac942

…to-weather-data

fmt

41302fe

Merge remote-tracking branch 'origin/pp/#1343-add-ground-temperature-…

3c153a3

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

83b3736

…to-weather-data

Merge remote-tracking branch 'origin/pp/#1343-add-ground-temperature-…

13f27ee

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

Add GroundTemperatureValue 0cm and 80cm.

55a7c15

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

cde88f0

…to-weather-data

Fix SqlSinkTest

f0698b4

fmt

1d9ff09

pierrepetersmeier added 2 commits December 3, 2025 14:56

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

b387d96

…to-weather-data

Add assertions to weather source tests. fmt

7d215ee

pierrepetersmeier and others added 3 commits December 3, 2025 16:53

vary cosmo ground temperature values. Fix four cosmo tests.

133061e

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

34619a2

…to-weather-data # Conflicts: # src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy

fix after merging dev

0a02d69

danielfeismann requested changes Dec 4, 2025

View reviewed changes

pierrepetersmeier added 2 commits December 5, 2025 18:42

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

b8ebe1d

…to-weather-data

Refactor ground temperature handling in weather data classes and tests

a848141

Replace Objects.equals with equalsIgnoreUUID in weather source integr…

cfab07c

…ation tests

pierrepetersmeier requested a review from danielfeismann December 8, 2025 12:00

danielfeismann added 3 commits December 8, 2025 13:30

remove unneeded imports

137d9cf

more unneeded imports

bb3bc19

fmt

29c6e6d

danielfeismann requested changes Dec 8, 2025

View reviewed changes

pierrepetersmeier added 2 commits December 8, 2025 18:22

Update ground temperature values in Cosmo weather tests for a test.

d166641

Fix ground temperature values in Cosmo weather tests and clean up cod…

a8b15b7

…e formatting

danielfeismann added 4 commits December 9, 2025 19:08

fmt

280d846

remove imports

e9fe902

remove double test conditions

e2d74d9

fix tests by using different temperature values

bbd46cf

danielfeismann requested changes Dec 9, 2025

View reviewed changes

danielfeismann added 3 commits December 9, 2025 20:01

update WeatherSourceTestHelper for optional weather data

91e616f

fix weather.txt for cosmo

0cc3b2f

fix weather.json, weather.sql and csv for cosmo

9fd20c5

		"groundTemperaturLevel1" : "8.0",
		"groundTemperatureLevel2": "9.5"

add ground temperature 1m as option to weather data #1351

Are you sure you want to change the base?

add ground temperature 1m as option to weather data #1351

Uh oh!

Conversation

pierrepetersmeier commented Jun 26, 2025

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danielfeismann commented Nov 26, 2025

Uh oh!

pierrepetersmeier commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

danielfeismann commented Dec 4, 2025

Uh oh!

pierrepetersmeier commented Dec 4, 2025

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pierrepetersmeier commented Dec 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danielfeismann commented Dec 9, 2025

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

danielfeismann Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

danielfeismann Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

danielfeismann Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

pierrepetersmeier commented Dec 3, 2025 •

edited

Loading

pierrepetersmeier commented Dec 5, 2025 •

edited

Loading