Changes in / [e31b3b5:8ed5f11] in flexpart.git

Files:

• README_PARALLEL.md (modified) (1 diff)
• src/mpi_mod.f90 (modified) (1 diff)
• src/readspecies.f90 (modified) (2 diffs)
• src/timemanager.f90 (modified) (2 diffs)
• src/timemanager_mpi.f90 (modified) (3 diffs)
• src/wetdepo.f90 (modified) (1 diff)

README_PARALLEL.md

@@ -168 +168 @@
     * 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): 
 
-    * Calculation/output of fluxes 
+    * Backward runs
 
  -This will positively NOT work yet

src/mpi_mod.f90

@@ -120 +120 @@
   logical, parameter :: mp_dbg_out = .false.
   logical, parameter :: mp_time_barrier=.true.
-  logical, parameter :: mp_measure_time=.false.
+  logical, parameter :: mp_measure_time=.true.
   logical, parameter :: mp_exact_numpart=.true.
 

src/readspecies.f90

@@ -151 +151 @@
 !  write(*,*) density(pos_spec)
     read(unitspecies,'(e18.1)',end=22) dquer(pos_spec)
-    write(*,*) 'dquer(pos_spec):', dquer(pos_spec)
+!  write(*,*) dquer(pos_spec)
     read(unitspecies,'(e18.1)',end=22) dsigma(pos_spec)
 !  write(*,*) dsigma(pos_spec)
@@ -292 +292 @@
   endif
 
-  if (((weta(pos_spec).gt.0).or.(wetb(pos_spec).gt.0)).and.(henry(pos_spec).le.0)) then
+  if ((weta(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

@@ -145 +145 @@
 !CGZ-lifetime: set lifetime to 0
   
-  write(*,46) float(itime)/3600,itime,numpart
+
 
   if (verbosity.gt.0) then
@@ -431 +431 @@
 
         !write(*,46) float(itime)/3600,itime,numpart
-45      format(i13,' SECONDS SIMULATED: ',i13, ' PARTICLES:    Uncertainty: ',3f7.3)
-46      format(' Simulated ',f7.1,' hours (',i13,' s), ',i13, ' particles')
+45      format(i9,' SECONDS SIMULATED: ',i8, ' PARTICLES:    Uncertainty: ',3f7.3)
+46      format(' Simulated ',f7.1,' hours (',i9,' s), ',i8, ' particles')
         if (ipout.ge.1) call partoutput(itime)    ! dump particle positions
         loutnext=loutnext+loutstep

src/timemanager_mpi.f90

@@ -494 +494 @@
           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
 
@@ -689 +694 @@
 
         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), &
@@ -695 +701 @@
 
         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)
 
 

src/wetdepo.f90

@@ -258 +258 @@
       wetscav=0.   
 
+!ZHG test if it nested?
       if (ngrid.gt.0) then
         act_temp=ttn(ix,jy,hz,n,ngrid)