Merge pull request #82 from adehecq/amaury

Fix several small isues

Author: adehecq

ragmac_xdem/data_tree.toml

@@ -44,7 +44,7 @@ aster_path = "DEM*tif"
 validation_dates = ["2000-02-01", "2012-10-01", "2019-10-01"]
 
 ["RU_FJL"]
-ref_dem_path = "RU_FJL_Copernicus_REF_DEM.tif"
+ref_dem_path = "RU_FJL_Copernicus_REF_DEM_30m.tif"
 rgi_path = "09_rgi60_rua_wgs83_utm40n.shp"
 selected_path = "09_rgi60_rua_wgs83_utm40n_fjl_selection.shp"
 tdx_path = "*dem_mcf.tif"

ragmac_xdem/utils.py

@@ -284,6 +284,14 @@ def dems_selection(
         raise ValueError(f"Mode {mode} not recognized")
 
 
+def median_date(dates):
+    """
+    Returns the median date from a list of datetime objects. The output is rounded to the nearest day.
+    """
+    med_ordinal = np.median([date.toordinal() for date in dates])
+    return datetime.fromordinal(int(med_ordinal))
+
+
 def get_start_end_dates(groups, merge_mode, validation_dates):
     """
     Returns the first and last dates of the DEM subgroup used for each subperiod, depending on the merging method set.
@@ -300,8 +308,8 @@ def get_start_end_dates(groups, merge_mode, validation_dates):
         for count, pair in enumerate(pair_indexes):
             k1, k2 = pair
             pair_id = pair_ids[count]
-            start_date[pair_id] = np.min(get_dems_date(groups[k1]))
-            end_date[pair_id] = np.max(get_dems_date(groups[k2]))
+            start_date[pair_id] = median_date(get_dems_date(groups[k1]))
+            end_date[pair_id] = median_date(get_dems_date(groups[k2]))
 
     elif (merge_mode == "TimeSeries") or (merge_mode == "TimeSeries2") or (merge_mode == "TimeSeries3"):
 

scripts/archive_results.sh

@@ -28,7 +28,7 @@ rm -f $outfile  # To avoid appending to existing file
 for exp in experiment_1 experiment_2
 do
 
-    for dir in $exp/*/*
+    for dir in $exp/*/results*
     do
 	cmd="tar --append --file=$outfile $dir"
 	echo $cmd; `$cmd`

scripts/download_data.sh

@@ -21,3 +21,7 @@ echo -e "\n*** Unzipping archives ***\n"
 for f in `ls $TARGET_DIR/experiment_*/*/*zip`; do echo -e "\n$f"; unzip -n $f -d `dirname $f`; done
 
 echo -e "\n*** Downloading finished ***\n"
+
+# Force REF DEM for RU_FJL case to be sampled at exactly 30 m - the difference with original is less than 1e-10.
+echo -e "Resampling REF_DEM for case RU_FJL"
+gdalwarp -tr 30 30 data/raw/experiment_2/RU_FJL/RU_FJL_Copernicus_REF_DEM.tif data/raw/experiment_2/RU_FJL/RU_FJL_Copernicus_REF_DEM_30m.tif -r bilinear