From da396a2871f09772dff5066880929c71462ea4ae Mon Sep 17 00:00:00 2001 From: Ignacio Pisso <Ignacio.Pisso@nilu.no> Date: Sun, 1 Mar 2015 17:08:22 +0100 Subject: [PATCH] change configuration parameters: wind array size, maxpart --- src/makefile | 2 +- src/par_mod.f90 | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/makefile b/src/makefile index 584e0265..359a6436 100644 --- a/src/makefile +++ b/src/makefile @@ -5,7 +5,7 @@ FC = gfortran INCPATH = /xnilu_wrk/flex_wrk/bin64/grib_api/include LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib LIBPATH2 = /usr/lib/x86_64-linux-gnu/ -FFLAGS = -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) +FFLAGS = -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) #FFLAGS = -fbounds-check -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) LDFLAGS = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper diff --git a/src/par_mod.f90 b/src/par_mod.f90 index 46b31c53..b48238ba 100755 --- a/src/par_mod.f90 +++ b/src/par_mod.f90 @@ -122,12 +122,14 @@ module par_mod !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL XF !integer,parameter :: nxmax=361,nymax=181,nuvzmax=152,nwzmax=152,nzmax=152 !ECMWF new - integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF + !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF !integer,parameter :: nxmax=361,nymax=181,nuvzmax=26,nwzmax=26,nzmax=26 !integer,parameter :: nxmax=721,nymax=361,nuvzmax=64,nwzmax=64,nzmax=64 + integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 0.5 !integer,parameter :: nxmax=1201,nymax=235,nuvzmax=58,nwzmax=58,nzmax=58 integer,parameter :: nxshift=359 ! for ECMWF + !integer,parameter :: nxshift=718 ! for ECMWF 0.5 !integer,parameter :: nxshift=0 ! for GFS or FNL (XF) integer,parameter :: nconvlevmax = nuvzmax-1 @@ -153,8 +155,8 @@ module par_mod ! Maximum dimensions of the nested input grids !********************************************* - integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0 - !integer,parameter :: maxnests=1,nxmaxn=351,nymaxn=351 !ECMWF + !integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0 + integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=351 !ECMWF !integer,parameter :: maxnests=1, nxmaxn=201, nymaxn=161 ! FNL XF ! maxnests maximum number of nested grids ! nxmaxn,nymaxn maximum dimension of nested wind fields in @@ -197,8 +199,8 @@ module par_mod ! Maximum number of particles, species, and similar !************************************************** - integer,parameter :: maxpart=150000 - integer,parameter :: maxspec=4 + integer,parameter :: maxpart=4000000 + integer,parameter :: maxspec=1 ! maxpart Maximum number of particles -- GitLab