Changeset 52aabab in flexpart.git


Ignore:
Timestamp:
Mar 1, 2015, 5:21:00 PM (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:
b7ae015
Parents:
4ba50e6 (diff), e603ee6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merged changes from bitbucket and branch laptop

Files:
44 added
13 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r4ba50e6 r52aabab  
    22*.o
    33*_mod.mod
     4.DS_Store
     5output

  • preproc/python/FlexpartTools.py

    r5763793 r0e29ef4  
    353353        index_keys=["date","time","stepRange"]
    354354        indexfile="date_time_stepRange.idx"
     355        silentremove(indexfile)
    355356        grib=GribTools(inputfiles.files)
    356357        iid=grib.index(index_keys=index_keys, index_file = indexfile)
    357358
     359        print 'index done...'
    358360        silentremove("fort.10")
    359361        silentremove("fort.11")
    … …  
    389391                step = grib_get(gid, 'stepRange')
    390392                cflextime = self.getFlexpartTime(type,step, time)
     393#                print 'cyear '+cyear+'/'+cmonth+'/'+'/EI'+cyear[2:4]+cmonth+cday+cflextime
    391394            while 1: 
    392395                if gid is None: break
    … …  
    420423# create the corresponding output file  fort.15 (generated by CONVERT2) + fort.16 (paramId 167 and paramId 168) 
    421424                mkdir_p(outputdir+'/'+cyear+'/'+cmonth+'/')
     425                print "outputdir = " + outputdir+'/'+cyear+'/'+cmonth+'/'+'/EI'+cyear[2:4]+cmonth+cday+cflextime
    422426                fout = open(outputdir+'/'+cyear+'/'+cmonth+'/EI'+cyear[2:4]+cmonth+cday+cflextime,'wb')   
    423427                shutil.copyfileobj(open('fort.15','rb'), fout)     
    … …  
    427431        grib_index_release(iid)
    428432
    429     def clean(self):
     433    def __del__(self):
    430434        print "clean"
    431 
     435        silentremove("fort.10")
     436        silentremove("fort.11")
     437        silentremove("fort.12")
     438        silentremove("fort.13")
     439        silentremove("fort.15")
     440        silentremove("fort.16")
     441        silentremove("fort.18")
     442        silentremove("VERTICAL.EC")
     443        silentremove("date_time_stepRange.idx")
     444

  • preproc/python/GribTools.py

    r5763793 r0e29ef4  
    118118# Create index from a list of files if it does not exist or read it
    119119    def index(self,index_keys=["mars"], index_file = "my.idx"):
     120        print "index to be done"
    120121        self.iid = None
    121122 

  • preproc/python/getEIdata.py

    r5763793 r0e29ef4  
    9292    for date in daterange( start, end ):
    9393# if new year & month then we create a new directory to store output files
    94         er_date = date
    95         if date.strftime("%Y%m") != current_ym:
    96             current_outputdir =  outputdir + "/"  + date.strftime("%Y") + '/' + date.strftime("%m") + '/'
    97             mkdir_p(current_outputdir)
    98             if current_ym != "":
     94        if date.strftime("%Y%m") != current_ym and current_ym != "":
    9995               retrieve="yes"
    10096
    … …  
    106102                flexpart = EIFlexpart()
    107103                dates= ir_date.strftime("%Y%m%d") + "/to/" + er_date.strftime("%Y%m%d")
     104                current_outputdir =  outputdir + "/"  + ir_date.strftime("%Y") + '/' + ir_date.strftime("%m") + '/'
     105                mkdir_p(current_outputdir)
     106                print "retrieve " + dates + " in dir " + current_outputdir
    108107                flexpart.retrieve(server, dates, options.times, options.area, options.levels, current_outputdir)
    109                 ir_date = er_date
     108                ir_date = date
     109                retrieve="no"
     110
     111        er_date = date
    110112
    111113        current_ym =  date.strftime("%Y%m")

  • preproc/python/prepareFLEXPART.py

    r5763793 r0e29ef4  
    9090# data retrieved by year/month
    9191           if cyear != date.year or cmonth != date.month:
    92              print 'year : ' + str(date.year) + ' month : ', date.month
     92             print 'Prepare year : ' + str(date.year) + ' month : ', date.month
    9393             cyear = date.year
    9494             cmonth = date.month
    … …  
    102102             flexpart = EIFlexpart()
    103103             flexpart.create(inputfiles, outputdir)
     104             
    104105
    105106if __name__ == "__main__":

  • src/FLEXPART.f90

    rb4d29ce r414a5e5  
    5050  integer :: idummy = -320
    5151  character(len=256) :: inline_options  !pathfile, flexversion, arg2
    52 
     52  integer :: index_v
    5353
    5454  ! Generate a large number of random numbers
    … …  
    6161
    6262  ! FLEXPART version string
    63   flexversion='Version 9.2 beta (2014-07-01)'
    64   verbosity=0
    65 
     63  ! flexversion='Version 9.2 beta (2014-07-01)'
     64  flexversion='Version 9.2.0.1 (2015-01-27)'
     65  ! default inlide options
     66  inline_options='none'
     67  !verbosity flags  defined in com_mod.f90
     68 
    6669  ! Read the pathnames where input/output files are stored
    6770  !*******************************************************
    6871
    69   inline_options='none'
    7072  select case (iargc())
    71   case (2)
     73  case (2) !2 parameters: pathfile and inline options
    7274    call getarg(1,arg1)
    7375    pathfile=arg1
    7476    call getarg(2,arg2)
    7577    inline_options=arg2
    76   case (1)
     78  case (1) !1 parameter pathfiel or inline options
    7779    call getarg(1,arg1)
    7880    pathfile=arg1
    … …  
    8183      inline_options=arg1
    8284    endif
    83   case (0)
     85  case (0) !default behavior
    8486    write(pathfile,'(a11)') './pathnames'
    8587  end select
    … …  
    8991  print*,'Welcome to FLEXPART ', trim(flexversion)
    9092  print*,'FLEXPART is free software released under the GNU General Public License.'
     93
     94  ! inline options allow to fine tune the verbosity during run time
     95  ! e.g.: show compilation parameters or input variables, time execution     
     96  if (inline_options(1:1).eq.'-') then
     97   ! if (index(inline_options,'v').gt.0) then
     98   !    print*, 'verbose mode'
     99   !    verbosity=1
     100   !    index_v=index(inline_options,'v')
     101   !    if (inline_options(index_v+1:index_v+1).eq.'2') then
     102   !    verbosity=2
     103   !    endif         
     104   ! endif   
    91105 
    92   if (inline_options(1:1).eq.'-') then
    93     if (trim(inline_options).eq.'-v'.or.trim(inline_options).eq.'-v1') then
    94        print*, 'Verbose mode 1: display detailed information during run'
     106    !if (trim(inline_options).eq.'-v'.or.trim(inline_options).eq.'-v1') then
     107    if (index(inline_options,'v').gt.0) then
     108       index_v=index(inline_options,'v')
     109       print*, 'Verbose mode: display  additional information during run'
    95110       verbosity=1
    96     endif
    97     if (trim(inline_options).eq.'-v2') then
    98        print*, 'Verbose mode 2: display more detailed information during run'
     111       if (inline_options(index_v+1:index_v+1).eq.'2') then
    99112       verbosity=2
    100     endif
    101     if (trim(inline_options).eq.'-i') then
    102        print*, 'Info mode: provide detailed run specific information and stop'
     113       endif
     114       print*, 'verbosity level=', verbosity !inline_options(index_v+1:index_v+1)
     115             
     116    endif
     117    !iif (trim(inline_options).eq.'-v2') then
     118    !   print*, 'Verbose mode 2: display more detailed information during run'
     119    !   verbosity=2
     120    !endif
     121
     122    if (index(inline_options,'i').gt.0) then   
     123    !if (trim(inline_options).eq.'-i') then
     124       index_v=index(inline_options,'i')
     125       print*, 'Info mode: provide run specific information and stop'
    103126       verbosity=1
    104127       info_flag=1
    105     endif
    106     if (trim(inline_options).eq.'-i2') then
    107        print*, 'Info mode: provide more detailed run specific information and stop'
    108        verbosity=2
    109        info_flag=1
    110     endif
     128       !if (trim(inline_options).eq.'-i2') then
     129       if (inline_options(index_v+1:index_v+1).eq.'2') then
     130           print*, 'Including input files'
     131       !   verbosity=1
     132       info_flag=2
     133       endif
     134    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
     140    if (index(inline_options,'t').gt.0) then
     141       time_flag=1
     142       print*, 'timing execution: not implemented'
     143       !stop
     144    endif
     145    if (index(inline_options,'d').gt.0) then
     146       debug_flag=1
     147       print*, 'debug: not implemented'
     148       print*, 'debug_flag=', debug_flag
     149       !stop
     150    endif
    111151  endif
    112152           
    113153  if (verbosity.gt.0) then
     154    print*, 'FLEXPART>******************************'
     155    print*, 'FLEXPART>* verbosity level:', verbosity
     156    print*, 'FLEXPART>* info only:      ', info_flag
     157    print*, 'FLEXPART>* time execution: ', time_flag
     158    print*, 'FLEXPART>******************************'
     159   
     160    print*, 'FLEXPART> parameters from par_mod'   
     161    print*, 'FLEXPART> nxmax=  ', nxmax
     162    print*, 'FLEXPART> nymax=  ', nymax
     163    print*, 'FLEXPART> nuvzmax=', nuvzmax
     164    print*, 'FLEXPART> nwzmax= ', nwzmax
     165    print*, 'FLEXPART> nzmax=  ', nzmax
     166    print*, 'FLEXPART> nxshift=', nxshift
     167    print*, 'FLEXPART> maxpart=', maxpart
     168    print*, 'FLEXPART> maxspec=', maxspec
     169
     170    if (info_flag.eq.1) stop
    114171    write(*,*) 'call readpaths'
    115172  endif
    116173  call readpaths(pathfile)
    117174 
    118   if (verbosity.gt.1) then !show clock info
    119      !print*,'length(4)',length(4)
     175  !if (time_flag.gt.1) then !show clock info
    120176     !count=0,count_rate=1000
    121      CALL SYSTEM_CLOCK(count_clock0, count_rate, count_max)
     177  CALL SYSTEM_CLOCK(count_clock0, count_rate, count_max)
    122178     !WRITE(*,*) 'SYSTEM_CLOCK',count, count_rate, count_max
    123179     !WRITE(*,*) 'SYSTEM_CLOCK, count_clock0', count_clock0
    124180     !WRITE(*,*) 'SYSTEM_CLOCK, count_rate', count_rate
    125181     !WRITE(*,*) 'SYSTEM_CLOCK, count_max', count_max
    126   endif
     182  !endif
    127183
    128184  ! Read the user specifications for the current model run
    … …  
    134190  call readcommand
    135191  if (verbosity.gt.0) then
    136     write(*,*) '    ldirect=', ldirect
    137     write(*,*) '    ibdate,ibtime=',ibdate,ibtime
     192    write(*,*) '    ldirect      =', ldirect
     193    write(*,*) '    ibdate,ibtime=', ibdate,ibtime
    138194    write(*,*) '    iedate,ietime=', iedate,ietime
    139     if (verbosity.gt.1) then   
     195  endif
     196    if (time_flag.gt.0) then   
    140197      CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
    141198      write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
    142199    endif     
    143   endif
    144200
    145201  ! Read the age classes to be used
    … …  
    150206  call readageclasses
    151207
    152   if (verbosity.gt.1) then   
     208  if (time_flag.gt.1) then   
    153209    CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
    154210    write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
    … …  
    168224 
    169225  if (verbosity.gt.0) then
    170      write(*,*) 'call gridcheck'
    171   endif
    172 
     226     write(*,*) 'FLEXPART> call gridcheck'
     227  endif
    173228  call gridcheck
    174229
    175   if (verbosity.gt.1) then   
     230  if (time_flag.gt.0) then   
    176231    CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
    177232    write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
    … …  
    187242
    188243  if (verbosity.gt.0) then
    189     write(*,*) 'call readoutgrid'
     244    write(*,*) 'FLEXPART> call readoutgrid'
    190245  endif
    191246
    … …  
    195250    call readoutgrid_nest
    196251    if (verbosity.gt.0) then
    197       write(*,*) '# readoutgrid_nest'
     252      write(*,*) 'FLEXPART> readoutgrid_nest'
    198253    endif
    199254  endif
    … …  
    203258
    204259  if (verbosity.eq.1) then
    205      print*,'call readreceptors'
     260     print*,'FLEXPART> call readreceptors'
    206261  endif
    207262  call readreceptors
    … …  
    217272
    218273  if (verbosity.gt.0) then
    219     print*,'call readlanduse'
     274    print*,'FLEXPART> call readlanduse'
    220275  endif
    221276  call readlanduse
    … …  
    225280
    226281  if (verbosity.gt.0) then
    227     print*,'call assignland'
     282    print*,'FLEXPART> call assignland'
    228283  endif
    229284  call assignland
    … …  
    233288
    234289  if (verbosity.gt.0) then
    235     print*,'call readreleases'
     290    print*,'FLEXPART> call readreleases'
    236291  endif
    237292  call readreleases
    … …  
    273328  else
    274329    if (verbosity.gt.0) then
    275       print*,'numpart=0, numparticlecount=0'
     330      print*,'set numpart=0, numparticlecount=0'
    276331    endif   
    277332    numpart=0
    … …  
    308363
    309364  call writeheader
    310   ! FLEXPART 9.2 ticket ?? write header in ASCII format
     365  ! write header in ASCII format
    311366  call writeheader_txt
    312367  !if (nested_output.eq.1) call writeheader_nest
    … …  
    357412  !********************************
    358413
    359   if (verbosity.gt.0) then
    360      if (verbosity.gt.1) then   
    361        CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
    362        write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
    363      endif
    364      if (info_flag.eq.1) then
    365        print*, 'info only mode (stop)'   
    366        stop
    367      endif
     414  if (time_flag.gt.0) then   
     415    CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
     416    write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
     417  endif
     418  if (info_flag.eq.2) then
     419    print*, 'info only mode (stop before call timemanager)'
     420    stop
     421  endif
     422  if (verbosity.gt.0) then
    368423     print*,'call timemanager'
    369424  endif

  • src/com_mod.f90

    rb4d29ce re92a713  
    2323  !****************************************************************
    2424
    25   character :: path(numpath+2*maxnests)*120
     25  character :: path(numpath+2*maxnests)*256
    2626  integer :: length(numpath+2*maxnests)
    2727  character(len=256) :: pathfile, flexversion, arg1, arg2
    … …  
    686686  integer :: verbosity=0
    687687  integer :: info_flag=0
     688  integer :: time_flag=0
     689  integer :: debug_flag=0
    688690  integer :: count_clock, count_clock0,  count_rate, count_max
    689691  logical :: nmlout=.true.

  • src/gridcheck.f90

    rb4d29ce r6470a47  
    446446       nuvz+1,nwz
    447447  write(*,*)
    448   write(*,'(a)') ' Mother domain:'
    449   write(*,'(a,f10.5,a,f10.5,a,f10.5)') '  Longitude range: ', &
     448  write(*,'(a)') 'gridcheck> Mother domain:'
     449  write(*,'(a,f10.5,a,f10.5,a,f10.5)') 'gridcheck>  Longitude range: ', &
    450450       xlon0,' to ',xlon0+(nx-1)*dx,'   Grid distance: ',dx
    451   write(*,'(a,f10.5,a,f10.5,a,f10.5)') '  Latitude range : ', &
     451  write(*,'(a,f10.5,a,f10.5,a,f10.5)') 'gridcheck>  Latitude range : ', &
    452452       ylat0,' to ',ylat0+(ny-1)*dy,'   Grid distance: ',dy
    453453  write(*,*)
    … …  
    545545       '###### '
    546546  write(*,*)
    547   write(*,'(a)') '!!! PLEASE INSERT A NEW CD-ROM AND   !!!'
    548   write(*,'(a)') '!!! PRESS ANY KEY TO CONTINUE...     !!!'
    549   write(*,'(a)') '!!! ...OR TERMINATE FLEXPART PRESSING!!!'
    550   write(*,'(a)') '!!! THE "X" KEY...                   !!!'
    551   write(*,*)
    552   read(*,'(a)') opt
    553   if(opt.eq.'X') then
     547  !write(*,'(a)') '!!! PLEASE INSERT A NEW CD-ROM AND   !!!'
     548  !write(*,'(a)') '!!! PRESS ANY KEY TO CONTINUE...     !!!'
     549  !write(*,'(a)') '!!! ...OR TERMINATE FLEXPART PRESSING!!!'
     550  !write(*,'(a)') '!!! THE "X" KEY...                   !!!'
     551  !write(*,*)
     552  !read(*,'(a)') opt
     553  !if(opt.eq.'X') then
    554554    stop
    555   else
    556     goto 5
    557   endif
     555  !else
     556  !  goto 5
     557  !endif
    558558
    559559end subroutine gridcheck

  • src/makefile

    r4fbe7a5 rda396a2  
    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)
     8FFLAGS   =   -O2           -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
    99#FFLAGS   =   -fbounds-check -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
    1010LDFLAGS  = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper

  • src/par_mod.f90

    r0b71109 rda396a2  
    123123  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL XF
    124124  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=152,nwzmax=152,nzmax=152 !ECMWF new
    125   integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF
     125  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF
    126126  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=26,nwzmax=26,nzmax=26
    127127  !integer,parameter :: nxmax=721,nymax=361,nuvzmax=64,nwzmax=64,nzmax=64
     128  integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 0.5
    128129  !integer,parameter :: nxmax=1201,nymax=235,nuvzmax=58,nwzmax=58,nzmax=58
    129130
    130131  integer,parameter :: nxshift=359 ! for ECMWF
     132  !integer,parameter :: nxshift=718 ! for ECMWF 0.5
    131133  !integer,parameter :: nxshift=0     ! for GFS or FNL (XF)
    132134
    … …  
    154156  !*********************************************
    155157
    156   integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
    157   !integer,parameter :: maxnests=1,nxmaxn=351,nymaxn=351 !ECMWF
     158  !integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
     159  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=351 !ECMWF
    158160  !integer,parameter :: maxnests=1, nxmaxn=201, nymaxn=161 ! FNL XF
    159161  ! maxnests                maximum number of nested grids
    … …  
    198200  !**************************************************
    199201
    200   integer,parameter :: maxpart=150000
    201   integer,parameter :: maxspec=4
     202  integer,parameter :: maxpart=4000000
     203  integer,parameter :: maxspec=1
    202204
    203205

  • src/readcommand.f90

    rb4d29ce rcd1f691  
    444444  if ((ipout.ne.0).and.(ipout.ne.1).and.(ipout.ne.2)) then
    445445    write(*,*) ' #### FLEXPART MODEL ERROR! FILE COMMAND:     #### '
    446     write(*,*) ' #### IPOUT MUST BE 1, 2 OR 3!                #### '
     446    write(*,*) ' #### IPOUT MUST BE 0, 1, or 2!                #### '
    447447    stop
    448448  endif

  • src/readpaths.f90

    rb4d29ce r18c1336  
    6363    length(i)=index(path(i),' ')-1
    6464
     65
     66  if (verbosity.gt.0) then
     67      print*, 'path read', i, '=',  path(i)
     68  end if
    6569   
     70  end do
     71
     72
     73    do i=1,numpath
     74 
    6675    string_test = path(i)
    6776    character_test = string_test(length(i):length(i))
    6877    !print*, 'character_test,  string_test ', character_test,  string_test
    6978      if ((character_test .NE. '/') .AND. (i .LT. 4))  then
    70          print*, 'WARNING: path not ending in /'
     79         print*, 'readpaths> WARNING: path not ending in /'
    7180         print*, path(i)
    7281         path(i) = string_test(1:length(i)) // '/'
    … …  
    7483         print*, 'fix: padded with /'
    7584         print*, path(i)
    76          print*, 'length(i) increased 1'
     85         print*, 'length(i) increased 1',  length(i)
    7786      endif
    78   end do
     87
     88    end do
     89
     90
    7991
    8092  ! Check whether any nested subdomains are to be used
    … …  
    9510730   numbnests=i-1
    96108
     109  if (verbosity.gt.0) then
     110      do i=1,numpath
     111      print*, 'path tested', i, '=',  path(i)
     112      end do
     113  end if
     114
    97115  close(unitpath)
    98116  return
     117
     118   
     119
    99120
    100121998   write(*,*) ' #### TRAJECTORY MODEL ERROR! ERROR WHILE     #### '

  • src/readreleases.f90

    rb4d29ce r242571d  
    126126  ! prepare namelist output if requested
    127127  if (nmlout.eqv..true.) then
    128     open(unitreleasesout,file=path(2)(1:length(2))//'RELEASES.namelist',access='append',status='new',err=1000)
     128    !open(unitreleasesout,file=path(2)(1:length(2))//'RELEASES.namelist',access='append',status='new',err=1000)
     129    open(unitreleasesout,file=path(2)(1:length(2))//'RELEASES.namelist',err=1000)
    129130  endif
    130131
    … …  
    258259  if (stat.ne.0) write(*,*)'ERROR: could not allocate xmasssave'
    259260
    260   write (*,*) 'Releasepoints : ', numpoint
     261  write (*,*) 'readreleases> Releasepoints : ', numpoint
    261262
    262263  do i=1,numpoint
    … …  
    293294
    294295  do i=1,nspec
     296    if (verbosity.gt.0) then
     297      print*, 'readreleases> call readspecies', i
     298    endif
     299 
    295300    if (readerror.ne.0) then
    296301      read(unitreleases,*,err=998) specnum_rel(i)
    … …  
    494499  endif ! if namelist format
    495500
     501
     502  if (verbosity.gt.1 .and. numpoint.eq.1) then ! verbosity 2 or larger
     503    write(*,*) 'numpoint=', numpoint
     504    print*,  id1,it1
     505    print*,  id2,it2
     506    print*,  xpoint1(numpoint)
     507    print*,  ypoint1(numpoint)
     508    print*,  xpoint2(numpoint)
     509    print*,  ypoint2(numpoint)
     510    print*,  'kindz=' , kindz(numpoint)
     511    print*,  zpoint1(numpoint)
     512    print*,  zpoint2(numpoint)
     513    print*,  npart(numpoint)
     514    do i=1,nspec
     515      !mass(i)=
     516      print*, 'xmass=', xmass(numpoint,i)
     517    end do
     518    print*, compoint(numpoint)
     519  endif
     520
     521
    496522  ! If a release point contains no particles, stop and issue error message
    497523  !***********************************************************************
    … …  
    536562        write(*,*) 'after simulation stops.'
    537563        write(*,*) 'Make files COMMAND and RELEASES consistent.'
     564        write(*,*) jul1, ' < ' , bdate
     565        write(*,*) ' .or. '
     566        write(*,*) jul2 , ' > ', edate
     567       
    538568        stop
    539569      endif
    … …  
    563593  endif
    564594
     595  if (verbosity.gt.1 .and. numpoint.eq.1) then ! verbosity 2 or larger
     596    print*, 'ireleasestart(',numpoint,')', ireleasestart(numpoint)
     597    print*, 'ireleaseend(',numpoint,')', ireleaseend(numpoint)
     598  endif
     599
    565600  ! Determine the release rate (particles per second) and total number
    566601  ! of particles released during the simulation

  • src/readspecies.f90

    rb4d29ce r43c8684  
    103103  write(aspecnumb,'(i3.3)') specnum(pos_spec)
    104104  open(unitspecies,file=path(1)(1:length(1))//'SPECIES/SPECIES_'//aspecnumb,status='old',form='formatted',err=998)
    105   !write(*,*) 'reading SPECIES',specnum(pos_spec)
     105 
     106  if (verbosity.gt.0) then
     107    write(*,*) 'reading SPECIES',specnum(pos_spec)
     108  endif
    106109
    107110  ASSSPEC=.FALSE.
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG