Changeset b02a07e in flex_extract.git


Ignore:
Timestamp:
Feb 17, 2019, 9:58:07 AM (5 weeks ago)
Author:
Anne Philipp <anne.philipp@…>
Branches:
dev
Children:
df87f0c
Parents:
61fdc35
Message:

updated temporarily unchanged files (update-index) of everchanging files for a merge

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • run/jobscripts/compilejob.ksh

    rc97d8ec rb02a07e  
    2828case ${HOST} in
    2929  *ecg*)
     30  module unload grib_api
    3031  module unload eccodes
    31 #  module load python
    32   module unload grib_api
     32  module load eccodes
     33  module load python
    3334  module unload emos
    34   module load grib_api/1.27.0
    35   module load emos/457-r64
     35  module load emos/455-r64
    3636  export FLEXPART_ROOT_SCRIPTS=${HOME}
    3737  export MAKEFILE=Makefile.gfortran
     
    3939  *cca*)
    4040  module switch PrgEnv-cray PrgEnv-intel
    41   module load grib_api
     41  module load eccodes
    4242  module load emos
    4343  module load python
  • run/jobscripts/job.ksh

    re585e1b rb02a07e  
    3131  module unload grib_api
    3232  module unload eccodes
     33  module load eccodes
    3334  module unload emos
    34 #  module load grib_api/1.27.0
    35   module load grib_api/1.14.5
    36   module load emos/457-r64
     35  module load emos/455-r64
    3736  export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
    3837  ;;
    3938  *cca*)
    4039  module switch PrgEnv-cray PrgEnv-intel
    41   module load grib_api
     40  module load eccodes
    4241  module load emos
    4342  module load python
     
    5554cat >${CONTROL}<<EOF
    5655accmaxstep 12
    57 acctime 06/18
     56acctime 00/12
    5857acctype FC
    5958accuracy 24
    60 addpar 186 187 188 235 139 39
    61 area
     59addpar /186/187/188/235/139/39
     60area 61.2/-10.0/36.0/32.0
    6261basetime None
    63 controlfile CONTROL_EA5.testgrid
     62controlfile CONTROL_OD.fastnet
    6463cwc 0
    6564dataset None
    6665date_chunk 3
    67 debug 1
     66debug 0
    6867destination annep@genericSftp
    6968dpdeta 1
    7069dtime 1
     70ecapi None
    7171ecfsdir ectmp:/${USER}/econdemand/
    7272ecgid at
     
    7474ectrans 1
    7575ecuid km4a
    76 end_date 20090108
     76end_date 20190212
    7777eta 1
    7878etadiff 0
    7979etapar 77
    8080expver 1
    81 format GRIB1
     81format GRIB2
    8282gateway srvx8.img.univie.ac.at
    8383gauss 0
    8484gaussian
    8585grib2flexpart 0
    86 grid 1000
     86grid 0.1/0.1
    8787inputdir /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/run/workspace
    8888install_target None
     89job_chunk 1
    8990job_template job.temp
    90 left -5000
     91left -10.0
    9192level 137
    92 levelist 100/to/137
    93 logicals gauss omega omegadiff eta etadiff dpdeta cwc wrf grib2flexpart ecstorage ectrans debug request public
    94 lower 10000
     93levelist 1/to/137
     94logicals gauss omega omegadiff eta etadiff dpdeta cwc wrf grib2flexpart ecstorage ectrans debug oper request public purefc rrint
     95lower 36.0
    9596mailfail ${USER}
    9697mailops ${USER}
    9798makefile Makefile.gfortran
    98 marsclass EA
    99 maxstep 0
     99marsclass OD
     100maxstep 11
    100101number OFF
    101102omega 0
    102103omegadiff 0
     104oper 0
    103105outputdir /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/run/workspace
    104 prefix EA
     106prefix EN
    105107public 0
     108purefc 0
    106109queue ecgate
    107110request 2
    108 resol 159
    109 right 5000
     111resol 1279
     112right 32.0
     113rrint 0
    110114smooth 0
    111 start_date 20090108
    112 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
     115start_date 20190212
     116step 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
    113117stream OPER
    114 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
    115 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
    116 upper 20000
     118time 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
     119type AN FC FC FC FC FC FC FC FC FC FC FC AN FC FC FC FC FC FC FC FC FC FC FC
     120upper 61.2
    117121wrf 0
     122
    118123EOF
    119124
  • run/run.sh

    rc97d8ec rb02a07e  
    1212# AVAILABLE COMMANDLINE ARGUMENTS TO SET
    1313#
    14 # THE USER HAS TO SPECIFY THESE PARAMETER
    15 #
     14# THE USER HAS TO SPECIFY THESE PARAMETERS:
    1615
    1716QUEUE='ecgate'
    18 START_DATE='20090108'
    19 END_DATE=None
     17START_DATE=20190212
     18END_DATE=20190212
    2019DATE_CHUNK=None
     20JOB_CHUNK=1
    2121BASETIME=None
    2222STEP=None
     
    2525INPUTDIR=''
    2626OUTPUTDIR=None
    27 FLEXPART_ROOT_SCRIPTS=None
     27FLEXPARTDIR=None
    2828PP_ID=None
    2929JOB_TEMPLATE='job.temp'
    30 CONTROLFILE='CONTROL_EA5.testgrid'
    31 DEBUG=1
     30CONTROLFILE='CONTROL_OD.fastnet'
     31DEBUG=0
    3232REQUEST=2
    3333PUBLIC=0
     
    5555  parameterlist+=" --date_chunk=$DATE_CHUNK"
    5656fi
     57if [ -n "$JOB_CHUNK" ]; then
     58  parameterlist+=" --job_chunk=$JOB_CHUNK"
     59fi
    5760if [ -n "$BASETIME" ]; then
    5861  parameterlist+=" --basetime=$BASETIME"
     
    7376  parameterlist+=" --outputdir=$OUTPUTDIR"
    7477fi
    75 if [ -n "$FLEXPART_ROOT_SCRIPTS" ]; then
    76   parameterlist+=" --flexpart_root_scripts=$FLEXPART_ROOT_SCRIPTS"
     78if [ -n "$FLEXPARTDIR" ]; then
     79  parameterlist+=" --flexpartdir=$FLEXPARTDIR"
    7780fi
    7881if [ -n "$PP_ID" ]; then
     
    99102
    100103# -----------------------------------------------------------------
    101 # CALL INSTALLATION SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
     104# CALL SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
    102105
    103106$pyscript $parameterlist
  • run/run_local.sh

    re585e1b rb02a07e  
    1919END_DATE=None
    2020DATE_CHUNK=None
     21JOB_CHUNK=None
    2122BASETIME=None
    2223STEP=None
    2324LEVELIST=None
    2425AREA=None
    25 INPUTDIR='./workspace/EA5test'
     26INPUTDIR='./workspace'
    2627OUTPUTDIR=None
    27 FLEXPART_ROOT_SCRIPTS=None
     28FLEXPARTDIR=None
    2829PP_ID=None
    2930JOB_TEMPLATE=''
    30 CONTROLFILE='CONTROL_EA5.testgrid'
     31CONTROLFILE='CONTROL_CERA.testgrid'
    3132DEBUG=1
    32 REQUEST=2
     33REQUEST=1
    3334PUBLIC=0
    3435
     
    5556  parameterlist+=" --date_chunk=$DATE_CHUNK"
    5657fi
     58if [ -n "$JOB_CHUNK" ]; then
     59  parameterlist+=" --job_chunk=$JOB_CHUNK"
     60fi
    5761if [ -n "$BASETIME" ]; then
    5862  parameterlist+=" --basetime=$BASETIME"
     
    7377  parameterlist+=" --outputdir=$OUTPUTDIR"
    7478fi
    75 if [ -n "$FLEXPART_ROOT_SCRIPTS" ]; then
    76   parameterlist+=" --flexpart_root_scripts=$FLEXPART_ROOT_SCRIPTS"
     79if [ -n "$FLEXPARTDIR" ]; then
     80  parameterlist+=" --flexpartdir=$FLEXPARTDIR"
    7781fi
    7882if [ -n "$PP_ID" ]; then
     
    99103
    100104# -----------------------------------------------------------------
    101 # CALL INSTALLATION SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
     105# CALL SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
    102106
    103107$pyscript $parameterlist
  • templates/compilejob.template

    re585e1b rb02a07e  
    2828case $${HOST} in
    2929  *ecg*)
     30  module unload grib_api
    3031  module unload eccodes
    31 #  module load python
    32   module unload grib_api
     32  module load eccodes
     33  module load python
    3334  module unload emos
    34   module load grib_api/1.26.1
    35   module load emos/457-r64
     35  module load emos/455-r64
    3636  export FLEXPART_ROOT_SCRIPTS=$fp_root_scripts
    3737  export MAKEFILE=$makefile
     
    3939  *cca*)
    4040  module switch PrgEnv-cray PrgEnv-intel
    41   module load grib_api
     41  module load eccodes
    4242  module load emos
    4343  module load python
  • templates/job.temp

    re585e1b rb02a07e  
    1717##PBS -q np
    1818##PBS -S /usr/bin/ksh
    19 ## -o /scratch/ms/at/km4a/flex_ecmwf.${PBS_JOBID}.out
     19## -o /scratch/ms/at/km4a/flex_ecmwf.$${PBS_JOBID}.out
    2020## job output is in .ecaccess_DO_NOT_REMOVE
    2121##PBS -j oe
     
    2626set -x
    2727export VERSION=7.1
    28 case ${HOST} in
     28case $${HOST} in
    2929  *ecg*)
    3030  module load python
    3131  module unload grib_api
    3232  module unload eccodes
     33  module load eccodes
    3334  module unload emos
    34   module load grib_api/1.26.1
    35   module load emos/457-r64
    36   export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
     35  module load emos/455-r64
     36  export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/source/python
    3737  ;;
    3838  *cca*)
    3939  module switch PrgEnv-cray PrgEnv-intel
    40   module load grib_api
     40  module load eccodes
    4141  module load emos
    4242  module load python
    43   export SCRATCH=${TMPDIR}
    44   export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
     43  export SCRATCH=$${TMPDIR}
     44  export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/source/python
    4545  ;;
    4646esac
    4747
    48 cd ${SCRATCH}
    49 mkdir -p python$$
    50 cd python$$
     48cd $${SCRATCH}
     49mkdir -p python$$$$
     50cd python$$$$
    5151
    5252export CONTROL=CONTROL
    5353
    54 cat >${CONTROL}<<EOF
     54cat >$${CONTROL}<<EOF
     55$control_content
    5556EOF
    5657
    5758
    58 submit.py --controlfile=${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
     59submit.py --controlfile=$${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
    5960
    6061if [ $? -eq 0 ] ; then
    6162  l=0
    62   for muser in `grep -i MAILOPS ${CONTROL}`; do
    63       if [ ${l} -gt 0 ] ; then
    64          mail -s flex.${HOST}.$$ ${muser} <prot
     63  for muser in `grep -i MAILOPS $${CONTROL}`; do
     64      if [ $${l} -gt 0 ] ; then
     65         mail -s flex.$${HOST}.$$$$ $${muser} <prot
    6566      fi
    66       l=$((${l}+1))
     67      l=$(($${l}+1))
    6768  done
    6869else
    6970  l=0
    70   for muser in `grep -i MAILFAIL ${CONTROL}`; do
    71       if [ ${l} -gt 0 ] ; then
    72          mail -s "ERROR! flex.${HOST}.$$" ${muser} <prot
     71  for muser in `grep -i MAILFAIL $${CONTROL}`; do
     72      if [ $${l} -gt 0 ] ; then
     73         mail -s "ERROR! flex.$${HOST}.$$$$" $${muser} <prot
    7374      fi
    74       l=$((${l}+1))
     75      l=$(($${l}+1))
    7576  done
    7677fi
  • templates/job.template

    re585e1b rb02a07e  
    1717##PBS -q np
    1818##PBS -S /usr/bin/ksh
    19 ## -o /scratch/ms/$usergroup/$username/flex_ecmwf.$${PBS_JOBID}.out
     19## -o /scratch/ms/$usergroup/$username/flex_ecmwf.$$$${PBS_JOBID}.out
    2020## job output is in .ecaccess_DO_NOT_REMOVE
    2121##PBS -j oe
     
    2626set -x
    2727export VERSION=$version_number
    28 case $${HOST} in
     28case $$$${HOST} in
    2929  *ecg*)
    3030  module load python
    3131  module unload grib_api
    3232  module unload eccodes
     33  module load eccodes
    3334  module unload emos
    34   module load grib_api/1.26.1
    35   module load emos/457-r64
    36   export PATH=$${PATH}:$fp_root_path
     35  module load emos/455-r64
     36  export PATH=$$$${PATH}:$fp_root_path
    3737  ;;
    3838  *cca*)
    3939  module switch PrgEnv-cray PrgEnv-intel
    40   module load grib_api
     40  module load eccodes
    4141  module load emos
    4242  module load python
    43   export SCRATCH=$${TMPDIR}
    44   export PATH=$${PATH}:$fp_root_path
     43  export SCRATCH=$$$${TMPDIR}
     44  export PATH=$$$${PATH}:$fp_root_path
    4545  ;;
    4646esac
    4747
    48 cd $${SCRATCH}
    49 mkdir -p python$$$$
    50 cd python$$$$
     48cd $$$${SCRATCH}
     49mkdir -p python$$$$$$$$
     50cd python$$$$$$$$
    5151
    5252export CONTROL=CONTROL
    5353
    54 cat >$${CONTROL}<<EOF
     54cat >$$$${CONTROL}<<EOF
     55$$control_content
    5556EOF
    5657
    5758
    58 submit.py --controlfile=$${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
     59submit.py --controlfile=$$$${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
    5960
    6061if [ $? -eq 0 ] ; then
    6162  l=0
    62   for muser in `grep -i MAILOPS $${CONTROL}`; do
    63       if [ $${l} -gt 0 ] ; then
    64          mail -s flex.$${HOST}.$$$$ $${muser} <prot
     63  for muser in `grep -i MAILOPS $$$${CONTROL}`; do
     64      if [ $$$${l} -gt 0 ] ; then
     65         mail -s flex.$$$${HOST}.$$$$$$$$ $$$${muser} <prot
    6566      fi
    66       l=$(($${l}+1))
     67      l=$(($$$${l}+1))
    6768  done
    6869else
    6970  l=0
    70   for muser in `grep -i MAILFAIL $${CONTROL}`; do
    71       if [ $${l} -gt 0 ] ; then
    72          mail -s "ERROR! flex.$${HOST}.$$$$" $${muser} <prot
     71  for muser in `grep -i MAILFAIL $$$${CONTROL}`; do
     72      if [ $$$${l} -gt 0 ] ; then
     73         mail -s "ERROR! flex.$$$${HOST}.$$$$$$$$" $$$${muser} <prot
    7374      fi
    74       l=$(($${l}+1))
     75      l=$(($$$${l}+1))
    7576  done
    7677fi
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG