diff --git a/run/jobscripts/job.ksh b/run/jobscripts/job.ksh index eadd462cb27e1dfe1f9f99c62f6df6bd026c5c2a..fe162c9962a7b8f7f954a540e2c810f12151bb58 100644 --- a/run/jobscripts/job.ksh +++ b/run/jobscripts/job.ksh @@ -31,7 +31,8 @@ case ${HOST} in module unload grib_api module unload eccodes module unload emos - module load grib_api/1.27.0 +# module load grib_api/1.27.0 + module load grib_api/1.14.5 module load emos/457-r64 export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python ;; diff --git a/run/run_local.sh b/run/run_local.sh new file mode 100755 index 0000000000000000000000000000000000000000..b869a00fc25da9cf1e9fb73082c402b82e6f4ca3 --- /dev/null +++ b/run/run_local.sh @@ -0,0 +1,104 @@ +#!/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 +BASETIME=None +STEP=None +LEVELIST=None +AREA=None +INPUTDIR='./workspace/EA5test' +OUTPUTDIR=None +FLEXPART_ROOT_SCRIPTS=None +PP_ID=None +JOB_TEMPLATE='' +CONTROLFILE='CONTROL_EA5.testgrid' +DEBUG=1 +REQUEST=2 +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 "$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 +if [ -n "$PUBLIC" ]; then + parameterlist+=" --public=$PUBLIC" +fi + +# ----------------------------------------------------------------- +# CALL INSTALLATION SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS + +$pyscript $parameterlist + diff --git a/source/fortran/Makefile.local.gfortran b/source/fortran/Makefile.local.gfortran index a8d05fd321ec15f822e053b19043c9a6b81b3d1f..f416f5e3faa7fb390a546d513421793d8f7c8e7d 100644 --- a/source/fortran/Makefile.local.gfortran +++ b/source/fortran/Makefile.local.gfortran @@ -45,7 +45,7 @@ EXE = CONVERT2 all: ${EXE} clean: - rm *.o + rm *.o *.mod CONVERT2 phgrreal.o: phgrreal.f $(F90C) -c -g -O3 -fopenmp phgrreal.f diff --git a/templates/compilejob.template b/templates/compilejob.template index a94f3e4e03e83c1468c6714ab19859fe0bb00a2e..0ae8577568839889244a0a9f60ba4fc116353c0c 100644 --- a/templates/compilejob.template +++ b/templates/compilejob.template @@ -31,7 +31,7 @@ case $${HOST} in # module load python module unload grib_api module unload emos - module load grib_api/1.27.0 + module load grib_api/1.26.1 module load emos/457-r64 export FLEXPART_ROOT_SCRIPTS=$fp_root_scripts export MAKEFILE=$makefile diff --git a/templates/job.temp b/templates/job.temp index 9d16318962752ce6340836907de19aed6f276518..8941171c470139614119a64be3363b1cbc3e593c 100644 --- a/templates/job.temp +++ b/templates/job.temp @@ -31,7 +31,7 @@ case ${HOST} in module unload grib_api module unload eccodes module unload emos - module load grib_api/1.27.0 + module load grib_api/1.26.1 module load emos/457-r64 export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python ;; diff --git a/templates/job.template b/templates/job.template index a273c1bdd451df7f57c3a72937b3b103767c292c..cf262d754b0a30dcc21b078d993ee764209172fb 100644 --- a/templates/job.template +++ b/templates/job.template @@ -31,7 +31,7 @@ case $${HOST} in module unload grib_api module unload eccodes module unload emos - module load grib_api/1.27.0 + module load grib_api/1.26.1 module load emos/457-r64 export PATH=$${PATH}:$fp_root_path ;;