From b02a07e92bd322edac5c617854791e5cc0e14990 Mon Sep 17 00:00:00 2001
From: Anne Philipp <anne.philipp@univie.ac.at>
Date: Sun, 17 Feb 2019 10:58:07 +0100
Subject: [PATCH] updated temporarily unchanged files (update-index) of
everchanging files for a merge
---
run/jobscripts/compilejob.ksh | 10 +++---
run/jobscripts/job.ksh | 57 +++++++++++++++++++----------------
run/run.sh | 23 ++++++++------
run/run_local.sh | 18 ++++++-----
templates/compilejob.template | 10 +++---
templates/job.temp | 43 +++++++++++++-------------
templates/job.template | 43 +++++++++++++-------------
7 files changed, 109 insertions(+), 95 deletions(-)
diff --git a/run/jobscripts/compilejob.ksh b/run/jobscripts/compilejob.ksh
index 5d79c55..add708a 100644
--- a/run/jobscripts/compilejob.ksh
+++ b/run/jobscripts/compilejob.ksh
@@ -27,18 +27,18 @@ set -x
export VERSION=7.1
case ${HOST} in
*ecg*)
- module unload eccodes
-# module load python
module unload grib_api
+ module unload eccodes
+ module load eccodes
+ module load python
module unload emos
- module load grib_api/1.27.0
- module load emos/457-r64
+ module load emos/455-r64
export FLEXPART_ROOT_SCRIPTS=${HOME}
export MAKEFILE=Makefile.gfortran
;;
*cca*)
module switch PrgEnv-cray PrgEnv-intel
- module load grib_api
+ module load eccodes
module load emos
module load python
echo ${GROUP}
diff --git a/run/jobscripts/job.ksh b/run/jobscripts/job.ksh
index fe162c9..27f9022 100644
--- a/run/jobscripts/job.ksh
+++ b/run/jobscripts/job.ksh
@@ -30,15 +30,14 @@ case ${HOST} in
module load python
module unload grib_api
module unload eccodes
+ module load eccodes
module unload emos
-# module load grib_api/1.27.0
- module load grib_api/1.14.5
- module load emos/457-r64
+ module load emos/455-r64
export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
;;
*cca*)
module switch PrgEnv-cray PrgEnv-intel
- module load grib_api
+ module load eccodes
module load emos
module load python
export SCRATCH=${TMPDIR}
@@ -54,67 +53,73 @@ export CONTROL=CONTROL
cat >${CONTROL}<<EOF
accmaxstep 12
-acctime 06/18
+acctime 00/12
acctype FC
accuracy 24
-addpar 186 187 188 235 139 39
-area
+addpar /186/187/188/235/139/39
+area 61.2/-10.0/36.0/32.0
basetime None
-controlfile CONTROL_EA5.testgrid
+controlfile CONTROL_OD.fastnet
cwc 0
dataset None
date_chunk 3
-debug 1
+debug 0
destination annep@genericSftp
dpdeta 1
dtime 1
+ecapi None
ecfsdir ectmp:/${USER}/econdemand/
ecgid at
ecstorage 0
ectrans 1
ecuid km4a
-end_date 20090108
+end_date 20190212
eta 1
etadiff 0
etapar 77
expver 1
-format GRIB1
+format GRIB2
gateway srvx8.img.univie.ac.at
gauss 0
gaussian
grib2flexpart 0
-grid 1000
+grid 0.1/0.1
inputdir /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/run/workspace
install_target None
+job_chunk 1
job_template job.temp
-left -5000
+left -10.0
level 137
-levelist 100/to/137
-logicals gauss omega omegadiff eta etadiff dpdeta cwc wrf grib2flexpart ecstorage ectrans debug request public
-lower 10000
+levelist 1/to/137
+logicals gauss omega omegadiff eta etadiff dpdeta cwc wrf grib2flexpart ecstorage ectrans debug oper request public purefc rrint
+lower 36.0
mailfail ${USER}
mailops ${USER}
makefile Makefile.gfortran
-marsclass EA
-maxstep 0
+marsclass OD
+maxstep 11
number OFF
omega 0
omegadiff 0
+oper 0
outputdir /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/run/workspace
-prefix EA
+prefix EN
public 0
+purefc 0
queue ecgate
request 2
-resol 159
-right 5000
+resol 1279
+right 32.0
+rrint 0
smooth 0
-start_date 20090108
-step 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+start_date 20190212
+step 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
stream OPER
-time 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
-type AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN
-upper 20000
+time 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
+type AN FC FC FC FC FC FC FC FC FC FC FC AN FC FC FC FC FC FC FC FC FC FC FC
+upper 61.2
wrf 0
+
EOF
diff --git a/run/run.sh b/run/run.sh
index 9034084..658153c 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -11,24 +11,24 @@
# -----------------------------------------------------------------
# AVAILABLE COMMANDLINE ARGUMENTS TO SET
#
-# THE USER HAS TO SPECIFY THESE PARAMETER
-#
+# THE USER HAS TO SPECIFY THESE PARAMETERS:
QUEUE='ecgate'
-START_DATE='20090108'
-END_DATE=None
+START_DATE=20190212
+END_DATE=20190212
DATE_CHUNK=None
+JOB_CHUNK=1
BASETIME=None
STEP=None
LEVELIST=None
AREA=None
INPUTDIR=''
OUTPUTDIR=None
-FLEXPART_ROOT_SCRIPTS=None
+FLEXPARTDIR=None
PP_ID=None
JOB_TEMPLATE='job.temp'
-CONTROLFILE='CONTROL_EA5.testgrid'
-DEBUG=1
+CONTROLFILE='CONTROL_OD.fastnet'
+DEBUG=0
REQUEST=2
PUBLIC=0
@@ -54,6 +54,9 @@ fi
if [ -n "$DATE_CHUNK" ]; then
parameterlist+=" --date_chunk=$DATE_CHUNK"
fi
+if [ -n "$JOB_CHUNK" ]; then
+ parameterlist+=" --job_chunk=$JOB_CHUNK"
+fi
if [ -n "$BASETIME" ]; then
parameterlist+=" --basetime=$BASETIME"
fi
@@ -72,8 +75,8 @@ fi
if [ -n "$OUTPUTDIR" ]; then
parameterlist+=" --outputdir=$OUTPUTDIR"
fi
-if [ -n "$FLEXPART_ROOT_SCRIPTS" ]; then
- parameterlist+=" --flexpart_root_scripts=$FLEXPART_ROOT_SCRIPTS"
+if [ -n "$FLEXPARTDIR" ]; then
+ parameterlist+=" --flexpartdir=$FLEXPARTDIR"
fi
if [ -n "$PP_ID" ]; then
parameterlist+=" --ppid=$PP_ID"
@@ -98,7 +101,7 @@ if [ -n "$PUBLIC" ]; then
fi
# -----------------------------------------------------------------
-# CALL INSTALLATION SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
+# CALL SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
$pyscript $parameterlist
diff --git a/run/run_local.sh b/run/run_local.sh
index b869a00..72e95a3 100755
--- a/run/run_local.sh
+++ b/run/run_local.sh
@@ -18,18 +18,19 @@ QUEUE=''
START_DATE='20090108'
END_DATE=None
DATE_CHUNK=None
+JOB_CHUNK=None
BASETIME=None
STEP=None
LEVELIST=None
AREA=None
-INPUTDIR='./workspace/EA5test'
+INPUTDIR='./workspace'
OUTPUTDIR=None
-FLEXPART_ROOT_SCRIPTS=None
+FLEXPARTDIR=None
PP_ID=None
JOB_TEMPLATE=''
-CONTROLFILE='CONTROL_EA5.testgrid'
+CONTROLFILE='CONTROL_CERA.testgrid'
DEBUG=1
-REQUEST=2
+REQUEST=1
PUBLIC=0
# -----------------------------------------------------------------
@@ -54,6 +55,9 @@ fi
if [ -n "$DATE_CHUNK" ]; then
parameterlist+=" --date_chunk=$DATE_CHUNK"
fi
+if [ -n "$JOB_CHUNK" ]; then
+ parameterlist+=" --job_chunk=$JOB_CHUNK"
+fi
if [ -n "$BASETIME" ]; then
parameterlist+=" --basetime=$BASETIME"
fi
@@ -72,8 +76,8 @@ fi
if [ -n "$OUTPUTDIR" ]; then
parameterlist+=" --outputdir=$OUTPUTDIR"
fi
-if [ -n "$FLEXPART_ROOT_SCRIPTS" ]; then
- parameterlist+=" --flexpart_root_scripts=$FLEXPART_ROOT_SCRIPTS"
+if [ -n "$FLEXPARTDIR" ]; then
+ parameterlist+=" --flexpartdir=$FLEXPARTDIR"
fi
if [ -n "$PP_ID" ]; then
parameterlist+=" --ppid=$PP_ID"
@@ -98,7 +102,7 @@ if [ -n "$PUBLIC" ]; then
fi
# -----------------------------------------------------------------
-# CALL INSTALLATION SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
+# CALL SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
$pyscript $parameterlist
diff --git a/templates/compilejob.template b/templates/compilejob.template
index 0ae8577..f798477 100644
--- a/templates/compilejob.template
+++ b/templates/compilejob.template
@@ -27,18 +27,18 @@ set -x
export VERSION=$version_number
case $${HOST} in
*ecg*)
- module unload eccodes
-# module load python
module unload grib_api
+ module unload eccodes
+ module load eccodes
+ module load python
module unload emos
- module load grib_api/1.26.1
- module load emos/457-r64
+ module load emos/455-r64
export FLEXPART_ROOT_SCRIPTS=$fp_root_scripts
export MAKEFILE=$makefile
;;
*cca*)
module switch PrgEnv-cray PrgEnv-intel
- module load grib_api
+ module load eccodes
module load emos
module load python
echo $${GROUP}
diff --git a/templates/job.temp b/templates/job.temp
index 8941171..f0d8564 100644
--- a/templates/job.temp
+++ b/templates/job.temp
@@ -16,7 +16,7 @@
##PBS -N flex_ecmwf
##PBS -q np
##PBS -S /usr/bin/ksh
-## -o /scratch/ms/at/km4a/flex_ecmwf.${PBS_JOBID}.out
+## -o /scratch/ms/at/km4a/flex_ecmwf.$${PBS_JOBID}.out
## job output is in .ecaccess_DO_NOT_REMOVE
##PBS -j oe
##PBS -V
@@ -25,53 +25,54 @@
set -x
export VERSION=7.1
-case ${HOST} in
+case $${HOST} in
*ecg*)
module load python
module unload grib_api
module unload eccodes
+ module load eccodes
module unload emos
- module load grib_api/1.26.1
- module load emos/457-r64
- export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
+ module load emos/455-r64
+ export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/source/python
;;
*cca*)
module switch PrgEnv-cray PrgEnv-intel
- module load grib_api
+ module load eccodes
module load emos
module load python
- export SCRATCH=${TMPDIR}
- export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
+ export SCRATCH=$${TMPDIR}
+ export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/source/python
;;
esac
-cd ${SCRATCH}
-mkdir -p python$$
-cd python$$
+cd $${SCRATCH}
+mkdir -p python$$$$
+cd python$$$$
export CONTROL=CONTROL
-cat >${CONTROL}<<EOF
+cat >$${CONTROL}<<EOF
+$control_content
EOF
-submit.py --controlfile=${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
+submit.py --controlfile=$${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
if [ $? -eq 0 ] ; then
l=0
- for muser in `grep -i MAILOPS ${CONTROL}`; do
- if [ ${l} -gt 0 ] ; then
- mail -s flex.${HOST}.$$ ${muser} <prot
+ for muser in `grep -i MAILOPS $${CONTROL}`; do
+ if [ $${l} -gt 0 ] ; then
+ mail -s flex.$${HOST}.$$$$ $${muser} <prot
fi
- l=$((${l}+1))
+ l=$(($${l}+1))
done
else
l=0
- for muser in `grep -i MAILFAIL ${CONTROL}`; do
- if [ ${l} -gt 0 ] ; then
- mail -s "ERROR! flex.${HOST}.$$" ${muser} <prot
+ for muser in `grep -i MAILFAIL $${CONTROL}`; do
+ if [ $${l} -gt 0 ] ; then
+ mail -s "ERROR! flex.$${HOST}.$$$$" $${muser} <prot
fi
- l=$((${l}+1))
+ l=$(($${l}+1))
done
fi
diff --git a/templates/job.template b/templates/job.template
index cf262d7..5f12a0b 100644
--- a/templates/job.template
+++ b/templates/job.template
@@ -16,7 +16,7 @@
##PBS -N flex_ecmwf
##PBS -q np
##PBS -S /usr/bin/ksh
-## -o /scratch/ms/$usergroup/$username/flex_ecmwf.$${PBS_JOBID}.out
+## -o /scratch/ms/$usergroup/$username/flex_ecmwf.$$$${PBS_JOBID}.out
## job output is in .ecaccess_DO_NOT_REMOVE
##PBS -j oe
##PBS -V
@@ -25,53 +25,54 @@
set -x
export VERSION=$version_number
-case $${HOST} in
+case $$$${HOST} in
*ecg*)
module load python
module unload grib_api
module unload eccodes
+ module load eccodes
module unload emos
- module load grib_api/1.26.1
- module load emos/457-r64
- export PATH=$${PATH}:$fp_root_path
+ module load emos/455-r64
+ export PATH=$$$${PATH}:$fp_root_path
;;
*cca*)
module switch PrgEnv-cray PrgEnv-intel
- module load grib_api
+ module load eccodes
module load emos
module load python
- export SCRATCH=$${TMPDIR}
- export PATH=$${PATH}:$fp_root_path
+ export SCRATCH=$$$${TMPDIR}
+ export PATH=$$$${PATH}:$fp_root_path
;;
esac
-cd $${SCRATCH}
-mkdir -p python$$$$
-cd python$$$$
+cd $$$${SCRATCH}
+mkdir -p python$$$$$$$$
+cd python$$$$$$$$
export CONTROL=CONTROL
-cat >$${CONTROL}<<EOF
+cat >$$$${CONTROL}<<EOF
+$$control_content
EOF
-submit.py --controlfile=$${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
+submit.py --controlfile=$$$${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
if [ $? -eq 0 ] ; then
l=0
- for muser in `grep -i MAILOPS $${CONTROL}`; do
- if [ $${l} -gt 0 ] ; then
- mail -s flex.$${HOST}.$$$$ $${muser} <prot
+ for muser in `grep -i MAILOPS $$$${CONTROL}`; do
+ if [ $$$${l} -gt 0 ] ; then
+ mail -s flex.$$$${HOST}.$$$$$$$$ $$$${muser} <prot
fi
- l=$(($${l}+1))
+ l=$(($$$${l}+1))
done
else
l=0
- for muser in `grep -i MAILFAIL $${CONTROL}`; do
- if [ $${l} -gt 0 ] ; then
- mail -s "ERROR! flex.$${HOST}.$$$$" $${muser} <prot
+ for muser in `grep -i MAILFAIL $$$${CONTROL}`; do
+ if [ $$$${l} -gt 0 ] ; then
+ mail -s "ERROR! flex.$$$${HOST}.$$$$$$$$" $$$${muser} <prot
fi
- l=$(($${l}+1))
+ l=$(($$$${l}+1))
done
fi
--
GitLab