Minor cosmetic edits

README_PARALLEL.md

@@ -167,14 +167,16 @@ What is implemented in the MPI version
     * Nested grid output
     * NetCDF output
     * Namelist input/output
-
- -Implemented but untested:
     * Domain-filling trajectory calculations
     * Nested wind fields
 
+ -Implemented but untested:
+
+    * Backward runs (but not initial_cond_output.f90)
+
  -The following will most probably not work (untested/under developement): 
 
-    * Backward runs
+    * Calculation/output of fluxes 
 
  -This will positively NOT work yet
 

src/mpi_mod.f90

@@ -119,7 +119,7 @@ module mpi_mod
   logical, parameter :: mp_dev_mode = .false.
   logical, parameter :: mp_dbg_out = .false.
   logical, parameter :: mp_time_barrier=.true.
-  logical, parameter :: mp_measure_time=.true.
+  logical, parameter :: mp_measure_time=.false.
   logical, parameter :: mp_exact_numpart=.true.
 
 ! for measuring CPU/Wall time

src/readspecies.f90

@@ -150,7 +150,7 @@ subroutine readspecies(id_spec,pos_spec)
     read(unitspecies,'(e18.1)',end=22) density(pos_spec)
 !  write(*,*) density(pos_spec)
     read(unitspecies,'(e18.1)',end=22) dquer(pos_spec)
-!  write(*,*) dquer(pos_spec)
+    write(*,*) 'dquer(pos_spec):', dquer(pos_spec)
     read(unitspecies,'(e18.1)',end=22) dsigma(pos_spec)
 !  write(*,*) dsigma(pos_spec)
     read(unitspecies,'(f18.2)',end=22) dryvel(pos_spec)
@@ -291,7 +291,7 @@ subroutine readspecies(id_spec,pos_spec)
   endif
   endif
 
-  if ((weta(pos_spec).gt.0).and.(henry(pos_spec).le.0)) then
+  if (((weta(pos_spec).gt.0).or.(wetb(pos_spec).gt.0)).and.(henry(pos_spec).le.0)) then
     if (dquer(pos_spec).le.0) goto 996 ! no particle, no henry set
   endif
 

src/timemanager.f90

@@ -144,7 +144,7 @@ subroutine timemanager
   ! print*, 'Initialized lifetime'
 !CGZ-lifetime: set lifetime to 0
   
-
+  write(*,46) float(itime)/3600,itime,numpart
 
   if (verbosity.gt.0) then
     write (*,*) 'timemanager> starting simulation'
@@ -430,8 +430,8 @@ subroutine timemanager
         !CGZ-lifetime: output species lifetime
 
         !write(*,46) float(itime)/3600,itime,numpart
-45      format(i9,' SECONDS SIMULATED: ',i8, ' PARTICLES:    Uncertainty: ',3f7.3)
-46      format(' Simulated ',f7.1,' hours (',i9,' s), ',i8, ' particles')
+45      format(i13,' SECONDS SIMULATED: ',i13, ' PARTICLES:    Uncertainty: ',3f7.3)
+46      format(' Simulated ',f7.1,' hours (',i13,' s), ',i13, ' particles')
         if (ipout.ge.1) call partoutput(itime)    ! dump particle positions
         loutnext=loutnext+loutstep
         loutstart=loutnext-loutaver/2

src/timemanager_mpi.f90

@@ -490,11 +490,6 @@ subroutine timemanager
           endif
           if (mp_measure_time) call mpif_mtime('iotime',1)
 
-! :TODO: Correct calling of conc_surf above?
-
-!   call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
-! endif
-
           if (nested_output.eq.1) then
 
 ! MPI: Root process collects/sums nested grids
@@ -690,7 +685,6 @@ subroutine timemanager
 !*************************************************
 
         if (mp_measure_time) call mpif_mtime('advance',0)
-!mp_advance_wtime_beg = mpi_wtime()
 
         call advance(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), &
              us(j),vs(j),ws(j),nstop,xtra1(j),ytra1(j),ztra1(j),prob, &
@@ -698,10 +692,6 @@ subroutine timemanager
 
         if (mp_measure_time) call mpif_mtime('advance',1)
 
-        ! mp_advance_wtime_end = mpi_wtime()
-        ! mp_advance_wtime_total = mp_advance_wtime_total + (mp_advance_wtime_end - &
-        !      & mp_advance_wtime_beg)
-
 
 ! Calculate the gross fluxes across layer interfaces
 !***************************************************

src/wetdepo.f90

@@ -257,7 +257,6 @@ subroutine wetdepo(itime,ltsample,loutnext)
       wetdeposit(ks)=0. 
       wetscav=0.   
 
-!ZHG test if it nested?
       if (ngrid.gt.0) then
         act_temp=ttn(ix,jy,hz,n,ngrid)
       else