Merge branch 'develop'

New Release 3.5.0

Dockerfile

@@ -1,3 +1,27 @@
+##########################################################################
+# 
+# This file is part of FORCE - Framework for Operational Radiometric 
+# Correction for Environmental monitoring.
+# 
+# Copyright (C) 2013-2020 David Frantz
+# 
+# FORCE is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# FORCE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with FORCE. If not, see <http://www.gnu.org/licenses/>.
+# 
+##########################################################################
+
+# Copyright (C) 2020 Gergely Padányi-Gulyás (github user fegyi001)
+
 FROM ubuntu:18.04 as builder
 
 # Install folder
@@ -21,8 +45,8 @@ RUN apt-get -y install wget unzip curl git build-essential libgdal-dev gdal-bin
 # Set python aliases for Python 3.x
 RUN echo 'alias python=python3' >> ~/.bashrc \
   && echo 'alias pip=pip3' >> ~/.bashrc
-# NumPy is needed for OpenCV
-RUN pip3 install numpy==1.18.1 
+# NumPy is needed for OpenCV, gsutil for Google downloads
+RUN pip3 install numpy==1.18.1 gsutil
 
 # Build OpenCV from source
 RUN mkdir -p $INSTALL_DIR/opencv
@@ -67,4 +91,4 @@ RUN rm -rf $INSTALL_DIR
 RUN apt-get purge -y --auto-remove apt-utils cmake git build-essential software-properties-common
 
 # Test FORCE run
-RUN force
+RUN force

Makefile

@@ -72,11 +72,11 @@ TA=temp-aux
 ### TARGETS
 
 all: temp cross lower higher aux exe
-cross: enum_cl cite_cl utils_cl alloc_cl stack_cl imagefuns_cl param_cl date_cl datesys_cl lock_cl cube_cl dir_cl stats_cl pca_cl tile_cl queue_cl warp_cl sun_cl quality_cl sys_cl konami_cl download_cl read_cl
+cross: string_cl enum_cl cite_cl utils_cl alloc_cl stack_cl imagefuns_cl param_cl date_cl datesys_cl lock_cl cube_cl dir_cl stats_cl pca_cl tile_cl queue_cl warp_cl sun_cl quality_cl sys_cl konami_cl download_cl read_cl
 lower: table_ll param_ll meta_ll cube_ll equi7_ll glance7_ll atc_ll sunview_ll read_ll radtran_ll topo_ll cloud_ll gas_ll brdf_ll atmo_ll aod_ll resmerge_ll coreg_ll coregfuns_ll acix_ll modwvp_ll
-higher: param_hl progress_hl tasks_hl read-aux_hl read-ard_hl quality_hl bap_hl level3_hl cso_hl tsa_hl index_hl interpolate_hl stm_hl fold_hl standardize_hl pheno_hl trend_hl ml_hl texture_hl lsm_hl lib_hl sample_hl imp_hl cfimp_hl l2imp_hl
+higher: param_hl progress_hl tasks_hl read-aux_hl read-ard_hl quality_hl bap_hl level3_hl cso_hl tsa_hl index_hl interpolate_hl stm_hl fold_hl standardize_hl pheno_hl polar_hl trend_hl ml_hl texture_hl lsm_hl lib_hl sample_hl imp_hl cfimp_hl l2imp_hl
 aux: param_aux param_train_aux train_aux
-exe: force force-parameter force-qai-inflate force-tile-finder force-tabulate-grid force-l2ps force-higher-level force-train force-lut-modis
+exe: force force-parameter force-qai-inflate force-tile-finder force-tabulate-grid force-l2ps force-higher-level force-train force-lut-modis force-mdcp force-stack
 .PHONY: temp all install install_ bash python clean build
 
 
@@ -88,6 +88,9 @@ temp:
 
 ### CROSS LEVEL COMPILE UNITS
 
+string_cl: temp $(DC)/string-cl.c
+	$(GCC) $(CFLAGS) -c $(DC)/string-cl.c -o $(TC)/string_cl.o
+
 enum_cl: temp $(DC)/enum-cl.c
 	$(GCC) $(CFLAGS) -c $(DC)/enum-cl.c -o $(TC)/enum_cl.o
 
@@ -266,6 +269,9 @@ standardize_hl: temp $(DH)/standardize-hl.c
 pheno_hl: temp $(DH)/pheno-hl.cpp
 	$(GPP) $(CFLAGS) $(SPLITS) -c $(DH)/pheno-hl.cpp -o $(TH)/pheno_hl.o $(LDSPLITS)
 
+polar_hl: temp $(DH)/polar-hl.c
+	$(GCC) $(CFLAGS) -c $(DH)/polar-hl.c -o $(TH)/polar_hl.o
+
 trend_hl: temp $(DH)/trend-hl.c
 	$(GCC) $(CFLAGS) -c $(DH)/trend-hl.c -o $(TH)/trend_hl.o
 
@@ -325,7 +331,7 @@ force: temp cross $(DA)/_main.c
 
 force-parameter: temp cross aux $(DA)/_parameter.c
 	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) $(OPENCV) -o $(TB)/force-parameter $(DA)/_parameter.c $(TC)/*.o $(TA)/*.o $(LDGDAL) $(LDGSL) $(LDCURL) $(LDOPENCV)
- 
+
 force-tile-finder: temp cross $(DA)/_tile-finder.c
 	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) -o $(TB)/force-tile-finder $(DA)/_tile-finder.c $(TC)/*.o $(LDGDAL) $(LDGSL) $(LDCURL)
 
@@ -347,10 +353,15 @@ force-higher-level: temp cross higher $(DH)/_higher-level.c
 force-lut-modis: temp cross lower $(DL)/_lut-modis.c
 	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) -o $(TB)/force-lut-modis $(DL)/_lut-modis.c $(TC)/*.o $(TL)/*.o $(LDGDAL) $(LDGSL) $(LDCURL)
 
+force-mdcp: temp cross $(DA)/_md_copy.c
+	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) -o $(TB)/force-mdcp $(DA)/_md_copy.c $(TC)/*.o $(LDGDAL) $(LDGSL) $(LDCURL)
+
+force-stack: temp cross $(DA)/_stack.c
+	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) -o $(TB)/force-stack $(DA)/_stack.c $(TC)/*.o $(LDGDAL) $(LDGSL) $(LDCURL)
 
 ### dummy code for testing stuff  
 
-dummy: temp cross aux src/dummy.c
+dummy: temp cross aux higher src/dummy.c
 	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) $(SPLITS) $(OPENCV) -o $(TB)/dummy src/dummy.c $(TC)/*.o $(TA)/*.o $(TH)/*.o $(LDGDAL) $(LDGSL) $(LDCURL) $(LDSPLITS) $(LDOPENCV)
 
 
@@ -366,6 +377,7 @@ clean:
 bash: temp
 	cp $(DB)/force-cube.sh $(TB)/force-cube
 	cp $(DB)/force-l2ps_.sh $(TB)/force-l2ps_
+	cp $(DB)/force-level1-csd.sh $(TB)/force-level1-csd  
 	cp $(DB)/force-level1-landsat.sh $(TB)/force-level1-landsat
 	cp $(DB)/force-level1-sentinel2.sh $(TB)/force-level1-sentinel2
 	cp $(DB)/force-level2.sh $(TB)/force-level2

README.md

@@ -2,7 +2,7 @@
 
 **Framework for Operational Radiometric Correction for Environmental monitoring**
 
-**Version 3.4.0**
+**Version 3.5.0**
 
 ![FORCE Logo](/images/force.png)