From 02f70976d6e924267f616b792f86d9eb44871aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Erblang?= <michael.erblang@thalesgroup.com>
Date: Fri, 2 Feb 2024 11:02:31 +0100
Subject: [PATCH] add comparaison for S2_hysope2 + add rastertools for 4 tests
synthesis_from_l2A_*
---
test/CMakeLists.txt | 47 +++++++++++++++++++++++++++++++++++++++------
1 file changed, 41 insertions(+), 6 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e1380575..de7a6ce4 100755
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -291,10 +291,45 @@ set_tests_properties(s2_compare_final_mask_test PROPERTIES DEPENDS s2_test)
add_test(NAME s2_hysope2
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -j ${DATA_TEST}/S2/hysope2/param.json
+ -j ${DATA_TEST}/S2/hysope2_test/param.json
-o ${OUTPUT_TEST}/hysope2
)
+add_test(NAME s2_hysope2_compare_pass1_test
+ COMMAND gdalcompare.py
+ ${BASELINE}/hysope2_test/pass1.tif
+ ${OUTPUT_TEST}/hysope2/tmp/snow_pass1.tif
+ )
+set_tests_properties(s2_hysope2_compare_pass1_test PROPERTIES DEPENDS s2_test)
+
+add_test(NAME s2_hysope2_compare_pass2_test
+ COMMAND gdalcompare.py
+ ${BASELINE}/hysope2_test/pass2.tif
+ ${OUTPUT_TEST}/hysope2/tmp/snow_pass2.tif
+ )
+set_tests_properties(s2_hysope2_compare_pass2_test PROPERTIES DEPENDS s2_test)
+
+add_test(NAME s2_hysope2_compare_pass3_test
+ COMMAND gdalcompare.py
+ ${BASELINE}/hysope2_test/pass3.tif
+ ${OUTPUT_TEST}/hysope2/tmp/snow_pass3.tif
+ )
+set_tests_properties(s2_hysope2_compare_pass3_test PROPERTIES DEPENDS s2_test)
+
+add_test(NAME s2_hysope2_compare_snow_all_test
+ COMMAND gdalcompare.py
+ ${BASELINE}/hysope2_test/snow_all.tif
+ ${OUTPUT_TEST}/hysope2/tmp/LIS_SNOW_ALL.TIF
+ )
+set_tests_properties(s2_hysope2_compare_snow_all_test PROPERTIES DEPENDS s2_test)
+
+add_test(NAME s2_hysope2_compare_final_mask_test
+ COMMAND gdalcompare.py
+ ${BASELINE}/hysope2_test/final_mask.tif
+ ${OUTPUT_TEST}/hysope2/tmp/LIS_SEB.TIF
+ )
+set_tests_properties(s2_hysope2_compare_final_mask_test PROPERTIES DEPENDS s2_test)
+
add_test(NAME dem_builder_test
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/python/s2snow/dem_builder.py
"${DATA_TEST}/SRTM/sud_ouest.vrt"
@@ -471,12 +506,12 @@ add_test(NAME snow_synthesis_without_densification_test
if(NOT GITLAB_CI_BUILD MATCHES "true")
# ----------------------------------
- # Synthesis from 1.7 snow product
+ # Synthesis from 1.11.0 snow product
# ----------------------------------
add_test(NAME synthesis_from_l2A_S2_20180101
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration_shaded_snow_with_rastertools.json
-i ${DATA_TEST}/L2A_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_C_V2-2
-d "/work/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
-t "/work/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
@@ -487,7 +522,7 @@ if(NOT GITLAB_CI_BUILD MATCHES "true")
add_test(NAME synthesis_from_l2A_S2_20180131
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration_shaded_snow_with_rastertools.json
-i ${DATA_TEST}/L2A_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_C_V2-2
-d "/work/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
-t "/work/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
@@ -498,7 +533,7 @@ if(NOT GITLAB_CI_BUILD MATCHES "true")
add_test(NAME synthesis_from_l2A_L8_20180115
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration_shaded_snow_with_rastertools.json
-i ${DATA_TEST}/L2A_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9
-d "/work/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
-t "/work/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
@@ -509,7 +544,7 @@ if(NOT GITLAB_CI_BUILD MATCHES "true")
add_test(NAME synthesis_from_l2A_L8_20180131
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_BINARY_DIR}/app/let_it_snow_fsc.py
- -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration.json
+ -c ${DATA_TEST}/L2A_PRODUCTS/lis_configuration_shaded_snow_with_rastertools.json
-i ${DATA_TEST}/L2A_PRODUCTS/LANDSAT8-OLITIRS-XS_20180131-103619-890_L2A_T31TCH_D_V1-9
-d "/work/datalake/static_aux/MNT/Copernicus_DSM/world.vrt"
-t "/work/datalake/static_aux/TreeCoverDensity/31TCH/TCD_31TCH.tif"
--
GitLab