Changeset ec7fc72 in flexpart.git


Ignore:
Timestamp:
Apr 7, 2016, 9:03:50 AM (3 years ago)
Author:
Espen Sollum ATMOS <eso@…>
Branches:
dev, release-10, univie
Children:
93786a1
Parents:
7e52e2e
Message:

Minor cosmetic edits

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • README_PARALLEL.md

    r5f42c27 rec7fc72  
    168168    * NetCDF output
    169169    * Namelist input/output
    170 
    171  -Implemented but untested:
    172170    * Domain-filling trajectory calculations
    173171    * Nested wind fields
    174172
     173 -Implemented but untested:
     174
     175    * Backward runs (but not initial_cond_output.f90)
     176
    175177 -The following will most probably not work (untested/under developement):
    176178
    177     * Backward runs
     179    * Calculation/output of fluxes
    178180
    179181 -This will positively NOT work yet
  • src/mpi_mod.f90

    r1c3c778 rec7fc72  
    120120  logical, parameter :: mp_dbg_out = .false.
    121121  logical, parameter :: mp_time_barrier=.true.
    122   logical, parameter :: mp_measure_time=.true.
     122  logical, parameter :: mp_measure_time=.false.
    123123  logical, parameter :: mp_exact_numpart=.true.
    124124
  • src/readspecies.f90

    r9484483 rec7fc72  
    151151!  write(*,*) density(pos_spec)
    152152    read(unitspecies,'(e18.1)',end=22) dquer(pos_spec)
    153 !  write(*,*) dquer(pos_spec)
     153    write(*,*) 'dquer(pos_spec):', dquer(pos_spec)
    154154    read(unitspecies,'(e18.1)',end=22) dsigma(pos_spec)
    155155!  write(*,*) dsigma(pos_spec)
     
    292292  endif
    293293
    294   if ((weta(pos_spec).gt.0).and.(henry(pos_spec).le.0)) then
     294  if (((weta(pos_spec).gt.0).or.(wetb(pos_spec).gt.0)).and.(henry(pos_spec).le.0)) then
    295295    if (dquer(pos_spec).le.0) goto 996 ! no particle, no henry set
    296296  endif
  • src/timemanager.f90

    r6a678e3 rec7fc72  
    145145!CGZ-lifetime: set lifetime to 0
    146146 
    147 
     147  write(*,46) float(itime)/3600,itime,numpart
    148148
    149149  if (verbosity.gt.0) then
     
    431431
    432432        !write(*,46) float(itime)/3600,itime,numpart
    433 45      format(i9,' SECONDS SIMULATED: ',i8, ' PARTICLES:    Uncertainty: ',3f7.3)
    434 46      format(' Simulated ',f7.1,' hours (',i9,' s), ',i8, ' particles')
     43345      format(i13,' SECONDS SIMULATED: ',i13, ' PARTICLES:    Uncertainty: ',3f7.3)
     43446      format(' Simulated ',f7.1,' hours (',i13,' s), ',i13, ' particles')
    435435        if (ipout.ge.1) call partoutput(itime)    ! dump particle positions
    436436        loutnext=loutnext+loutstep
  • src/timemanager_mpi.f90

    r7e52e2e rec7fc72  
    491491          if (mp_measure_time) call mpif_mtime('iotime',1)
    492492
    493 ! :TODO: Correct calling of conc_surf above?
    494 
    495 !   call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
    496 ! endif
    497 
    498493          if (nested_output.eq.1) then
    499494
     
    691686
    692687        if (mp_measure_time) call mpif_mtime('advance',0)
    693 !mp_advance_wtime_beg = mpi_wtime()
    694688
    695689        call advance(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), &
     
    698692
    699693        if (mp_measure_time) call mpif_mtime('advance',1)
    700 
    701         ! mp_advance_wtime_end = mpi_wtime()
    702         ! mp_advance_wtime_total = mp_advance_wtime_total + (mp_advance_wtime_end - &
    703         !      & mp_advance_wtime_beg)
    704694
    705695
  • src/wetdepo.f90

    r1c3c778 rec7fc72  
    258258      wetscav=0.   
    259259
    260 !ZHG test if it nested?
    261260      if (ngrid.gt.0) then
    262261        act_temp=ttn(ix,jy,hz,n,ngrid)
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG