Changeset ca867de in flex_extract.git for run

Timestamp:

Oct 5, 2018, 3:35:18 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

5bad6ec

Parents:

27fe969

Message:

refactored functions in EcFlexpart? and did some minor changes

Location:

run

Files:

• control/CONTROL.req.test (added)
• control/CONTROL.temp (modified) (1 diff)
• jobscripts/job.ksh (modified) (6 diffs)
• run.sh (modified) (1 diff, 1 prop)

run/control/CONTROL.temp

@@ -15 +15 @@
 RIGHT 45000
 LEVEL 60
-LEVELIST 55/to/60
+LEVELIST 40/to/60
 RESOL 63
 GAUSS 1

run/jobscripts/job.ksh

@@ -33 +33 @@
   module load grib_api/1.14.5
   module load emos/437-r64
-  export PATH=${PATH}:${HOME}/flex_extract_v7.1/python
+  export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
   ;;
   *cca*)
@@ -41 +41 @@
   module load python
   export SCRATCH=$TMPDIR
-  export PATH=${PATH}:${HOME}/flex_extract_v7.1/python
+  export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
   ;;
 esac
@@ -49 +49 @@
 cd python$$
 
-export CONTROL=$PWD/CONTROL
+export CONTROL=CONTROL
 
 cat >$CONTROL<<EOF
-accuracy 24
+accuracy 16
 addpar 186 187 188 235 139 39 
 area 
 basetime None
-controlfile CONTROL.test
+controlfile CONTROL.temp
 cwc 0
 date_chunk 3
@@ -68 +68 @@
 ectrans 1
 ecuid km4a
-end_date 20160606
+end_date 20120908
 eta 0
 etadiff 0
@@ -78 +78 @@
 grib2flexpart 0
 grid 5000
-inputdir ../work
+inputdir ../../run/workspace/test
 install_target None
 job_template job.temp
-left -10000
+left -15000
 level 60
-levelist 59/to/60
+levelist 40/to/60
 logicals gauss omega omegadiff eta etadiff dpdeta cwc wrf grib2flexpart ecstorage ectrans debug request 
 lower 30000
@@ -94 +94 @@
 omega 0
 omegadiff 0
-outputdir ../work
-prefix EItest_
-queue ecgate
+outputdir ../../run/workspace/test
+ppid 41511
+prefix EI
+queue local
 request 1
 resol 63
-right 10000
+right 45000
 smooth 0
-start_date 20160606
+start_date 20120908
 step 00 01 02 03 04 05 00 07 08 09 10 11 00 01 02 03 04 05 00 07 08 09 10 11 
 stream OPER
 time 00 00 00 00 00 00 06 00 00 00 00 00 12 12 12 12 12 12 18 12 12 12 12 12 
 type AN FC FC FC FC FC AN FC FC FC FC FC AN FC FC FC FC FC AN FC FC FC FC FC 
-upper 40000
+upper 75000
 wrf 0
 EOF

run/run.sh

@@ -1 +1 @@
 #!/bin/bash
- 
-pyscript = ../python/submit.py
+#
+# @Author: Anne Philipp
+#
+# @Date: October, 4 2018
+#
+# @Description: 
+#
 
+
+# -----------------------------------------------------------------
+# AVAILABLE COMMANDLINE ARGUMENTS TO SET
+#
+# THE USER HAS TO SPECIFY THESE PARAMETER
+#
+
+QUEUE=None
+START_DATE='20120908'
+END_DATE=None
+DATE_CHUNK=None
+BASETIME=None
+STEP=None
+LEVELIST=None
+AREA=None
+INPUTDIR='../../run/workspace/test'
+OUTPUTDIR=None
+FLEXPART_ROOT_SCRIPTS=None 
+PP_ID=None
+JOB_TEMPLATE='job.temp' 
+CONTROLFILE='CONTROL.temp' 
+DEBUG=1 
+REQUEST=1
+
+# -----------------------------------------------------------------
+#
+# AFTER THIS LINE THE USER DOES NOT HAVE TO CHANGE ANYTHING !!!
+#
+# -----------------------------------------------------------------
+
+# PATH TO SUBMISSION SCRIPT
+pyscript=../source/python/submit.py
+
+# INITIALIZE EMPTY PARAMETERLIST
+parameterlist=""
+
+# CHECK FOR MORE PARAMETER 
+if [ -n "$START_DATE" ]; then
+  parameterlist+=" --start_date=$START_DATE"
+fi
+if [ -n "$END_DATE" ]; then
+  parameterlist+=" --end_date=$END_DATE"
+fi
+if [ -n "$DATE_CHUNK" ]; then
+  parameterlist+=" --date_chunk=$DATE_CHUNK"
+fi
+if [ -n "$BASETIME" ]; then
+  parameterlist+=" --basetime=$BASETIME"
+fi
+if [ -n "$STEP" ]; then
+  parameterlist+=" --step=$STEP"
+fi
+if [ -n "$LEVELIST" ]; then
+  parameterlist+=" --levelist=$LEVELIST"
+fi
+if [ -n "$AREA" ]; then
+  parameterlist+=" --area=$AREA"
+fi
+if [ -n "$INPUTDIR" ]; then
+  parameterlist+=" --inputdir=$INPUTDIR"
+fi
+if [ -n "$OUTPUTDIR" ]; then
+  parameterlist+=" --outputdir=$OUTPUTDIR"
+fi
+if [ -n "$FLEXPART_ROOT_SCRIPTS" ]; then
+  parameterlist+=" --flexpart_root_scripts=$FLEXPART_ROOT_SCRIPTS"
+fi
+if [ -n "$PP_ID" ]; then
+  parameterlist+=" --ppid=$PP_ID"
+fi
+if [ -n "$JOB_TEMPLATE" ]; then
+  parameterlist+=" --job_template=$JOB_TEMPLATE"
+fi
+if [ -n "$QUEUE" ]; then
+  parameterlist+=" --queue=$QUEUE"
+fi
+if [ -n "$CONTROLFILE" ]; then
+  parameterlist+=" --controlfile=$CONTROLFILE"
+fi
+if [ -n "$DEBUG" ]; then
+  parameterlist+=" --debug=$DEBUG"
+fi
+if [ -n "$REQUEST" ]; then
+  parameterlist+=" --request=$REQUEST"
+fi
+
+# -----------------------------------------------------------------
+# CALL INSTALLATION SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
+
+$pyscript $parameterlist
+