Commit d8eed026 authored by Espen Sollum's avatar Espen Sollum
Browse files

Minor edits

parent 5b34509e
......@@ -81,7 +81,7 @@ program flexpart
! FLEXPART version string
flexversion_major = '10' ! Major version number, also used for species file names
flexversion='Version '//trim(flexversion_major)//'.1beta (2016-11-02)'
flexversion='Version '//trim(flexversion_major)//'.2beta (2017-08-01)'
verbosity=0
! Read the pathnames where input/output files are stored
......
......@@ -91,7 +91,7 @@ program flexpart
! FLEXPART version string
flexversion_major = '10' ! Major version number, also used for species file names
flexversion='Ver. '//trim(flexversion_major)//'.1beta MPI (2016-11-02)'
flexversion='Ver. '//trim(flexversion_major)//'.2beta MPI (2017-08-01)'
verbosity=0
! Read the pathnames where input/output files are stored
......
......@@ -99,8 +99,8 @@ subroutine calcmatrix(lconv,delt,cbmf,metdata_format)
! initialize mass fractions
do kk=1,nconvlev
fmassfrac(k,kk)=0.
enddo
enddo
end do
end do
!note that Emanuel says it is important
......
......@@ -231,6 +231,9 @@ subroutine gridcheck_gfs
yaux2in,iret)
call grib_check(iret,gribFunction,gribErrorMsg)
! Fix for flexpart.eu ticket #48
if (xaux2in.lt.0) xaux2in = 359.0
xaux1=xaux1in
xaux2=xaux2in
yaux1=yaux1in
......
......@@ -80,11 +80,11 @@ O_LEV_DBG = g # [0,g]
## LIBRARIES
LIBS = -lgrib_api_f90 -lgrib_api -lm -ljasper -lnetcdff # -fopenmp
FFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) $(FUSER) #-Warray-bounds -fcheck=all # -march=native
FFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) $(FUSER) #-Warray-bounds -fcheck=all # -march=native
DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace -Wall -fdump-core $(FUSER) # -ffpe-trap=invalid,overflow,denormal,underflow,zero -Warray-bounds -fcheck=all
DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace -Wall -fdump-core $(FUSER) # -ffpe-trap=invalid,overflow,denormal,underflow,zero -Warray-bounds -fcheck=all
LDFLAGS = $(FFLAGS) -L$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
LDFLAGS = $(FFLAGS) -L$(LIBPATH1) -Wl,-rpath,$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
LDDEBUG = $(DBGFLAGS) -L$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
MODOBJS = \
......
......@@ -141,15 +141,12 @@ module par_mod
!*********************************************
! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF new
! integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new
integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new
integer,parameter :: nxmax=181,nymax=91,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new
! integer,parameter :: nxmax=181,nymax=91,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF new
! INTEGER,PARAMETER :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !NCEP data
! !integer,parameter :: nxshift=359 ! for ECMWF
! integer,parameter :: nxshift=0 ! for GFS
! integer,parameter :: nxmax=15,nymax=15,nuvzmax=140,nwzmax=140,nzmax=140
! integer,parameter :: nxshift=359 ! for ECMWF
integer,parameter :: nxshift=0 ! for GFS
......@@ -157,7 +154,7 @@ module par_mod
! Maximum dimensions of the nested input grids
!*********************************************
integer,parameter :: maxnests=0,nxmaxn=451,nymaxn=226
integer,parameter :: maxnests=1,nxmaxn=451,nymaxn=226
! nxmax,nymax maximum dimension of wind fields in x and y
! direction, respectively
......@@ -292,8 +289,5 @@ module par_mod
integer,parameter :: icmv=-9999
! Parameters for testing
!*******************************************
! integer :: verbosity=0
end module par_mod
......@@ -85,6 +85,7 @@ subroutine timemanager(metdata_format)
! polation *
! xtra1(maxpart), ytra1(maxpart), ztra1(maxpart) = *
! spatial positions of trajectories *
! metdata_format format of metdata (ecmwf/gfs) *
! *
! Constants: *
! maxpart maximum number of trajectories *
......@@ -105,6 +106,7 @@ subroutine timemanager(metdata_format)
implicit none
integer :: metdata_format
logical :: reqv_state=.false. ! .true. if waiting for a MPI_Irecv to complete
integer :: j,ks,kp,l,n,itime=0,nstop,nstop1,memstat=0
! integer :: ksp
......@@ -348,7 +350,7 @@ subroutine timemanager(metdata_format)
if (verbosity.gt.0) then
write (*,*) 'timemanager> call convmix -- forward'
endif
call convmix(itime)
call convmix(itime,metdata_format)
endif
! If middle of averaging period of output fields is reached, accumulated
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment