removed parameter from python program call / minor modifications in user settings (irrelevant)

run/run.sh

@@ -10,25 +10,24 @@
 
 # -----------------------------------------------------------------
 # AVAILABLE COMMANDLINE ARGUMENTS TO SET
-#
+# 
 # THE USER HAS TO SPECIFY THESE PARAMETERS:
 
 QUEUE='ecgate'
-START_DATE=20190215
-END_DATE=20190215
+START_DATE=None
+END_DATE=None
 DATE_CHUNK=None
-JOB_CHUNK=1
+JOB_CHUNK=3
 BASETIME=None
 STEP=None
 LEVELIST=None
 AREA=None
-INPUTDIR=''
+INPUTDIR=None
 OUTPUTDIR=None
-FLEXPARTDIR=None 
 PP_ID=None
 JOB_TEMPLATE='job.temp' 
-CONTROLFILE='CONTROL_OD.fastnet' 
-DEBUG=0 
+CONTROLFILE='CONTROL_CERA' 
+DEBUG=1
 REQUEST=2
 PUBLIC=0
 
@@ -39,7 +38,7 @@ PUBLIC=0
 # -----------------------------------------------------------------
 
 # PATH TO SUBMISSION SCRIPT
-pyscript=../source/python/submit.py
+pyscript=../Source/Python/submit.py
 
 # INITIALIZE EMPTY PARAMETERLIST
 parameterlist=""
@@ -75,9 +74,6 @@ fi
 if [ -n "$OUTPUTDIR" ]; then
   parameterlist+=" --outputdir=$OUTPUTDIR"
 fi
-if [ -n "$FLEXPARTDIR" ]; then
-  parameterlist+=" --flexpartdir=$FLEXPARTDIR"
-fi
 if [ -n "$PP_ID" ]; then
   parameterlist+=" --ppid=$PP_ID"
 fi

run/run_local.sh

-#!/bin/bash
-#
-# @Author: Anne Philipp
-#
-# @Date: October, 4 2018
-#
-# @Description: 
-#
-
-
-# -----------------------------------------------------------------
-# AVAILABLE COMMANDLINE ARGUMENTS TO SET
-#
-# THE USER HAS TO SPECIFY THESE PARAMETER
-#
-
-QUEUE=''
-START_DATE='20090108'
-END_DATE=None
-DATE_CHUNK=None
-JOB_CHUNK=None
-BASETIME=None
-STEP=None
-LEVELIST=None
-AREA=None
-INPUTDIR='./workspace'
-OUTPUTDIR=None
-FLEXPARTDIR=None 
-PP_ID=None
-JOB_TEMPLATE='' 
-CONTROLFILE='CONTROL_CERA.testgrid' 
-DEBUG=1 
-REQUEST=1
-PUBLIC=0
-
-# -----------------------------------------------------------------
-#
-# 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 "$JOB_CHUNK" ]; then
-  parameterlist+=" --job_chunk=$JOB_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 "$FLEXPARTDIR" ]; then
-  parameterlist+=" --flexpartdir=$FLEXPARTDIR"
-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
-if [ -n "$PUBLIC" ]; then
-  parameterlist+=" --public=$PUBLIC"
-fi
-
-# -----------------------------------------------------------------
-# CALL SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
-
-$pyscript $parameterlist
-

setup.sh

@@ -5,12 +5,16 @@
 # @Date: September, 10 2018
 #
 # @Description: 
+#    This file defines the flex_extract's available installation
+#    parameters and puts them together for the call of the actual 
+#    python installation script. 
+#    It also does some checks to guarantees necessary parameters 
+#    were set.
 #
-
 # -----------------------------------------------------------------
 # AVAILABLE COMMANDLINE ARGUMENTS TO SET
 #
-# THE USER HAS TO SPECIFY THESE PARAMETER
+# THE USER HAS TO SPECIFY THESE PARAMETERS
 #
 TARGET='ecgate'
 MAKEFILE='Makefile.gfortran'
@@ -18,9 +22,9 @@ ECUID='km4a'
 ECGID='at'
 GATEWAY='srvx8.img.univie.ac.at'
 DESTINATION='annep@genericSftp'
-FLEXPARTDIR=""
-JOB_TEMPLATE="job.template"
-CONTROLFILE="CONTROL_EA5.testgrid"
+INSTALLDIR=None
+JOB_TEMPLATE=''
+CONTROLFILE='CONTROL_EA5'
 # -----------------------------------------------------------------
 #
 # AFTER THIS LINE THE USER DOES NOT HAVE TO CHANGE ANYTHING !!!
@@ -28,7 +32,7 @@ CONTROLFILE="CONTROL_EA5.testgrid"
 # -----------------------------------------------------------------
 
 # PATH TO INSTALLATION SCRIPT
-script="source/python/install.py"
+script="Source/Python/install.py"
 
 # INITIALIZE EMPTY PARAMETERLIST
 parameterlist=""
@@ -71,7 +75,3 @@ fi
 
 $script $parameterlist
 
-# -----------------------------------------------------------------
-# CALL INSTALLATION TESTS
-
-# TODO !!!!