diff --git a/Dockerfile b/Dockerfile index 08d78696fadc88f2062287302a8d1bfe5ed3b716..67b42a7eeea7b74c8f1591719527ec0f4609b8cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update --quiet && \ swig \ ninja-build \ python3-dev \ + git \ python3-numpy \ libgdal-dev \ freeglut3-dev \ @@ -33,13 +34,16 @@ RUN apt-get update --quiet && \ libtinyxml-dev \ libmuparser-dev \ libmuparserx-dev \ - libfftw3-dev && \ + libfftw3-dev \ + libgsl-dev \ + && \ rm -rf /var/lib/apt/lists/* # Build OTB +# Enabling Module_OTBTemporalGapFilling makes OTB become AfferoGPL RUN mkdir -p /root/otb-build/build && \ cd /root/otb-build && \ - wget -nv --show-progress --progress=bar:force:noscroll https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-7.1.0.zip -O /tmp/OTB.zip && \ + wget -nv --show-progress --progress=bar:force:noscroll https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-7.0.0.zip -O /tmp/OTB.zip && \ unzip /tmp/OTB.zip && \ cd /root/otb-build/build && \ cmake \ @@ -53,21 +57,26 @@ RUN mkdir -p /root/otb-build/build && \ "-DOTB_USE_SIFTFAST:BOOL=ON" \ "-DOTB_USE_SPTW:BOOL=ON" \ "-DOTB_USE_SSE_FLAGS:BOOL=ON" \ + "-DOTB_USE_LIBKML:BOOL=ON" \ + "-DModule_OTBTemporalGapFilling:BOOL=ON" \ + "-DModule_SertitObject:BOOL=ON" \ + "-DModule_otbGRM:BOOL=ON" \ + "-DModule_DiapOTBModule:BOOL=ON" \ "-DCMAKE_BUILD_TYPE=Release" \ - -DCMAKE_INSTALL_PREFIX="/install/otb" -GNinja .. && \ + -DCMAKE_INSTALL_PREFIX="/install/otb" -GNinja .. && \ ninja install && \ rm -rf /root/otb-build /tmp/OTB.zip # Build LIS ADD . /LIS_src/ -RUN ln -s /usr/bin/python3 /usr/bin/python && \ - mkdir -p /root/lis-build && \ - cd /root/lis-build && \ - cmake -DCMAKE_PREFIX_PATH=/install/otb \ +RUN ln -s /usr/bin/python3 /usr/bin/python && \ + mkdir -p /root/lis-build && \ + cd /root/lis-build && \ + cmake -DCMAKE_PREFIX_PATH=/install/otb \ -DCMAKE_INSTALL_PREFIX=/install/lis /LIS_src/ && \ - make -j 6 && \ - make install && \ - chmod a+x /install/lis/app/* + make -j 6 && \ + make install && \ + chmod a+x /install/lis/app/* # Build DANS-GDAL scripts RUN mkdir -p /root/dans-build && \ @@ -108,6 +117,8 @@ RUN apt-get update --quiet && \ libmuparser2v5 \ libmuparserx4.0.7 \ libfftw3-3 \ + libgsl23 \ + libgslcblas0 \ && \ rm -rf /var/lib/apt/lists/* diff --git a/doc/synthesis_launch_example.json b/doc/synthesis_launch_example.json index 3c7e3a550ca2d6b5231b3abacfd620923c86dd7b..b6e6fa9af309d3bbb89a272cc22e19f359a3c618 100644 --- a/doc/synthesis_launch_example.json +++ b/doc/synthesis_launch_example.json @@ -6,8 +6,8 @@ ], "date_start": "01/01/2018", "date_stop": "31/01/2018", - "output_dir": "/work/scratch/gonzalesf/lis/lis_install_15_10/build/Testing/Temporary/SNOW_SYNTHESIS", - "config_file": "/work/scratch/gonzalesf/lis/lis_install_15_10/build/Testing/Temporary/SNOW_SYNTHESIS/synthesis_configuration.json", + "output_dir": "lis/lis_install_15_10/build/Testing/Temporary/SNOW_SYNTHESIS", + "config_file": "lis/lis_install_15_10/build/Testing/Temporary/SNOW_SYNTHESIS/synthesis_configuration.json", "date_margin": 10, "densification_products_list": [ "/work/OT/siaa/Theia/Neige/TEST/Data-LIS-1.6/Input-Data-Test/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20180115-103629-617_L2A_T31TCH_D_V1-9", diff --git a/python/s2snow/synthesis_config.py b/python/s2snow/synthesis_config.py index fe9cc0fd48f6fc06618f2b6c3262b09c85353476..c35aab62f6610fd52a13b2b575a5056d401fafc9 100644 --- a/python/s2snow/synthesis_config.py +++ b/python/s2snow/synthesis_config.py @@ -73,6 +73,11 @@ class SynthesisConfig: logging.error(msg) raise LisConfigurationException(msg) + if self.tile_id is None: + msg = "Tile id is not defined." + logging.error(msg) + raise LisConfigurationException(msg) + def log_configuration(self): logging.debug("==== Configuration ====") for input_product in self.input_products_list: