fix malcolm issue

pmathiot · Nov 13, 2019 · 4118a46 · 4118a46
1 parent 82139e2
commit 4118a46
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/SCRIPT/get_data.bash b/SCRIPT/get_data.bash
@@ -3,10 +3,11 @@
 #SBATCH --time=20
 #SBATCH --ntasks=1
 
-RUNID=$1
-FREQ=$2
-TAG=$3
-GRID=$4
+CONFIG=$1
+RUNID=$2
+FREQ=$3
+TAG=$4
+GRID=$5
 
 . param.bash
 . ${SCRPATH}/common.bash

diff --git a/run_all.bash b/run_all.bash
@@ -29,10 +29,10 @@ for RUNID in `echo $RUNIDS`; do
       TAG09=${YEAR}0901-${YEAR}1001
 
       # get data 
-      mooVyid=$(sbatch --job-name=moo_${YEAR}_V --output=${JOBOUT_PATH}/moo_${YEAR}_V   ${SCRPATH}/get_data.bash $RUNID 1y $TAG   grid-V | awk '{print $4}')  # for mk_trp and mk_psi
-      mooUyid=$(sbatch --job-name=moo_${YEAR}_U --output=${JOBOUT_PATH}/moo_${YEAR}_U   ${SCRPATH}/get_data.bash $RUNID 1y $TAG   grid-U | awk '{print $4}')  # for mk_trp and mk_psi
-      mooTyid=$(sbatch --job-name=moo_${YEAR}_T --output=${JOBOUT_PATH}/moo_${YEAR}_T   ${SCRPATH}/get_data.bash $RUNID 1y $TAG   grid-T | awk '{print $4}')  # for mk_bot.bash
-      mooTmid=$(sbatch --job-name=moo_${YEAR}_T --output=${JOBOUT_PATH}/moo_${YEAR}_T09 ${SCRPATH}/get_data.bash $RUNID 1m $TAG09 grid-T | awk '{print $4}')  # for mk_mxl.bash
+      mooVyid=$(sbatch --job-name=moo_${YEAR}_V --output=${JOBOUT_PATH}/moo_${YEAR}_V   ${SCRPATH}/get_data.bash $CONFIG $RUNID 1y $TAG   grid-V | awk '{print $4}')  # for mk_trp and mk_psi
+      mooUyid=$(sbatch --job-name=moo_${YEAR}_U --output=${JOBOUT_PATH}/moo_${YEAR}_U   ${SCRPATH}/get_data.bash $CONFIG $RUNID 1y $TAG   grid-U | awk '{print $4}')  # for mk_trp and mk_psi
+      mooTyid=$(sbatch --job-name=moo_${YEAR}_T --output=${JOBOUT_PATH}/moo_${YEAR}_T   ${SCRPATH}/get_data.bash $CONFIG $RUNID 1y $TAG   grid-T | awk '{print $4}')  # for mk_bot.bash
+      mooTmid=$(sbatch --job-name=moo_${YEAR}_T --output=${JOBOUT_PATH}/moo_${YEAR}_T09 ${SCRPATH}/get_data.bash $CONFIG $RUNID 1m $TAG09 grid-T | awk '{print $4}')  # for mk_mxl.bash
 
       # run cdftools
       # scheduler option

diff --git a/style.db b/style.db
@@ -5,3 +5,5 @@
  u-ar685   | GC3.1N96025  | --       | sienna         |
  u-bj000   | GC4.0N96025  | --       | sandybrown     |
  u-bn477   | GC5.0N96025  | --       | royalblue      |
+ u-bo738   | GC3.1botfri  | --       | royalblue      |
+ u-bc970   | GC3.1        | --       | cornflowerblue |