From e2271bb5226f307e81da254efefcaa256d5e3b38 Mon Sep 17 00:00:00 2001 From: Elena.Budnik Date: Fri, 29 Jul 2016 10:17:30 +0200 Subject: [PATCH] work --- Bin.py/log | 9 +++++++++ Bin.py/run.py | 6 +++--- env.sh | 2 +- runRequest | 11 +---------- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 Bin.py/log diff --git a/Bin.py/log b/Bin.py/log new file mode 100644 index 0000000..d1111e1 --- /dev/null +++ b/Bin.py/log @@ -0,0 +1,9 @@ +2016-06-24 00:00:00 +2016-01-20 00:00:00 +New mission start : 2016-01-20T00:00:00 +New mission stop : 2016-06-24T00:00:00 +Database has to be updated +1 file will be producted +XML Start : 2016-01-01T00:00:00 +XML Stop : 2016-06-24T00:00:00 +You can work 4.5 hours in this session. diff --git a/Bin.py/run.py b/Bin.py/run.py index d93d33b..2ae0f0c 100755 --- a/Bin.py/run.py +++ b/Bin.py/run.py @@ -14,11 +14,10 @@ def main(): J2000REF = 946679400 # 2000-01-01T00:00:00 -30min # CHECK ARGS - checkArgs(4, 'Usage : python run.py (target) (plasma src) (Solar Wind XML config file)') + checkArgs(3, 'Usage : python run.py (target) (Solar Wind XML config file)') prefix = sys.argv[1] - src = sys.argv[2] - xmlFile = sys.argv[3] + xmlFile = sys.argv[2] start_time = myTime.time() @@ -30,6 +29,7 @@ def main(): # GET INFOS FROM XML CONFIG FILE start,stop,plasmaVi,srcVi,srcR,srcLon,tgtVi,tgtR,tgtLon = getXMLConfig(xmlFile) + src = plasmaVi.split('_')[0] # CREATE A DIRECTORY FOR THE NEW QUERY MYDIR = SW2DATA+'/'+src+'/'+prefix+'_'+datetime.now().strftime('%Y%m%d') diff --git a/env.sh b/env.sh index 87ff151..2b5bb13 100644 --- a/env.sh +++ b/env.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SOFT ROOT +# SOFT ROOT export SW2ROOT=/home/budnik/SolarWind export DDUSER=budnik diff --git a/runRequest b/runRequest index 2fcf79f..55ac71f 100755 --- a/runRequest +++ b/runRequest @@ -9,15 +9,6 @@ SwStop=$5 . $(dirname $BASH_SOURCE)/env.sh - case $src_vi in - omni_hour_all) - src=omni - ;; - ace_swepam_real) - src=ace - ;; - esac - # delete results of previous calculations rm -rf $SW2NC/$tgt* $SW2DATA/$src/$tgt* @@ -31,6 +22,6 @@ SwStop=$5 # run newly created Request for request in $REQ/$tgt*.xml do - python run.py $tgt $src $request & echo $! + python run.py $tgt $request & echo $! done \ No newline at end of file -- libgit2 0.21.2