From 087eb53579ea2699fe86c787659025a56eb56997 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Wed, 27 Mar 2024 11:27:55 +0100 Subject: [PATCH 01/16] Update docker-compose.yml --- docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 748c4ae..1df2f7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,20 +7,20 @@ services: ports: - "8080:8080" volumes: - - model-fmi-hirlam:/smartmet/data/hirlam + - model-fmi-meps:/smartmet/data/meps restart: unless-stopped - hirlam-surface: + meps-surface: image: fmidev/fmidownloader - container_name: fmidownloader-hirlam-surface + container_name: fmidownloader-meps-surface command: - - "--producer=hirlam" + - "--producer=meps" - "--dir=surface" - - "--filename=hirlam_europe_surface" + - "--filename=meps_europe_surface" - "--parameters=Temperature,DewPoint,Humidity,WindDirection,WindSpeedMS,WindGust,TotalCloudCover,Precipitation1h,WeatherSymbol3,Pressure,CAPE,CIN" volumes: - - model-fmi-hirlam:/tmp + - model-fmi-meps:/tmp restart: unless-stopped volumes: - model-fmi-hirlam: - name: model-fmi-hirlam \ No newline at end of file + model-fmi-meps: + name: model-fmi-meps From df103c273b823d4998e9f642f982d420ababcd0c Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Wed, 27 Mar 2024 11:29:12 +0100 Subject: [PATCH 02/16] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1df2f7c..bfb4607 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: command: - "--producer=meps" - "--dir=surface" - - "--filename=meps_europe_surface" + - "--filename=meps_northeurope_surface" - "--parameters=Temperature,DewPoint,Humidity,WindDirection,WindSpeedMS,WindGust,TotalCloudCover,Precipitation1h,WeatherSymbol3,Pressure,CAPE,CIN" volumes: - model-fmi-meps:/tmp From 8a55006d31d04524ff099116e8d840273292af69 Mon Sep 17 00:00:00 2001 From: Ville Pekkinen Date: Wed, 27 Mar 2024 14:39:49 +0200 Subject: [PATCH 03/16] Fix meps-surface indentation error --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bfb4607..e63f488 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: volumes: - model-fmi-meps:/smartmet/data/meps restart: unless-stopped - meps-surface: + meps-surface: image: fmidev/fmidownloader container_name: fmidownloader-meps-surface command: From a45af44c80a50e2ce28e51daf7fd30f8c6f92909 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 12 Apr 2024 09:16:09 +0300 Subject: [PATCH 04/16] Update checkout v4 --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c92bc2d..238264d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Docker login run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin - name: Docker build From ec88708c53ebc514ebb397b67f0bd3f929c9f2fa Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 12 Apr 2024 10:02:48 +0300 Subject: [PATCH 05/16] Change Google Fonts download --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a857432..c904c29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer "Mikko Rauhala " LABEL license "MIT License Copyright (c) 2023 FMI Open Development" ENV USER_NAME="smartmet" \ - GOOGLE_FONTS="Lato Noto%20Sans Open%20Sans Poppins Roboto Ubuntu" + GOOGLE_FONTS="Montserrat NotoSans OpenSans Roboto" RUN dnf -y install https://download.fmi.fi/smartmet-open/rhel/9/x86_64/smartmet-open-release-latest-9.noarch.rpm && \ dnf -y install yum-utils && \ @@ -34,9 +34,8 @@ RUN \ for FONT in $GOOGLE_FONTS; \ do \ mkdir -p /usr/share/fonts/truetype/${FONT} && \ - curl -s -S -o ${FONT}.zip "https://fonts.google.com/download?family=${FONT}" && \ - unzip -o ${FONT}.zip -d /usr/share/fonts/truetype/${FONT} && \ - rm -f ${FONT}.zip ; \ + curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}%5Bwdth,wght%5D.ttf" && \ + curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" && \ done HEALTHCHECK --interval=30s --timeout=10s \ From d0732dbc11194413a042a7dc1c968a780dd9032c Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 12 Apr 2024 10:07:07 +0300 Subject: [PATCH 06/16] Fix syntax error --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c904c29..2bd9140 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN \ do \ mkdir -p /usr/share/fonts/truetype/${FONT} && \ curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}%5Bwdth,wght%5D.ttf" && \ - curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" && \ + curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" done HEALTHCHECK --interval=30s --timeout=10s \ From 17ffeef25b2224886b5d9bed8b95f2461a17e8e4 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 12 Apr 2024 10:10:19 +0300 Subject: [PATCH 07/16] Fix syntax error 2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2bd9140..5ca4f64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN \ do \ mkdir -p /usr/share/fonts/truetype/${FONT} && \ curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}%5Bwdth,wght%5D.ttf" && \ - curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" + curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" \ done HEALTHCHECK --interval=30s --timeout=10s \ From 57d304234520d40c839bc2c97098b9ded99ae1f8 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 12 Apr 2024 10:40:37 +0300 Subject: [PATCH 08/16] Fix syntax error 3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ca4f64..e23470a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN \ do \ mkdir -p /usr/share/fonts/truetype/${FONT} && \ curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}%5Bwdth,wght%5D.ttf" && \ - curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" \ + curl -s -S --output-dir /usr/share/fonts/truetype/${FONT} "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" ; \ done HEALTHCHECK --interval=30s --timeout=10s \ From f2ae64e03abbe3ff0c50ba643da06498010691f2 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 31 May 2024 12:25:26 +0500 Subject: [PATCH 09/16] Update querydata.conf --- smartmetconf/engines/querydata.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smartmetconf/engines/querydata.conf b/smartmetconf/engines/querydata.conf index f95ac25..72f56c6 100644 --- a/smartmetconf/engines/querydata.conf +++ b/smartmetconf/engines/querydata.conf @@ -126,7 +126,7 @@ gem_pressure: gfs_surface: { - alias = "gfs"; + alias = ["gfs","gfs_world_surface"]; directory = "/smartmet/data/gfs/surface"; pattern = ".*_gfs_.*_surface\.sqd$"; forecast = true; @@ -139,7 +139,7 @@ gfs_surface: gfs_pressure: { - alias = "gfs_pressure"; + alias = "gfs_world_pressure"; directory = "/smartmet/data/gfs/pressure"; pattern = ".*_gfs_.*_pressure\.sqd$"; forecast = true; From b16f7eaea5a4af5c5baca7e37fa17f53ec32341f Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 31 May 2024 12:53:46 +0500 Subject: [PATCH 10/16] Update precipitation.json --- wms/customers/gfs/products/surface/precipitation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wms/customers/gfs/products/surface/precipitation.json b/wms/customers/gfs/products/surface/precipitation.json index f9fd146..bb98b8b 100644 --- a/wms/customers/gfs/products/surface/precipitation.json +++ b/wms/customers/gfs/products/surface/precipitation.json @@ -1,7 +1,7 @@ { "title" : "GFS Precipitation Rate", "abstract" : "Precipitation Rate from GFS", - "producer": "gfs_world_surface", + "producer": "gfs_surface", "views": [{ "layers": [{ "qid": "l", From 4c7122d3336349812e7348960e9850fcde341b3f Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 31 May 2024 12:54:07 +0500 Subject: [PATCH 11/16] Update winddirection.json --- wms/customers/gfs/products/surface/winddirection.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wms/customers/gfs/products/surface/winddirection.json b/wms/customers/gfs/products/surface/winddirection.json index b090e56..c324fd2 100644 --- a/wms/customers/gfs/products/surface/winddirection.json +++ b/wms/customers/gfs/products/surface/winddirection.json @@ -1,7 +1,7 @@ { "title": "GFS Wind Direction 10m", "abstract": "Wind direction from GFS forecast model.", - "producer": "gfs_world_surface", + "producer": "gfs_surface", "views": [ { "layers": [ @@ -20,4 +20,4 @@ ] } ] -} \ No newline at end of file +} From 8d12eff1274acba72ed797c7f4a37b79941bd01a Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 31 May 2024 12:54:27 +0500 Subject: [PATCH 12/16] Update windspeed.json --- wms/customers/gfs/products/surface/windspeed.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wms/customers/gfs/products/surface/windspeed.json b/wms/customers/gfs/products/surface/windspeed.json index e5a9d36..db2a6f9 100644 --- a/wms/customers/gfs/products/surface/windspeed.json +++ b/wms/customers/gfs/products/surface/windspeed.json @@ -1,7 +1,7 @@ { "title" : "GFS Wind Speed 10m", "abstract" : "Wind speed in m/s from HIRLAM forecast GFS.", - "producer": "gfs_world_surface", + "producer": "gfs_surface", "views": [{ "layers": [{ "qid": "l", @@ -13,4 +13,4 @@ } }] }] -} \ No newline at end of file +} From 5a8938cd6ebb0d09ef92ec51688c89da773b9a21 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 31 May 2024 12:54:45 +0500 Subject: [PATCH 13/16] Update temperature.json --- wms/customers/gfs/products/surface/temperature.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wms/customers/gfs/products/surface/temperature.json b/wms/customers/gfs/products/surface/temperature.json index 43175c7..db30191 100644 --- a/wms/customers/gfs/products/surface/temperature.json +++ b/wms/customers/gfs/products/surface/temperature.json @@ -1,7 +1,7 @@ { "title": "GFS Temperature 2m", "abstract": "Temperature 2m from GFS", - "producer": "gfs_world_surface", + "producer": "gfs_surface", "views": [ { "layers": [ @@ -18,4 +18,4 @@ ] } ] -} \ No newline at end of file +} From 57cf649383b5ecb553abb6b76b40e30eb72a8135 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 31 May 2024 12:55:01 +0500 Subject: [PATCH 14/16] Update relativehumidity.json --- wms/customers/gfs/products/surface/relativehumidity.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wms/customers/gfs/products/surface/relativehumidity.json b/wms/customers/gfs/products/surface/relativehumidity.json index 57ccac5..dfbc177 100644 --- a/wms/customers/gfs/products/surface/relativehumidity.json +++ b/wms/customers/gfs/products/surface/relativehumidity.json @@ -1,7 +1,7 @@ { "title" : "GFS Relative Humidity 2m", "abstract" : "Relative Humidity 2m from GFS", - "producer": "gfs_world_surface", + "producer": "gfs_surface", "keyword": ["model:gfs"], "views": [{ "layers": [{ From 233e5ca24f24f04525af54d128da51be11829b77 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Fri, 31 May 2024 12:55:15 +0500 Subject: [PATCH 15/16] Update pressure.json --- wms/customers/gfs/products/surface/pressure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wms/customers/gfs/products/surface/pressure.json b/wms/customers/gfs/products/surface/pressure.json index 3b30e61..acdddbb 100644 --- a/wms/customers/gfs/products/surface/pressure.json +++ b/wms/customers/gfs/products/surface/pressure.json @@ -1,7 +1,7 @@ { "title" : "GFS Pressure MSL", "abstract" : "MSL Pressure from GFS", - "producer": "gfs_world_surface", + "producer": "gfs_surface", "views": [{ "layers": [{ "qid": "l", @@ -14,4 +14,4 @@ } }] }] -} \ No newline at end of file +} From e14be9cbfd104a87aa88492821484ab5e55d6f10 Mon Sep 17 00:00:00 2001 From: Mikko Rauhala Date: Thu, 29 Aug 2024 15:30:35 +0200 Subject: [PATCH 16/16] Add wrf --- smartmetconf/engines/querydata.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/smartmetconf/engines/querydata.conf b/smartmetconf/engines/querydata.conf index 72f56c6..95ac92d 100644 --- a/smartmetconf/engines/querydata.conf +++ b/smartmetconf/engines/querydata.conf @@ -7,6 +7,7 @@ valid_points_cache_dir = "/var/smartmet/cache/validpoints"; producers = [ "meteor", "meps_surface", + "wrf_surface", "ecmwf_surface", "icon_surface", "gfs_surface", @@ -38,6 +39,19 @@ meteor: number_to_keep = 4; }; +wrf_surface: +{ + alias = ["wrf", "wrf_surface"]; + directory = "/smartmet/data/wrf/surface"; + pattern = ".*_wrf_.*_surface\.sqd$"; + forecast = true; + type = "grid"; + leveltype = "surface"; + refresh_interval_secs = 60; + number_to_keep = 2; + multifile = false; +}; + ecmwf_surface: { alias = ["ecmwf", "ecmwf_surface"];