From 6422d9042480ef78c310e0d3e494ec2fd6f7b042 Mon Sep 17 00:00:00 2001
From: Guillaume S <gsamson@mercator-ocean.fr>
Date: Fri, 24 Nov 2023 11:12:20 +0100
Subject: [PATCH] minor update
---
full_prod.sh | 2 ++
job_cdogrid.sbatch | 4 ++--
job_cdomiss.sbatch | 5 +++--
subjob_ablhpg.sh | 2 +-
subjob_ablvint.sh | 2 +-
subjob_cdogrid.sh | 4 ++--
subjob_cdomiss.sh | 6 +++---
subjob_cdosplit.sh | 2 +-
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/full_prod.sh b/full_prod.sh
index ee7fd6d..222c1da 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 5b13bd7..f716b03 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 1d563f3..b13aa20 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 f043930..7b86e14 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 646e5a9..365c8fe 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 b775e41..53d91d5 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 61e7715..947425a 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 cf4433b..887244e 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 )
--
GitLab