Changeset 60 for palm/trunk/SOURCE/header.f90

Timestamp:

Mar 11, 2007 11:50:04 AM (17 years ago)

Author:

raasch

Message:

preliminary update of further changes, running

File:

• palm/trunk/SOURCE/header.f90 (modified) (4 diffs)

palm/trunk/SOURCE/header.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! Output of netcdf_64bit_3d
+! Output of netcdf_64bit_3d, particles-package is now part of the default code.
 !
 ! Former revisions:
@@ -1028 +1028 @@
     ENDIF
 
-#if defined( __particles )
-!
-!-- Particle attributes
-    WRITE ( io, 480 )  particle_advection_start, dt_prel, bc_par_lr, &
-                       bc_par_ns, bc_par_b, bc_par_t, particle_maximum_age, &
-                       end_time_prel
-    IF ( use_sgs_for_particles )  WRITE ( io, 488 )  dt_min_part
-    IF ( random_start_position )  WRITE ( io, 481 )
-    IF ( particles_per_point > 1 )  WRITE ( io, 489 )  particles_per_point
-    WRITE ( io, 495 )  total_number_of_particles
-    IF ( .NOT. vertical_particle_advection )  WRITE ( io, 482 )
-    IF ( maximum_number_of_tailpoints /= 0 )  THEN
-       WRITE ( io, 483 )  maximum_number_of_tailpoints
-       IF ( minimum_tailpoint_distance /= 0 )  THEN
-          WRITE ( io, 484 )  total_number_of_tails, minimum_tailpoint_distance,&
-                             maximum_tailpoint_age
-       ENDIF
-    ENDIF
-    IF ( dt_write_particle_data /= 9999999.9 )  THEN
-       WRITE ( io, 485 )  dt_write_particle_data
-       output_format = ''
-       IF ( netcdf_output )  THEN
-          IF ( netcdf_64bit )  THEN
-             output_format = 'netcdf (64 bit offset) and binary'
-          ELSE
-             output_format = 'netcdf and binary'
-          ENDIF
-       ELSE
-          output_format = 'binary'
-       ENDIF
-       WRITE ( io, 345 )  output_format
-    ENDIF
-    IF ( dt_dopts /= 9999999.9 )  WRITE ( io, 494 )  dt_dopts
-    IF ( write_particle_statistics )  WRITE ( io, 486 )
-
-    WRITE ( io, 487 )  number_of_particle_groups
-
-    DO  i = 1, number_of_particle_groups
-       IF ( i == 1  .AND.  density_ratio(i) == 9999999.9 )  THEN
-          WRITE ( io, 490 )  i, 0.0
-          WRITE ( io, 492 )
-       ELSE
-          WRITE ( io, 490 )  i, radius(i)
-          IF ( density_ratio(i) /= 0.0 )  THEN
-             WRITE ( io, 491 )  density_ratio(i)
-          ELSE
+    IF ( particle_advection )  THEN
+!
+!--    Particle attributes
+       WRITE ( io, 480 )  particle_advection_start, dt_prel, bc_par_lr, &
+                          bc_par_ns, bc_par_b, bc_par_t, particle_maximum_age, &
+                          end_time_prel
+       IF ( use_sgs_for_particles )  WRITE ( io, 488 )  dt_min_part
+       IF ( random_start_position )  WRITE ( io, 481 )
+       IF ( particles_per_point > 1 )  WRITE ( io, 489 )  particles_per_point
+       WRITE ( io, 495 )  total_number_of_particles
+       IF ( .NOT. vertical_particle_advection )  WRITE ( io, 482 )
+       IF ( maximum_number_of_tailpoints /= 0 )  THEN
+          WRITE ( io, 483 )  maximum_number_of_tailpoints
+          IF ( minimum_tailpoint_distance /= 0 )  THEN
+             WRITE ( io, 484 )  total_number_of_tails,      &
+                                minimum_tailpoint_distance, &
+                                maximum_tailpoint_age
+          ENDIF
+       ENDIF
+       IF ( dt_write_particle_data /= 9999999.9 )  THEN
+          WRITE ( io, 485 )  dt_write_particle_data
+          output_format = ''
+          IF ( netcdf_output )  THEN
+             IF ( netcdf_64bit )  THEN
+                output_format = 'netcdf (64 bit offset) and binary'
+             ELSE
+                output_format = 'netcdf and binary'
+             ENDIF
+          ELSE
+             output_format = 'binary'
+          ENDIF
+          WRITE ( io, 345 )  output_format
+       ENDIF
+       IF ( dt_dopts /= 9999999.9 )  WRITE ( io, 494 )  dt_dopts
+       IF ( write_particle_statistics )  WRITE ( io, 486 )
+
+       WRITE ( io, 487 )  number_of_particle_groups
+
+       DO  i = 1, number_of_particle_groups
+          IF ( i == 1  .AND.  density_ratio(i) == 9999999.9 )  THEN
+             WRITE ( io, 490 )  i, 0.0
              WRITE ( io, 492 )
-          ENDIF
-       ENDIF
-       WRITE ( io, 493 )  psl(i), psr(i), pss(i), psn(i), psb(i), pst(i), &
-                          pdx(i), pdy(i), pdz(i)
-    ENDDO
-
-#endif
+          ELSE
+             WRITE ( io, 490 )  i, radius(i)
+             IF ( density_ratio(i) /= 0.0 )  THEN
+                WRITE ( io, 491 )  density_ratio(i)
+             ELSE
+                WRITE ( io, 492 )
+             ENDIF
+          ENDIF
+          WRITE ( io, 493 )  psl(i), psr(i), pss(i), psn(i), psb(i), pst(i), &
+                             pdx(i), pdy(i), pdz(i)
+       ENDDO
+
+    ENDIF
+
 
 !
@@ -1390 +1392 @@
             '    value is negative) by ',E8.1,' kg/m**3 at the beginning of', &
                  ' the 3D-simulation'/)
-#if defined( __particles )
 480 FORMAT ('    Particles:'/ &
             '    ---------'// &
@@ -1426 +1427 @@
                     F8.2,' s'/)
 495 FORMAT ('       Number of particles in total domain: ',I10/)
-#endif
 500 FORMAT (//' 1D-Model parameters:'/                           &
               ' -------------------'//                           &