diff --git a/full_prod.sh b/full_prod.sh
index 547d9bd4723576229fc087f65766ee12e9feef4f..cc2f402560819dc3169e48ffce00163870b04d3f 100755
--- a/full_prod.sh
+++ b/full_prod.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-  
+
 set +xv
 
 
diff --git a/move_to_perm.sh b/move_to_perm.sh
index 5ceaebea4f9136000afb488e4d23d314f069660b..c980854028f8fc61b592993c23d63a3dc98b15c6 100755
--- a/move_to_perm.sh
+++ b/move_to_perm.sh
@@ -40,7 +40,7 @@ for d in $(seq -f "%02g" 0 $((nbday-1))); do
   
   if [ ${date} -eq ${date_end} ]; then
     if [ ${#var_list[@]} -gt 1 ]; then
-      file_nb=$( eval "ls ${DIR_SAVE}/{$(tr ' ' ',' <<< ${var_list[*]^^})}/ERA5_L50Z10_{$(tr ' ' ',' <<< ${var_list[*]^^})}_1H_extrap_y${date:0:4}m${date:4:2}d{${date_beg:6:2}..${date_end:6:2}}.nc 2>/dev/null" | wc -l )
+      file_nb=$( eval "ls ${DIR_SAVE}/{$(tr ' ' ',' <<< ${var_list[*]^^})}/ERA5_L50Z10_{$(tr ' ' ',' <<< ${var_list[*]^^})}_1H_extrap_y${date:0:4}m{${date_beg:4:2}..${date_end:4:2}}d{${date_beg:6:2}..${date_end:6:2}}.nc 2>/dev/null" | wc -l )
     else
       file_nb=$( eval "ls ${DIR_SAVE}/${var_list[*]^^}/ERA5_L50Z10_${var_list[*]^^}_1H_extrap_y${date:0:4}m${date:4:2}d{${date_beg:6:2}..${date_end:6:2}}.nc 2>/dev/null" | wc -l )
     fi
diff --git a/subjob_ablhpg.sh b/subjob_ablhpg.sh
index 17ca76c40b9dbd3e92220f3159000cfea55f25b8..9d60a49d9d2ef38b2d2962e84a0a25c919e537ce 100755
--- a/subjob_ablhpg.sh
+++ b/subjob_ablhpg.sh
@@ -37,7 +37,7 @@ for d in $(seq -f "%02g" 0 $((nbday-1))); do
   while [[ ${date} -eq ${date_end} && $(squeue -u $USER -h -t pending,running -r -o '%20j' | grep ablhpg_${ym} | wc -l) -gt 0 ]]; do echo "sleeping..."; sleep 10; done
   
   if [ ${date} -eq ${date_end} ]; then
-    file_nb=$( eval "ls ${d2D}/${fhpg/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
+    file_nb=$( eval "ls ${d2D%/*}/{${date_beg:0:6}..${date_end:0:6}}/${fhpg/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
     if [ ${nbday} -eq ${file_nb} ]; then
       echo "-ABL_HPG: OK"
     else
diff --git a/subjob_ablvint.sh b/subjob_ablvint.sh
index cb652caf766a4857124a607be3494e4c83aacb23..c76f37eb77268c08914817ef4623c0e2fe87354c 100755
--- a/subjob_ablvint.sh
+++ b/subjob_ablvint.sh
@@ -40,7 +40,7 @@ for d in $(seq -f "%02g" 0 $((nbday-1))); do
   while [[ ${date} -eq ${date_end} && $(squeue -u $USER -h -t pending,running -r -o '%20j' | grep ablvint${var_name:+"_${var_name}"}_${ym} | wc -l) -gt 0 ]]; do echo "sleeping..."; sleep 10; done
   
   if [ ${date} -eq ${date_end} ]; then
-    file_nb=$( eval "ls ${d2D}/${var_name:+"${var_name}_"}${fabl/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
+    file_nb=$( eval "ls ${d2D%/*}/{${date_beg:0:6}..${date_end:0:6}}/${var_name:+"${var_name}_"}${fabl/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
     if [ ${nbday} -eq ${file_nb} ]; then
       echo "-ABL_VINT: OK"
     else 
diff --git a/subjob_cdogrid.sh b/subjob_cdogrid.sh
index 64c375545d52fe3809223a1fa7bf6e3c23371ca4..8a090697958551f13bb7606406826f42833c923b 100755
--- a/subjob_cdogrid.sh
+++ b/subjob_cdogrid.sh
@@ -51,13 +51,13 @@ for d in $(seq -f "%02g" 0 $((nbday-1))); do
   while [[ ${date} -eq ${date_end} && $(squeue -u $USER -h -t pending,running -r -o '%20j' | grep cdogrid.D_${ym} | wc -l) -gt 0 ]]; do echo "sleeping..."; sleep 10; done
   
   if [ ${date} -eq ${date_end} ]; then
-    file_nb=$( eval "ls ${dout}/${f2D/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
+    file_nb=$( eval "ls ${dout%/*}/{${date_beg:0:6}..${date_end:0:6}}/${f2D/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
     if [ ${nbday} -eq ${file_nb} ]; then
       echo "-CDO_GRID2D: OK"
     else
       echo "-CDO_GRID2D: ERROR"; exit 1
     fi
-    file_nb=$( eval "ls ${dout}/${f3D/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
+    file_nb=$( eval "ls ${dout%/*}/{${date_beg:0:6}..${date_end:0:6}}/${f3D/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
     if [ ${nbday} -eq ${file_nb} ]; then
       echo "-CDO_GRID3D: OK"
     else
diff --git a/subjob_cdomiss.sh b/subjob_cdomiss.sh
index 18ec82f45b5024013979a5e2cf185b226be3d723..480a7fcad4a434500f77755c491b1ae7c35b3b41 100755
--- a/subjob_cdomiss.sh
+++ b/subjob_cdomiss.sh
@@ -43,9 +43,9 @@ for d in $(seq -f "%02g" 0 $((nbday-1))); do
   
   if [ ${date} -eq ${date_end} ]; then
     if [ ${#var_list[@]} -gt 1 ]; then
-      file_nb=$( eval "ls ${d}/{$(tr ' ' ',' <<< ${var_list[*]})}_${f/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}_misstodis.nc 2>/dev/null" | wc -l )
+      file_nb=$( eval "ls ${d%/*}/{${date_beg:0:6}..${date_end:0:6}}/{$(tr ' ' ',' <<< ${var_list[*]})}_${f/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}_misstodis.nc 2>/dev/null" | wc -l )
     else
-      file_nb=$( eval "ls ${d}/${var_list[*]}_${f/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}_misstodis.nc 2>/dev/null" | wc -l )
+      file_nb=$( eval "ls ${d%/*}/{${date_beg:0:6}..${date_end:0:6}}/${var_list[*]}_${f/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}_misstodis.nc 2>/dev/null" | wc -l )
     fi
     if [ $((nbday*${#var_list[@]})) -eq ${file_nb} ]; then
       echo "-CDO_MISS: OK"
diff --git a/subjob_cdosplit.sh b/subjob_cdosplit.sh
index feea2a9b8c0bccb9671ece2a02bdddd0216c92ae..5aac86e4eba137af54e8593d07db749ae1608c5d 100755
--- a/subjob_cdosplit.sh
+++ b/subjob_cdosplit.sh
@@ -43,7 +43,7 @@ for d in $(seq -f "%02g" 0 $((nbday-1))); do
   while [[ ${date} -eq ${date_end} && $(squeue -u $USER -h -t pending,running -r -o '%20j' | grep cdosplit_${ym} | wc -l) -gt 0 ]]; do echo "sleeping..."; sleep 10; done
   
   if [ ${date} -eq ${date_end} ]; then
-    file_nb=$( eval "ls ${dabl}/{$(tr ' ' ',' <<< ${var_list[*]})}_${fabl/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
+    file_nb=$( eval "ls ${dabl%/*}/{${date_beg:0:6}..${date_end:0:6}}/{$(tr ' ' ',' <<< ${var_list[*]})}_${fabl/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
     if [ $((nbday*var_nb)) -eq ${file_nb} ]; then
       echo "-CDO_SPLIT: OK"
     else
diff --git a/subjob_mars.sh b/subjob_mars.sh
index 4692b9e72108f6f047e3b7bdabf5f2af1da4a26e..b131e051cdc5c391d174afb79e10eafc2c6e23cc 100755
--- a/subjob_mars.sh
+++ b/subjob_mars.sh
@@ -39,12 +39,12 @@ for d in $(seq -f "%02g" 0 $((nbday-1))); do
   # TEST ALL FILES ARE PRODUCED
   if [ ${date} -eq ${date_end} ]; then
     
-    fnb=$( eval "ls ${dout}/${f3D/${date}.grib/${ym}{${date_beg:6:2}..${date_end:6:2}}}.grib 2>/dev/null" | wc -l )
-    nnb=$( eval "ls ${dreg}/${n3D/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
+    fnb=$( eval "ls ${dout%/*}/{${date_beg:0:6}..${date_end:0:6}}/${f3D/${date}.grib/*{${date_beg:6:2}..${date_end:6:2}}}.grib 2>/dev/null" | wc -l )
+    nnb=$( eval "ls ${dreg%/*}/{${date_beg:0:6}..${date_end:0:6}}/${n3D/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
     if [[ ${nbday} -eq ${fnb} || ${nbday} -eq ${nnb} ]]; then echo "-MARS_INST3D: OK"; else echo "-MARS_INST3D: ERROR"; exit 1; fi
 
-    fnb=$( eval "ls ${dout}/${f2D/${date}.grib/${ym}{${date_beg:6:2}..${date_end:6:2}}}.grib 2>/dev/null" | wc -l )
-    nnb=$( eval "ls ${dreg}/${n2D/${date}.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
+    fnb=$( eval "ls ${dout%/*}/{${date_beg:0:6}..${date_end:0:6}}/${f2D/${date}.grib/*{${date_beg:6:2}..${date_end:6:2}}}.grib 2>/dev/null" | wc -l )
+    nnb=$( eval "ls ${dreg%/*}/{${date_beg:0:6}..${date_end:0:6}}/${n2D/${date}.nc/*{${date_beg:6:2}..${date_end:6:2}}}.nc 2>/dev/null" | wc -l )
     if [[ ${nbday} -eq ${fnb} || ${nbday} -eq ${nnb} ]]; then echo "-MARS_SURF2D: OK"; else echo "-MARS_SURF2D: ERROR"; exit 1; fi
 
   fi
diff --git a/subjob_ncochunk.sh b/subjob_ncochunk.sh
index 4f81fd771d92bf2996afad4aadcdeceafbb2e6bd..6c526c0d6db629bd8bb6c6aa48bbc4d4559f8b4b 100755
--- a/subjob_ncochunk.sh
+++ b/subjob_ncochunk.sh
@@ -42,11 +42,11 @@ done
 while [[ ${date} -eq ${date_end} && $(squeue -u $USER -h -t pending,running -r -o '%20j' | grep ncochunk_${ym} | wc -l) -gt 0 ]]; do echo "sleeping..."; sleep 10; done
 
 if [ ${date} -eq ${date_end} ]; then
-  fall=${f/${date}_misstodis.nc/${ym}{${date_beg:6:2}..${date_end:6:2}}}_misstodis_cnk64.nc
+  fall=${f/${date}_misstodis.nc/*{${date_beg:6:2}..${date_end:6:2}}}_misstodis_cnk64.nc
   if [ ${#var_list[@]} -gt 1 ]; then
-    file_nb=$( eval "ls ${d}/{$(tr ' ' ',' <<< ${var_list[*]})}_${fall} 2>/dev/null" | wc -l )
+    file_nb=$( eval "ls ${d%/*}/{${date_beg:0:6}..${date_end:0:6}}/{$(tr ' ' ',' <<< ${var_list[*]})}_${fall} 2>/dev/null" | wc -l )
   else
-    file_nb=$( eval "ls ${d}/${var_list[*]}_${fall} 2>/dev/null" | wc -l )
+    file_nb=$( eval "ls ${d%/*}/{${date_beg:0:6}..${date_end:0:6}}/${var_list[*]}_${fall} 2>/dev/null" | wc -l )
   fi
   if [ $((nbday*${#var_list[@]})) -eq ${file_nb} ]; then
     echo "-NCO_CHUNK: OK"