Changeset b7ae015 in flexpart.git for src


Ignore:
Timestamp:
Mar 2, 2015, 10:56:20 AM (9 years ago)
Author:
Ignacio Pisso <Ignacio.Pisso@…>
Branches:
master, 10.4.1_pesei, FPv9.3.1, FPv9.3.1b_testing, FPv9.3.2, GFS_025, bugfixes+enhancements, dev, fp9.3.1-20161214-nc4, grib2nc4_repair, release-10, release-10.4.1, scaling-bug, univie
Children:
1a08571
Parents:
52aabab
Message:

clean up runtime messages and adjust verbosity level

Location:
src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src/FLEXPART.f90

    r414a5e5 rb7ae015  
    6262  ! FLEXPART version string
    6363  ! flexversion='Version 9.2 beta (2014-07-01)'
    64   flexversion='Version 9.2.0.1 (2015-01-27)'
     64  !flexversion='Version 9.2.0.1 (2015-01-27)'
     65  flexversion='Version 9.2.0.2 (2015-03-01)'
    6566  ! default inlide options
    6667  inline_options='none'
     
    113114       endif
    114115       print*, 'verbosity level=', verbosity !inline_options(index_v+1:index_v+1)
    115              
    116116    endif
    117117    !iif (trim(inline_options).eq.'-v2') then
     
    121121
    122122    if (index(inline_options,'i').gt.0) then   
    123     !if (trim(inline_options).eq.'-i') then
    124123       index_v=index(inline_options,'i')
    125        print*, 'Info mode: provide run specific information and stop'
     124       print*, 'Info mode: provide compile and run specific information, then stop'
    126125       verbosity=1
    127126       info_flag=1
    128        !if (trim(inline_options).eq.'-i2') then
    129127       if (inline_options(index_v+1:index_v+1).eq.'2') then
    130            print*, 'Including input files'
    131        !   verbosity=1
    132128       info_flag=2
    133129       endif
    134130    endif
    135     !if (trim(inline_options).eq.'-i2') then
    136     !   print*, 'Info mode: provide more detailed run specific information and stop'
    137     !   verbosity=1
    138     !   info_flag=2
    139     !endif
    140131    if (index(inline_options,'t').gt.0) then
    141132       time_flag=1
    142        print*, 'timing execution: not implemented'
     133       print*, 'timing execution activated'
    143134       !stop
    144135    endif
    145136    if (index(inline_options,'d').gt.0) then
    146137       debug_flag=1
    147        print*, 'debug: not implemented'
     138       print*, 'debug messages activated'
    148139       print*, 'debug_flag=', debug_flag
    149        !stop
     140       !these messages give additional info on top on verbose mode
    150141    endif
    151142  endif
     
    186177
    187178  if (verbosity.gt.0) then
    188     write(*,*) 'call readcommand'
     179    write(*,*) 'FLEXPART> call readcommand'
    189180  endif
    190181  call readcommand
     
    202193  !********************************
    203194  if (verbosity.gt.0) then
    204     write(*,*) 'call readageclasses'
     195    write(*,*) 'FLEXPART> call readageclasses'
    205196  endif
    206197  call readageclasses
     
    215206
    216207  if (verbosity.gt.0) then
    217     write(*,*) 'call readavailable'
     208    write(*,*) 'FLEXPART> call readavailable'
    218209  endif 
    219210  call readavailable
     
    234225
    235226  if (verbosity.gt.0) then
    236     write(*,*) 'call gridcheck_nests'
     227    write(*,*) 'FLEXPART> call gridcheck_nests'
    237228  endif 
    238229  call gridcheck_nests
     
    296287
    297288  if (verbosity.gt.0) then
    298     print*,'call readdepo'
     289    print*,'FLEXPART> call readdepo'
    299290  endif
    300291  call readdepo
     
    305296  call coordtrafo 
    306297  if (verbosity.gt.0) then
    307     print*,'call coordtrafo'
     298    print*,'FLEXPART> call coordtrafo'
    308299  endif
    309300
     
    312303
    313304  if (verbosity.gt.0) then
    314     print*,'Initialize all particles to non-existent'
     305    print*,'FLEXPART> Initialize all particles to non-existent'
    315306  endif
    316307  do j=1,maxpart
     
    323314  if (ipin.eq.1) then
    324315    if (verbosity.gt.0) then
    325       print*,'call readpartpositions'
     316      print*,'FLEXPART> call readpartpositions'
    326317    endif
    327318    call readpartpositions
    328319  else
    329320    if (verbosity.gt.0) then
    330       print*,'set numpart=0, numparticlecount=0'
     321      print*,'FLEXPART> set numpart=0, numparticlecount=0'
    331322    endif   
    332323    numpart=0
     
    339330
    340331  if (verbosity.gt.0) then
    341     print*,'call outgrid_init'
     332    print*,'FLEXPART> call outgrid_init'
    342333  endif
    343334  call outgrid_init
     
    349340  if (OHREA.eqv..TRUE.) then
    350341    if (verbosity.gt.0) then
    351       print*,'call readOHfield'
     342      print*,'FLEXPART> call readOHfield'
    352343    endif
    353344    call readOHfield
     
    359350
    360351  if (verbosity.gt.0) then
    361     print*,'call writeheader'
     352    print*,'FLEXPART> call variuos writeheader routines'
    362353  endif
    363354
     
    373364
    374365  if (verbosity.gt.0) then
    375     print*,'call openreceptors'
     366    print*,'FLEXPART> call openreceptors'
    376367  endif
    377368  call openreceptors
     
    382373
    383374  if (verbosity.gt.0) then
    384     print*,'discretize release times'
     375    print*,'FLEXPART> discretize release times'
    385376  endif
    386377  do i=1,numpoint
     
    393384
    394385  if (verbosity.gt.0) then
    395     print*,'Initialize cloud-base mass fluxes for the convection scheme'
     386    print*,'FLEXPART> Initialize cloud-base mass fluxes for the convection scheme'
    396387  endif
    397388
     
    417408  endif
    418409  if (info_flag.eq.2) then
    419     print*, 'info only mode (stop before call timemanager)'
     410    print*, 'FLEXPART> info only mode (stop before call timemanager)'
    420411    stop
    421412  endif
    422413  if (verbosity.gt.0) then
    423      print*,'call timemanager'
     414     print*,'FLEXPART> call timemanager'
    424415  endif
    425416
  • src/gridcheck.f90

    r6470a47 rb7ae015  
    286286    yaux1=yaux1in
    287287    yaux2=yaux2in
     288     if (verbosity.gt.1) then
     289        print*, 'longitudeOfFirstGridPointInDegrees', xaux1in
     290        print*, 'longitudeOfLastGridPointInDegrees ', xaux2in
     291        print*, 'latitudeOfLastGridPointInDegrees  ', yaux1in
     292        print*, 'latitudeOfFirstGridPointInDegrees ', yaux2in
     293 
     294     endif
     295 
    288296    if (xaux1.gt.180.) xaux1=xaux1-360.0
    289297    if (xaux2.gt.180.) xaux2=xaux2-360.0
     
    445453  write(*,'(a,2i7)') ' Vertical levels in ECMWF data: ', &
    446454       nuvz+1,nwz
    447   write(*,*)
    448   write(*,'(a)') 'gridcheck> Mother domain:'
    449   write(*,'(a,f10.5,a,f10.5,a,f10.5)') 'gridcheck> Longitude range: ', &
     455  !write(*,*)
     456  write(*,'(a)') ' Mother domain:'
     457  write(*,'(a,f10.5,a,f10.5,a,f10.5)') ' Longitude range: ', &
    450458       xlon0,' to ',xlon0+(nx-1)*dx,'   Grid distance: ',dx
    451   write(*,'(a,f10.5,a,f10.5,a,f10.5)') 'gridcheck> Latitude range : ', &
     459  write(*,'(a,f10.5,a,f10.5,a,f10.5)') ' Latitude range : ', &
    452460       ylat0,' to ',ylat0+(ny-1)*dy,'   Grid distance: ',dy
    453461  write(*,*)
  • src/makefile

    rda396a2 rb7ae015  
    66LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
    77LIBPATH2 =   /usr/lib/x86_64-linux-gnu/
    8 FFLAGS   =   -O2           -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
     8#FFLAGS   =   -O2           -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
     9FFLAGS   =    -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
    910#FFLAGS   =   -fbounds-check -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
    1011LDFLAGS  = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
  • src/readpaths.f90

    r18c1336 rb7ae015  
    6565
    6666  if (verbosity.gt.0) then
    67       print*, 'path read', i, '=',  path(i)
     67      print*, 'path read', i, '=',  trim(path(i))
    6868  end if
    6969   
     
    7272
    7373    do i=1,numpath
    74  
    7574    string_test = path(i)
    7675    character_test = string_test(length(i):length(i))
    77     !print*, 'character_test,  string_test ', character_test,  string_test
    78       if ((character_test .NE. '/') .AND. (i .LT. 4))  then
     76    ! print*, 'character_test,  string_test ', character_test,  string_test
     77    ! include nested fields
     78      if ((character_test .NE. '/') .AND. ((i .LT. 4) .OR. (i .EQ. 5) ))  then
     79         if (verbosity.gt.0) then
    7980         print*, 'readpaths> WARNING: path not ending in /'
    8081         print*, path(i)
     82         endif
    8183         path(i) = string_test(1:length(i)) // '/'
    8284         length(i)=length(i)+1
     85         if (verbosity.gt.0) then
    8386         print*, 'fix: padded with /'
    8487         print*, path(i)
    8588         print*, 'length(i) increased 1',  length(i)
     89         endif
    8690      endif
    87 
    8891    end do
    8992
     
    10711030   numbnests=i-1
    108111
    109   if (verbosity.gt.0) then
    110       do i=1,numpath
    111       print*, 'path tested', i, '=',  path(i)
    112       end do
    113   end if
     112  !if (verbosity.gt.0) then
     113  !    do i=1,numpath
     114  !    print*, 'path tested', i, '=',  path(i)
     115  !    end do
     116  !end if
    114117
    115118  close(unitpath)
  • src/readreleases.f90

    r242571d rb7ae015  
    259259  if (stat.ne.0) write(*,*)'ERROR: could not allocate xmasssave'
    260260
    261   write (*,*) 'readreleases> Releasepoints : ', numpoint
     261  if (verbosity.gt.0) then
     262    write (*,*) 'readreleases> Releasepoints : ', numpoint
     263  endif
    262264
    263265  do i=1,numpoint
     
    367369      WETDEP=.true.
    368370      write (*,*) 'Below-cloud scavenging: ON'
     371      if (verbosity.gt.0) then
    369372      write (*,*) 'Below-cloud scavenging coefficients: ',weta(i),i
     373      endif
    370374    else
     375      if (verbosity.gt.0) then
    371376      write (*,*) 'Below-cloud scavenging: OFF'
     377      endif
    372378    endif
    373379   
     
    376382      WETDEP=.true.
    377383      write (*,*) 'In-cloud scavenging: ON'
     384      if (verbosity.gt.0) then
    378385      write (*,*) 'In-cloud scavenging coefficients: ',weta_in(i),wetb_in(i), wetc_in(i), wetd_in(i),i
    379     else
    380       write (*,*) 'In-cloud scavenging: OFF'
     386      endif 
     387  else
     388      if (verbosity.gt.0) then
     389      write (*,*) 'In-cloud scavenging: OFF'
     390      endif
    381391    endif
    382392
  • src/timemanager.f90

    rb4d29ce rb7ae015  
    140140
    141141  do itime=0,ideltas,lsynctime
     142    if (verbosity.gt.0) then
     143           write (*,*) 'timemanager>  itime=', itime
     144    endif
    142145
    143146
     
    197200  !******************
    198201
    199     if (verbosity.gt.0) then
    200            write (*,*) 'timemanager>  Release particles'
    201     endif
     202    !if (verbosity.gt.0) then
     203    !       write (*,*) 'timemanager>  Release particles'
     204    !endif
    202205
    203206    if (mdomainfill.ge.1) then
     
    215218    else
    216219      if (verbosity.gt.0) then
    217         print*,'call releaseparticles' 
     220        print*,'timemanager> call releaseparticles' 
    218221      endif
    219222      call releaseparticles(itime)
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG