Changeset 1822 for palm/trunk/SOURCE/lpm_read_restart_file.f90

Timestamp:

Apr 7, 2016 7:49:42 AM (8 years ago)

Author:

hoffmann

Message:

changes in LPM and bulk cloud microphysics

File:

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

palm/trunk/SOURCE/lpm_read_restart_file.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Tails removed. Unused variables removed.
 ! 
 ! Former revisions:
@@ -54 +54 @@
 
     USE indices,                                                               &
-        ONLY:  nx, nxl, nxlg, nxr, nxrg, ny, nyn, nyng, nys, nysg, nz, nzb, nzt
+        ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt
 
     USE kinds
@@ -64 +64 @@
         ONLY:  alloc_factor, bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,         &
                grid_particles, maximum_number_of_particles,                    &
-               maximum_number_of_tailpoints, maximum_number_of_tails,          &
-               min_nr_particle, new_tail_id, number_of_particles,              &
-               number_of_particle_groups, number_of_tails, particles,          &
-               particle_groups, particle_tail_coordinates, particle_type,      &
-               prt_count, sort_count, tail_mask, time_prel,                    &
-               time_write_particle_data, uniform_particles,                    &
-               use_particle_tails, zero_particle
+               min_nr_particle, number_of_particles, number_of_particle_groups,&
+               particle_groups, particle_type, prt_count, time_prel,           &
+               time_write_particle_data, uniform_particles, zero_particle
 
     USE pegrid
@@ -100 +96 @@
 !-- First compare the version numbers
     READ ( 90 )  version_on_file
-    particle_binary_version = '3.2'
+    particle_binary_version = '4.0'
     IF ( TRIM( version_on_file ) /= TRIM( particle_binary_version ) )  THEN
        message_string = 'version mismatch concerning data from prior ' // &
@@ -114 +110 @@
 !-- min_nr_particle, the remainder is initialized by zero_particle to avoid
 !-- errors.
-#if defined( __twocachelines )
-    zero_particle = particle_type( 0.0_wp, 0.0_sp, 0.0_sp, 0.0_sp, 0.0_sp,  &
-                                   0.0_sp, 0.0_sp, 0.0_wp, 0.0_wp, 0.0_wp,  &
-                                   0, .FALSE., 0.0_wp, 0.0_wp, 0.0_wp,      &
-                                   0.0_sp, 0.0_sp, 0.0_sp, 0.0_sp, 0.0_sp,  &
-                                   0.0_sp, 0, 0, 0, -1)
-#else
     zero_particle = particle_type( 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
                                    0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
@@ -126 +115 @@
                                    0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0, 0, 0, &
                                    0, .FALSE., -1)
-#endif
-
 !
 !-- Read some particle parameters and the size of the particle arrays,
 !-- allocate them and read their contents.
     READ ( 90 )  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,                  &
-                 maximum_number_of_tailpoints, maximum_number_of_tails,     &
-                 number_of_particle_groups, number_of_tails,                &
-                 particle_groups, time_prel, time_write_particle_data,      &
-                 uniform_particles
+                 number_of_particle_groups, particle_groups, time_prel,     &
+                 time_write_particle_data, uniform_particles
 
     ALLOCATE( prt_count(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                     &
@@ -177 +162 @@
     ENDDO
 
-!
-!-- particle tails currently not available
-!    IF ( use_particle_tails )  THEN
-!       ALLOCATE( particle_tail_coordinates(maximum_number_of_tailpoints,5, &
-!                 maximum_number_of_tails),                                 &
-!                 new_tail_id(maximum_number_of_tails),                     &
-!                 tail_mask(maximum_number_of_tails) )
-!       READ ( 90 )  particle_tail_coordinates
-!    ENDIF
-
     CLOSE ( 90 )
 !