- Timestamp:
- Apr 7, 2016, 9:03:50 AM (8 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 93786a1
- Parents:
- 7e52e2e
- Location:
- src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mpi_mod.f90
r1c3c778 rec7fc72 120 120 logical, parameter :: mp_dbg_out = .false. 121 121 logical, parameter :: mp_time_barrier=.true. 122 logical, parameter :: mp_measure_time=. true.122 logical, parameter :: mp_measure_time=.false. 123 123 logical, parameter :: mp_exact_numpart=.true. 124 124 -
src/readspecies.f90
r9484483 rec7fc72 151 151 ! write(*,*) density(pos_spec) 152 152 read(unitspecies,'(e18.1)',end=22) dquer(pos_spec) 153 ! write(*,*)dquer(pos_spec)153 write(*,*) 'dquer(pos_spec):', dquer(pos_spec) 154 154 read(unitspecies,'(e18.1)',end=22) dsigma(pos_spec) 155 155 ! write(*,*) dsigma(pos_spec) … … 292 292 endif 293 293 294 if (( weta(pos_spec).gt.0).and.(henry(pos_spec).le.0)) then294 if (((weta(pos_spec).gt.0).or.(wetb(pos_spec).gt.0)).and.(henry(pos_spec).le.0)) then 295 295 if (dquer(pos_spec).le.0) goto 996 ! no particle, no henry set 296 296 endif -
src/timemanager.f90
r6a678e3 rec7fc72 145 145 !CGZ-lifetime: set lifetime to 0 146 146 147 147 write(*,46) float(itime)/3600,itime,numpart 148 148 149 149 if (verbosity.gt.0) then … … 431 431 432 432 !write(*,46) float(itime)/3600,itime,numpart 433 45 format(i 9,' SECONDS SIMULATED: ',i8, ' PARTICLES: Uncertainty: ',3f7.3)434 46 format(' Simulated ',f7.1,' hours (',i 9,' s), ',i8, ' particles')433 45 format(i13,' SECONDS SIMULATED: ',i13, ' PARTICLES: Uncertainty: ',3f7.3) 434 46 format(' Simulated ',f7.1,' hours (',i13,' s), ',i13, ' particles') 435 435 if (ipout.ge.1) call partoutput(itime) ! dump particle positions 436 436 loutnext=loutnext+loutstep -
src/timemanager_mpi.f90
r7e52e2e rec7fc72 491 491 if (mp_measure_time) call mpif_mtime('iotime',1) 492 492 493 ! :TODO: Correct calling of conc_surf above?494 495 ! call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)496 ! endif497 498 493 if (nested_output.eq.1) then 499 494 … … 691 686 692 687 if (mp_measure_time) call mpif_mtime('advance',0) 693 !mp_advance_wtime_beg = mpi_wtime()694 688 695 689 call advance(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), & … … 698 692 699 693 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)704 694 705 695 -
src/wetdepo.f90
r1c3c778 rec7fc72 258 258 wetscav=0. 259 259 260 !ZHG test if it nested?261 260 if (ngrid.gt.0) then 262 261 act_temp=ttn(ix,jy,hz,n,ngrid)
Note: See TracChangeset
for help on using the changeset viewer.