Changeset 1359 for palm/trunk/SOURCE/lpm_write_restart_file.f90

Timestamp:

Apr 11, 2014 5:15:14 PM (10 years ago)

Author:

hoffmann

Message:

new Lagrangian particle structure integrated

File:

• palm/trunk/SOURCE/lpm_write_restart_file.f90 (modified) (7 diffs)

palm/trunk/SOURCE/lpm_write_restart_file.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
+! New particle structure integrated. 
 !
 ! Former revisions:
@@ -48 +48 @@
         ONLY:  io_blocks, io_group
 
+    USE indices,                                                               &
+        ONLY:  nxl, nxr, nyn, nys, nzb, nzt
+
     USE kinds
 
     USE particle_attributes,                                                   &
-        ONLY:  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t, initial_particles,    &
-        maximum_number_of_particles,  maximum_number_of_tails,                 &
-        maximum_number_of_tailpoints, number_of_initial_particles,             &
-        number_of_particles, number_of_particle_groups, number_of_tails,       &
-        particles, particle_groups, particle_tail_coordinates, prt_count,      &
-        prt_start_index, time_prel, time_write_particle_data,                  &
-        uniform_particles, use_particle_tails
+        ONLY:  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t, grid_particles,       &
+               maximum_number_of_tails, maximum_number_of_tailpoints,          &
+               number_of_particles, number_of_particle_groups,                 &
+               number_of_tails, particles, particle_groups,                    &
+               particle_tail_coordinates, prt_count, time_prel,                &
+               time_write_particle_data, uniform_particles,                    &
+               use_particle_tails, zero_particle
 
     USE pegrid
@@ -64 +67 @@
 
     CHARACTER (LEN=10) ::  particle_binary_version   !:
+
     INTEGER(iwp) ::  i                               !:
+    INTEGER(iwp) ::  ip                              !:
+    INTEGER(iwp) ::  jp                              !:
+    INTEGER(iwp) ::  kp                              !:
 
 !
@@ -83 +90 @@
     ENDIF
 
-    DO  i = 0, io_blocks-1
+!    DO  i = 0, io_blocks-1
 
-       IF ( i == io_group )  THEN
+!       IF ( i == io_group )  THEN
 
 !
@@ -94 +101 @@
 !--                  to be read in lpm_read_restart_file must be adjusted
 !--                  accordingly.
-          particle_binary_version = '3.0'
+          particle_binary_version = '3.2'
           WRITE ( 90 )  particle_binary_version
 
@@ -101 +108 @@
 !--       well as other dvrp-plot variables.
           WRITE ( 90 )  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,              &
-                        maximum_number_of_particles,                           &
                         maximum_number_of_tailpoints, maximum_number_of_tails, &
-                        number_of_initial_particles, number_of_particles,      &
                         number_of_particle_groups, number_of_tails,            &
                         particle_groups, time_prel, time_write_particle_data,  &
                         uniform_particles
 
-          IF ( number_of_initial_particles /= 0 ) WRITE ( 90 ) initial_particles
+          WRITE ( 90 )  prt_count
+          
+          DO  ip = nxl, nxr
+             DO  jp = nys, nyn
+                DO  kp = nzb+1, nzt
+                   number_of_particles = prt_count(kp,jp,ip)
+                   particles => grid_particles(kp,jp,ip)%particles(1:number_of_particles)
+                   IF ( number_of_particles <= 0 )  CYCLE
+                   WRITE ( 90 )  particles
+                ENDDO
+             ENDDO
+          ENDDO
 
-          WRITE ( 90 )  prt_count, prt_start_index
-          WRITE ( 90 )  particles
-
-          IF ( use_particle_tails )  THEN
-             WRITE ( 90 )  particle_tail_coordinates
-          ENDIF
+!
+!--       particle tails currently not available
+!          IF ( use_particle_tails )  THEN
+!             WRITE ( 90 )  particle_tail_coordinates
+!          ENDIF
 
           CLOSE ( 90 )
 
-       ENDIF
+!       ENDIF
 
 #if defined( __parallel )
@@ -125 +140 @@
 #endif
 
-    ENDDO
+ !   ENDDO