minor update

full_prod.sh

@@ -5,6 +5,8 @@ set +xv
 date_beg=$1
 date_end=$2
 
+time ./do_by_day.sh ${date_beg} ${date_end} ./subjob_mars.sh mars_inst3D_ana.req.base
+time ./do_by_day.sh ${date_beg} ${date_end} ./subjob_mars.sh mars_surf2D_ana.req.base
 time ./do_by_day.sh ${date_beg} ${date_end} ./subjob_cdogrid.sh
 time ./do_by_day.sh ${date_beg} ${date_end} ./subjob_ablhpg.sh
 time ./do_by_day.sh ${date_beg} ${date_end} ./subjob_ablvint.sh

job_cdogrid.sbatch

@@ -10,8 +10,8 @@ module list
 
 set +xv
 
-if [ -n "$1" ]; then pinp=$1; else exit; fi
-if [ -n "$2" ]; then pout=$2; else exit; fi
+if [ -n "$1" ]; then pinp=$1; else exit 1; fi
+if [ -n "$2" ]; then pout=$2; else exit 1; fi
 
 cdo -v -t ecmwf -z zip -k grid -f nc4 -setgridtype,regular ${pinp} ${pout}
 

job_cdomiss.sbatch

@@ -12,8 +12,9 @@ module list
 
 set +xv
 
-if [[ -z "$1" || -z "$2" ]]; then exit 1; fi
+if [ -n "$1" ]; then pinp=$1; else exit 1; fi
+if [ -n "$2" ]; then pout=$2; else exit 1; fi
 
-cdo -v -P 4 -t ecmwf -z zip -k grid -f nc4 -pack -setmisstodis -setctomiss,9.9692e+36 $1 $2
+cdo -v -P 4 -t ecmwf -z zip -k grid -f nc4 -pack -setmisstodis -setctomiss,9.9692e+36 ${pinp} ${pout}
 
 exit 0

subjob_ablhpg.sh

@@ -20,7 +20,7 @@ fhpg=${f3D/inst3D/hpg}
 
 if [ ! -s ${d2D}/${fhpg} ]; then
   while [ $(squeue -u $USER -h -t pending,running -r | wc -l) -eq 100 ]; do echo "sleeping..."; sleep 10; done 
-  if [ ${date} -eq ${date_end} ]; then echo "wait..."; w="--wait"; fi
+  if [ ${date} -eq ${date_end} ]; then echo "waiting..."; w="--wait"; fi
   sbatch ${w} --job-name=ablhpg_${date} /home/ar0s/PROD_ERA5_ABL/job_ablhpg.sbatch $p2D $p3D $pmsk
   if [ -n "${w}" ]; then
     file_nb=$( eval "ls ${d2D}/${fhpg/${date}/${ym}??} 2>/dev/null" | wc -l )

subjob_ablvint.sh

@@ -20,7 +20,7 @@ fabl=${f3D/inst3D/abl} ; fabl=${fabl/L107-137/L50Z10}
 
 if [ ! -s ${d2D}/${fabl} ]; then
   while [ $(squeue -u $USER -h -t pending,running -r | wc -l) -eq 100 ]; do echo "sleeping..."; sleep 10; done 
-  if [ ${date} -eq ${date_end} ]; then echo "wait..."; w="--wait"; fi
+  if [ ${date} -eq ${date_end} ]; then echo "waiting..."; w="--wait"; fi
   sbatch ${w} --job-name=ablvint_${date} /home/ar0s/PROD_ERA5_ABL/job_ablvint.sbatch $p2D $p3D $pmsk
   if [ -n "${w}" ]; then
     file_nb=$( eval "ls ${d2D}/${fabl/${date}/${ym}??} 2>/dev/null" | wc -l )

subjob_cdogrid.sh

@@ -18,13 +18,13 @@ d2D=$(dirname $p2D) ; d3D=$(dirname $p3D)
 
 if [ ! -s ${dout}/${f2D} ]; then
   while [ $(squeue -u $USER -h -t pending,running -r | wc -l) -eq 100 ]; do echo "sleeping..."; sleep 10; done 
-  if [ ${date} -eq ${date_end} ]; then echo "wait..."; w="--wait"; fi
+  if [ ${date} -eq ${date_end} ]; then echo "waiting..."; w="--wait"; fi
   sbatch ${w} --job-name=cdogrid2D_${date} /home/ar0s/PROD_ERA5_ABL/job_cdogrid.sbatch ${p2D} ${dout}/${f2D}
 fi
 
 if [ ! -s ${dout}/${f3D} ]; then
   while [ $(squeue -u $USER -h -t pending,running -r | wc -l) -eq 100 ]; do echo "sleeping..."; sleep 10; done 
-  if [ ${date} -eq ${date_end} ]; then echo "wait..."; w="--wait"; fi
+  if [ ${date} -eq ${date_end} ]; then echo "waiting..."; w="--wait"; fi
   sbatch ${w} --job-name=cdogrid3D_${date} /home/ar0s/PROD_ERA5_ABL/job_cdogrid.sbatch ${p3D} ${dout}/${f3D}
   if [ -n "${w}" ]; then
     file_nb=$( eval "ls ${dout}/${f2D/${date}/${ym}??} 2>/dev/null" | wc -l )

subjob_cdomiss.sh

 #!/bin/bash
 
-set -xv
+set +xv
 
 date=$1
 day_end=$( date -d "${date:4:2}/1 + 1 month - 1 day" +"%d" )
@@ -19,11 +19,11 @@ for v in ${var_list[@]}; do
 
   if [ ! -s ${d}/${fout} ]; then
     while [ $(squeue -u $USER -h -t pending,running -r | wc -l) -eq 100 ]; do echo "sleeping..."; sleep 10; done 
-    if [[ ${date} -eq ${date_end} && ${v} == "humi" ]]; then echo "wait..."; w="--wait"; fi
+    if [[ ${date} -eq ${date_end} && ${v} == "humi" ]]; then echo "waiting..."; w="--wait"; fi
     sbatch ${w} --job-name=cdomiss_${date} /home/ar0s/PROD_ERA5_ABL/job_cdomiss.sbatch ${d}/${finp} ${d}/${fout}
     if [ -n "${w}" ]; then
       file_nb=$( eval "ls ${d}/{$(tr ' ' ',' <<< ${var_list[*]})}_${fabl/${date}/${ym}??} 2>/dev/null" | wc -l )
-      if [ $((day_nb*var_nb)) -eq ${file_nb} ]; then echo "OK"; exit 0; else echo "ERROR"; exit 1; fi
+      if [ $((day_nb*${#var_list[@]})) -eq ${file_nb} ]; then echo "OK"; exit 0; else echo "ERROR"; exit 1; fi
     fi
   fi
 

subjob_cdosplit.sh

@@ -24,7 +24,7 @@ file_nb=$( eval "ls ${dabl}/{$(tr ' ' ',' <<< ${var_list[*]})}_${fabl} 2>/dev/nu
 
 if [ ${file_nb} -lt ${var_nb} ]; then
   while [ $(squeue -u $USER -h -t pending,running -r | wc -l) -eq 100 ]; do echo "sleeping..."; sleep 10; done 
-  if [ ${date} -eq ${date_end} ]; then echo "wait..."; w="--wait"; fi
+  if [ ${date} -eq ${date_end} ]; then echo "waiting..."; w="--wait"; fi
   sbatch ${w} --job-name=cdosplit_${date} /home/ar0s/PROD_ERA5_ABL/job_cdosplit.sbatch $pabl
   if [ -n "${w}" ]; then
     file_nb=$( eval "ls ${dabl}/{$(tr ' ' ',' <<< ${var_list[*]})}_${fabl/${date}/${ym}??} 2>/dev/null" | wc -l )