diff --git a/run/control/CONTROL_CERA b/run/control/CONTROL_CERA index 371cc474fd3da63775295df1de594874dbd23fc0..e69bee09571f3cf603e197522dd76e589f5e9315 100644 --- a/run/control/CONTROL_CERA +++ b/run/control/CONTROL_CERA @@ -7,6 +7,7 @@ ACCTYPE FC ACCTIME 18 ACCMAXSTEP 24 CLASS EP +NUMBER 0 STREAM ENDA GRID 1000 LEFT -24000 diff --git a/run/control/CONTROL_CERA.public b/run/control/CONTROL_CERA.public index 9681809e77b2c4a9b2376c00aaef2bcd416c88a7..c9e4c133d52418fc65b2c07d50b8ab03cb6246c2 100644 --- a/run/control/CONTROL_CERA.public +++ b/run/control/CONTROL_CERA.public @@ -9,6 +9,7 @@ ACCMAXSTEP 24 CLASS EP DATASET cera20c STREAM ENDA +NUMBER 0 GRID 2000 LEFT -24000 LOWER 10000 diff --git a/run/control/CONTROL_CERA.testgrid b/run/control/CONTROL_CERA.testgrid index 341617f2dd0de2782ea58fae77a7f9960e06cbec..a471d4da70fea299cf0a254c56723178eed5bc40 100644 --- a/run/control/CONTROL_CERA.testgrid +++ b/run/control/CONTROL_CERA.testgrid @@ -8,12 +8,13 @@ ACCTIME 18 ACCMAXSTEP 24 CLASS EP STREAM ENDA +NUMBER 0 GRID 2000 -LEFT -20000 +LEFT 30000 LOWER 40000 -UPPER 60000 -RIGHT 60000 -LEVELIST 1/to/91 +UPPER 50000 +RIGHT 40000 +LEVELIST 88/to/91 RESOL 106 ETA 1 ADDPAR 27/28/173/186/187/188/235/139/39 diff --git a/run/jobscripts/compilejob.ksh b/run/jobscripts/compilejob.ksh index 566f03c46b1ebf4313bf824d18214375eedf2b7a..5d79c55f99f49039a772098c0027ac790c84908d 100644 --- a/run/jobscripts/compilejob.ksh +++ b/run/jobscripts/compilejob.ksh @@ -27,11 +27,12 @@ set -x export VERSION=7.1 case ${HOST} in *ecg*) + module unload eccodes # module load python -# module unload grib_api + module unload grib_api module unload emos -# module load grib_api/1.14.5 - module load emos/437-r64 + module load grib_api/1.27.0 + module load emos/457-r64 export FLEXPART_ROOT_SCRIPTS=${HOME} export MAKEFILE=Makefile.gfortran ;; diff --git a/run/jobscripts/job.ksh b/run/jobscripts/job.ksh index ae7e6d04a50992a8c75ed2eb46101f96433f54eb..eadd462cb27e1dfe1f9f99c62f6df6bd026c5c2a 100644 --- a/run/jobscripts/job.ksh +++ b/run/jobscripts/job.ksh @@ -29,9 +29,10 @@ case ${HOST} in *ecg*) module load python module unload grib_api + module unload eccodes module unload emos - module load grib_api/1.14.5 - module load emos/437-r64 + module load grib_api/1.27.0 + module load emos/457-r64 export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python ;; *cca*) @@ -51,21 +52,21 @@ cd python$$ export CONTROL=CONTROL cat >${CONTROL}<<EOF -accmaxstep 24 -acctime 18 +accmaxstep 12 +acctime 06/18 acctype FC accuracy 24 -addpar 27 28 173 186 187 188 235 139 39 +addpar 186 187 188 235 139 39 area basetime None -controlfile CONTROL_CERA.testgrid -cwc 1 +controlfile CONTROL_EA5.testgrid +cwc 0 dataset None date_chunk 3 debug 1 destination annep@genericSftp dpdeta 1 -dtime 3 +dtime 1 ecfsdir ectmp:/${USER}/econdemand/ ecgid at ecstorage 0 @@ -81,37 +82,37 @@ gateway srvx8.img.univie.ac.at gauss 0 gaussian grib2flexpart 0 -grid 2000 +grid 1000 inputdir /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/run/workspace install_target None job_template job.temp -left -20000 -level 91 -levelist 1/to/91 +left -5000 +level 137 +levelist 100/to/137 logicals gauss omega omegadiff eta etadiff dpdeta cwc wrf grib2flexpart ecstorage ectrans debug request public -lower 40000 +lower 10000 mailfail ${USER} mailops ${USER} makefile Makefile.gfortran -marsclass EP +marsclass EA maxstep 0 number OFF omega 0 omegadiff 0 outputdir /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/run/workspace -prefix CE +prefix EA public 0 queue ecgate request 2 -resol 106 -right 60000 +resol 159 +right 5000 smooth 0 start_date 20090108 -step 00 00 00 00 00 00 00 00 -stream ENDA -time 00 03 06 09 12 15 18 21 -type AN AN AN AN AN AN AN AN -upper 60000 +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 +stream OPER +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 +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 +upper 20000 wrf 0 EOF diff --git a/run/run.sh b/run/run.sh index 1eab1a57a1fdde90f337c8d9a3ef200be300d1bf..903408401f300866f21f575c94249b58ac69b918 100755 --- a/run/run.sh +++ b/run/run.sh @@ -27,7 +27,7 @@ OUTPUTDIR=None FLEXPART_ROOT_SCRIPTS=None PP_ID=None JOB_TEMPLATE='job.temp' -CONTROLFILE='CONTROL_CERA.testgrid' +CONTROLFILE='CONTROL_EA5.testgrid' DEBUG=1 REQUEST=2 PUBLIC=0 diff --git a/source/fortran/Makefile.gfortran b/source/fortran/Makefile.gfortran index 02a0c142c22704ebc3754ac85c47833d62e0a6e7..15465c4df74c31301c35045adc36e4c1487609a0 100644 --- a/source/fortran/Makefile.gfortran +++ b/source/fortran/Makefile.gfortran @@ -12,13 +12,16 @@ OPT = -g DEBUG = -g -LIB = $(ECCODES_LIB) $(EMOSLIB) +LIB = $(GRIB_API_LIB) $(EMOSLIB) +#$(ECCODES_LIB) FC=gfortran -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore -ffixed-line-length-132 -fopenmp -fconvert=big-endian F90C=gfortran -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore -ffixed-line-length-132 -fopenmp -fconvert=big-endian -FFLAGS = $(OPT) -I. -I$(ECCODES_INCLUDE_DIR) -F90FLAGS = $(OPT) -I. -I$(ECCODES_INCLUDE_DIR) +FFLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) +#-I$(ECCODES_INCLUDE_DIR) +F90FLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) +#-I$(ECCODES_INCLUDE_DIR) LDFLAGS = $(OPT) diff --git a/source/fortran/Makefile.local.gfortran b/source/fortran/Makefile.local.gfortran index 95486beeb34ce7b7f9e023b2280278993520f5b1..a8d05fd321ec15f822e053b19043c9a6b81b3d1f 100644 --- a/source/fortran/Makefile.local.gfortran +++ b/source/fortran/Makefile.local.gfortran @@ -11,11 +11,11 @@ .s .s~ .sh .sh~ .h .h~ .C .C~ .a -#GRIB_API_INCLUDE_DIR=/usr/local/gcc-4.9.3/grib_api-1.14.3//include -#GRIB_API_LIB= -L/usr/local/gcc-4.9.3/grib_api-1.14.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper +GRIB_API_INCLUDE_DIR=/usr/local/gcc-4.9.3/grib_api-1.14.3//include +GRIB_API_LIB= -L/usr/local/gcc-4.9.3/grib_api-1.14.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper -GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/include -GRIB_API_LIB=-L/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/lib -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -openmp +#GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/include +#GRIB_API_LIB=-L/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/lib -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -openmp EMOSLIB=-lemosR64 diff --git a/templates/compilejob.template b/templates/compilejob.template index 927633a2bc83d1abe16555baf2a703c937516b46..a94f3e4e03e83c1468c6714ab19859fe0bb00a2e 100644 --- a/templates/compilejob.template +++ b/templates/compilejob.template @@ -27,11 +27,12 @@ set -x export VERSION=$version_number case $${HOST} in *ecg*) + module unload eccodes # module load python -# module unload grib_api + module unload grib_api module unload emos -# module load grib_api/1.14.5 - module load emos/437-r64 + module load grib_api/1.27.0 + 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 ae3ac9a533b15d3332c5c96f121accd9e4c5e45f..9d16318962752ce6340836907de19aed6f276518 100644 --- a/templates/job.temp +++ b/templates/job.temp @@ -29,9 +29,10 @@ case ${HOST} in *ecg*) module load python module unload grib_api + module unload eccodes module unload emos - module load grib_api/1.14.5 - module load emos/437-r64 + module load grib_api/1.27.0 + module load emos/457-r64 export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python ;; *cca*) diff --git a/templates/job.template b/templates/job.template index 16e016e0705553e86606c0957aee4effccbed20c..a273c1bdd451df7f57c3a72937b3b103767c292c 100644 --- a/templates/job.template +++ b/templates/job.template @@ -29,9 +29,10 @@ case $${HOST} in *ecg*) module load python module unload grib_api + module unload eccodes module unload emos - module load grib_api/1.14.5 - module load emos/437-r64 + module load grib_api/1.27.0 + module load emos/457-r64 export PATH=$${PATH}:$fp_root_path ;; *cca*)