diff --git a/src/FLEXPART.f90 b/src/FLEXPART.f90
index 73a54f4b8111e5356631171154af5c3a89570b7b..a42e795445d45a47d18021dbae1efa64c034478b 100644
--- a/src/FLEXPART.f90
+++ b/src/FLEXPART.f90
@@ -61,7 +61,8 @@ program flexpart
! FLEXPART version string
! flexversion='Version 9.2 beta (2014-07-01)'
- flexversion='Version 9.2.0.1 (2015-01-27)'
+ !flexversion='Version 9.2.0.1 (2015-01-27)'
+ flexversion='Version 9.2.0.2 (2015-03-01)'
! default inlide options
inline_options='none'
!verbosity flags defined in com_mod.f90
@@ -112,7 +113,6 @@ program flexpart
verbosity=2
endif
print*, 'verbosity level=', verbosity !inline_options(index_v+1:index_v+1)
-
endif
!iif (trim(inline_options).eq.'-v2') then
! print*, 'Verbose mode 2: display more detailed information during run'
@@ -120,33 +120,24 @@ program flexpart
!endif
if (index(inline_options,'i').gt.0) then
- !if (trim(inline_options).eq.'-i') then
index_v=index(inline_options,'i')
- print*, 'Info mode: provide run specific information and stop'
+ print*, 'Info mode: provide compile and run specific information, then stop'
verbosity=1
info_flag=1
- !if (trim(inline_options).eq.'-i2') then
if (inline_options(index_v+1:index_v+1).eq.'2') then
- print*, 'Including input files'
- ! verbosity=1
info_flag=2
endif
endif
- !if (trim(inline_options).eq.'-i2') then
- ! print*, 'Info mode: provide more detailed run specific information and stop'
- ! verbosity=1
- ! info_flag=2
- !endif
if (index(inline_options,'t').gt.0) then
time_flag=1
- print*, 'timing execution: not implemented'
+ print*, 'timing execution activated'
!stop
endif
if (index(inline_options,'d').gt.0) then
debug_flag=1
- print*, 'debug: not implemented'
+ print*, 'debug messages activated'
print*, 'debug_flag=', debug_flag
- !stop
+ !these messages give additional info on top on verbose mode
endif
endif
@@ -185,7 +176,7 @@ program flexpart
!*******************************************************
if (verbosity.gt.0) then
- write(*,*) 'call readcommand'
+ write(*,*) 'FLEXPART> call readcommand'
endif
call readcommand
if (verbosity.gt.0) then
@@ -201,7 +192,7 @@ program flexpart
! Read the age classes to be used
!********************************
if (verbosity.gt.0) then
- write(*,*) 'call readageclasses'
+ write(*,*) 'FLEXPART> call readageclasses'
endif
call readageclasses
@@ -214,7 +205,7 @@ program flexpart
!******************************************************************
if (verbosity.gt.0) then
- write(*,*) 'call readavailable'
+ write(*,*) 'FLEXPART> call readavailable'
endif
call readavailable
@@ -233,7 +224,7 @@ program flexpart
endif
if (verbosity.gt.0) then
- write(*,*) 'call gridcheck_nests'
+ write(*,*) 'FLEXPART> call gridcheck_nests'
endif
call gridcheck_nests
@@ -295,7 +286,7 @@ program flexpart
!****************************************************************
if (verbosity.gt.0) then
- print*,'call readdepo'
+ print*,'FLEXPART> call readdepo'
endif
call readdepo
@@ -304,14 +295,14 @@ program flexpart
call coordtrafo
if (verbosity.gt.0) then
- print*,'call coordtrafo'
+ print*,'FLEXPART> call coordtrafo'
endif
! Initialize all particles to non-existent
!*****************************************
if (verbosity.gt.0) then
- print*,'Initialize all particles to non-existent'
+ print*,'FLEXPART> Initialize all particles to non-existent'
endif
do j=1,maxpart
itra1(j)=-999999999
@@ -322,12 +313,12 @@ program flexpart
if (ipin.eq.1) then
if (verbosity.gt.0) then
- print*,'call readpartpositions'
+ print*,'FLEXPART> call readpartpositions'
endif
call readpartpositions
else
if (verbosity.gt.0) then
- print*,'set numpart=0, numparticlecount=0'
+ print*,'FLEXPART> set numpart=0, numparticlecount=0'
endif
numpart=0
numparticlecount=0
@@ -338,7 +329,7 @@ program flexpart
!***************************************************************
if (verbosity.gt.0) then
- print*,'call outgrid_init'
+ print*,'FLEXPART> call outgrid_init'
endif
call outgrid_init
if (nested_output.eq.1) call outgrid_init_nest
@@ -348,7 +339,7 @@ program flexpart
if (OHREA.eqv..TRUE.) then
if (verbosity.gt.0) then
- print*,'call readOHfield'
+ print*,'FLEXPART> call readOHfield'
endif
call readOHfield
endif
@@ -358,7 +349,7 @@ program flexpart
!******************************************************************
if (verbosity.gt.0) then
- print*,'call writeheader'
+ print*,'FLEXPART> call variuos writeheader routines'
endif
call writeheader
@@ -372,7 +363,7 @@ program flexpart
!open(unitdates,file=path(2)(1:length(2))//'dates')
if (verbosity.gt.0) then
- print*,'call openreceptors'
+ print*,'FLEXPART> call openreceptors'
endif
call openreceptors
if ((iout.eq.4).or.(iout.eq.5)) call openouttraj
@@ -381,7 +372,7 @@ program flexpart
!***************************************************************************
if (verbosity.gt.0) then
- print*,'discretize release times'
+ print*,'FLEXPART> discretize release times'
endif
do i=1,numpoint
ireleasestart(i)=nint(real(ireleasestart(i))/real(lsynctime))*lsynctime
@@ -392,7 +383,7 @@ program flexpart
!************************************************************
if (verbosity.gt.0) then
- print*,'Initialize cloud-base mass fluxes for the convection scheme'
+ print*,'FLEXPART> Initialize cloud-base mass fluxes for the convection scheme'
endif
do jy=0,nymin1
@@ -416,11 +407,11 @@ program flexpart
write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
endif
if (info_flag.eq.2) then
- print*, 'info only mode (stop before call timemanager)'
+ print*, 'FLEXPART> info only mode (stop before call timemanager)'
stop
endif
if (verbosity.gt.0) then
- print*,'call timemanager'
+ print*,'FLEXPART> call timemanager'
endif
call timemanager
diff --git a/src/gridcheck.f90 b/src/gridcheck.f90
index 5ce565e9f36b9ed6a1ffb9ba0bd30c23bebfbec7..7f7173d7333fb09badc8f559c57ec6609c7f1e8a 100755
--- a/src/gridcheck.f90
+++ b/src/gridcheck.f90
@@ -285,6 +285,14 @@ subroutine gridcheck
xaux2=xaux2in
yaux1=yaux1in
yaux2=yaux2in
+ if (verbosity.gt.1) then
+ print*, 'longitudeOfFirstGridPointInDegrees', xaux1in
+ print*, 'longitudeOfLastGridPointInDegrees ', xaux2in
+ print*, 'latitudeOfLastGridPointInDegrees ', yaux1in
+ print*, 'latitudeOfFirstGridPointInDegrees ', yaux2in
+
+ endif
+
if (xaux1.gt.180.) xaux1=xaux1-360.0
if (xaux2.gt.180.) xaux2=xaux2-360.0
if (xaux1.lt.-180.) xaux1=xaux1+360.0
@@ -444,11 +452,11 @@ subroutine gridcheck
write(*,'(a,2i7)') ' Vertical levels in ECMWF data: ', &
nuvz+1,nwz
- write(*,*)
- write(*,'(a)') 'gridcheck> Mother domain:'
- write(*,'(a,f10.5,a,f10.5,a,f10.5)') 'gridcheck> Longitude range: ', &
+ !write(*,*)
+ write(*,'(a)') ' Mother domain:'
+ write(*,'(a,f10.5,a,f10.5,a,f10.5)') ' Longitude range: ', &
xlon0,' to ',xlon0+(nx-1)*dx,' Grid distance: ',dx
- write(*,'(a,f10.5,a,f10.5,a,f10.5)') 'gridcheck> Latitude range : ', &
+ write(*,'(a,f10.5,a,f10.5,a,f10.5)') ' Latitude range : ', &
ylat0,' to ',ylat0+(ny-1)*dy,' Grid distance: ',dy
write(*,*)
diff --git a/src/makefile b/src/makefile
index 359a6436aefdf7ba9bbb301ece5f94468d106390..ecca10584ff98df013efdbdc607e9476f84ecf7c 100644
--- a/src/makefile
+++ b/src/makefile
@@ -5,7 +5,8 @@ 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 = -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/readpaths.f90 b/src/readpaths.f90
index 850238d127fa97147ad3eb4ec1c55d7d2cdc5cc9..1e15ecea93c397aefcc2fdf8519773e79d003362 100755
--- a/src/readpaths.f90
+++ b/src/readpaths.f90
@@ -64,27 +64,30 @@ subroutine readpaths !(pathfile)
if (verbosity.gt.0) then
- print*, 'path read', i, '=', path(i)
+ print*, 'path read', i, '=', trim(path(i))
end if
end do
do i=1,numpath
-
string_test = path(i)
character_test = string_test(length(i):length(i))
- !print*, 'character_test, string_test ', character_test, string_test
- if ((character_test .NE. '/') .AND. (i .LT. 4)) then
+ ! print*, 'character_test, string_test ', character_test, string_test
+ ! include nested fields
+ if ((character_test .NE. '/') .AND. ((i .LT. 4) .OR. (i .EQ. 5) )) then
+ if (verbosity.gt.0) then
print*, 'readpaths> WARNING: path not ending in /'
print*, path(i)
+ endif
path(i) = string_test(1:length(i)) // '/'
length(i)=length(i)+1
+ if (verbosity.gt.0) then
print*, 'fix: padded with /'
print*, path(i)
print*, 'length(i) increased 1', length(i)
+ endif
endif
-
end do
@@ -106,11 +109,11 @@ subroutine readpaths !(pathfile)
30 numbnests=i-1
- if (verbosity.gt.0) then
- do i=1,numpath
- print*, 'path tested', i, '=', path(i)
- end do
- end if
+ !if (verbosity.gt.0) then
+ ! do i=1,numpath
+ ! print*, 'path tested', i, '=', path(i)
+ ! end do
+ !end if
close(unitpath)
return
diff --git a/src/readreleases.f90 b/src/readreleases.f90
index 5b509e95d782271f933e6c83b03df5e9f69e2b99..44fade3f63b2e630ecfe44a4eef1899394198eb4 100755
--- a/src/readreleases.f90
+++ b/src/readreleases.f90
@@ -258,7 +258,9 @@ subroutine readreleases
allocate(xmasssave(numpoint),stat=stat)
if (stat.ne.0) write(*,*)'ERROR: could not allocate xmasssave'
- write (*,*) 'readreleases> Releasepoints : ', numpoint
+ if (verbosity.gt.0) then
+ write (*,*) 'readreleases> Releasepoints : ', numpoint
+ endif
do i=1,numpoint
xmasssave(i)=0.
@@ -366,18 +368,26 @@ subroutine readreleases
if (weta(i).gt.0.) then
WETDEP=.true.
write (*,*) 'Below-cloud scavenging: ON'
+ if (verbosity.gt.0) then
write (*,*) 'Below-cloud scavenging coefficients: ',weta(i),i
+ endif
else
+ if (verbosity.gt.0) then
write (*,*) 'Below-cloud scavenging: OFF'
+ endif
endif
! NIK 31.01.2013 + 10.12.2013
if (weta_in(i).gt.0.) then
WETDEP=.true.
write (*,*) 'In-cloud scavenging: ON'
+ if (verbosity.gt.0) then
write (*,*) 'In-cloud scavenging coefficients: ',weta_in(i),wetb_in(i), wetc_in(i), wetd_in(i),i
- else
- write (*,*) 'In-cloud scavenging: OFF'
+ endif
+ else
+ if (verbosity.gt.0) then
+ write (*,*) 'In-cloud scavenging: OFF'
+ endif
endif
if (ohreact(i).gt.0) then
diff --git a/src/timemanager.f90 b/src/timemanager.f90
index 2859eac11107a94a12f6fca669bb36cfe43ecef9..21bbae5ad0a8d6131ea24d7bdd4dc2e44074de18 100644
--- a/src/timemanager.f90
+++ b/src/timemanager.f90
@@ -139,6 +139,9 @@ subroutine timemanager
endif
do itime=0,ideltas,lsynctime
+ if (verbosity.gt.0) then
+ write (*,*) 'timemanager> itime=', itime
+ endif
! Computation of wet deposition, OH reaction and mass transfer
@@ -196,9 +199,9 @@ subroutine timemanager
! Release particles
!******************
- if (verbosity.gt.0) then
- write (*,*) 'timemanager> Release particles'
- endif
+ !if (verbosity.gt.0) then
+ ! write (*,*) 'timemanager> Release particles'
+ !endif
if (mdomainfill.ge.1) then
if (itime.eq.0) then
@@ -214,7 +217,7 @@ subroutine timemanager
endif
else
if (verbosity.gt.0) then
- print*,'call releaseparticles'
+ print*,'timemanager> call releaseparticles'
endif
call releaseparticles(itime)
if (verbosity.gt.1) then