diff --git a/full_prod.sh b/full_prod.sh index ee7fd6dcfd32f910b3c364e324679851904131b0..222c1dab66b7e2cc95fd87141748f225d3bd834c 100755 --- a/full_prod.sh +++ b/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 diff --git a/job_cdogrid.sbatch b/job_cdogrid.sbatch index 5b13bd701b3fa45c401657029cf936b06a1c6349..f716b032822f622c1d51df050877fcc58ef34a87 100755 --- a/job_cdogrid.sbatch +++ b/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} diff --git a/job_cdomiss.sbatch b/job_cdomiss.sbatch index 1d563f34f4e3a9ecd2cbef49d074fd57238acb16..b13aa20c6a709975b09c03f3ad9794b89fe0593c 100755 --- a/job_cdomiss.sbatch +++ b/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 diff --git a/subjob_ablhpg.sh b/subjob_ablhpg.sh index f04393074101b0b15d208b74d50dee9ae8ddc6c3..7b86e1432b34398c5b9ac09e987570f299223276 100755 --- a/subjob_ablhpg.sh +++ b/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 ) diff --git a/subjob_ablvint.sh b/subjob_ablvint.sh index 646e5a9f95833a50052b763eafc65efd983942e9..365c8fed60e9281089a187de5433cce16ceafb67 100755 --- a/subjob_ablvint.sh +++ b/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 ) diff --git a/subjob_cdogrid.sh b/subjob_cdogrid.sh index b775e419f03500c82692fa9b4a1e289ddee2f1dd..53d91d56aeacec1ea613e35cfee4aa417157f185 100755 --- a/subjob_cdogrid.sh +++ b/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 ) diff --git a/subjob_cdomiss.sh b/subjob_cdomiss.sh index 61e771515e9e39daf26b302b425350fac3e11c53..947425af8d106d57031233627b32634090737edd 100755 --- a/subjob_cdomiss.sh +++ b/subjob_cdomiss.sh @@ -1,6 +1,6 @@ #!/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 diff --git a/subjob_cdosplit.sh b/subjob_cdosplit.sh index cf4433ba6b37565e322d47e56a74ec364090d02a..887244e30e76b03411fda926386816891405c088 100755 --- a/subjob_cdosplit.sh +++ b/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 )