Changeset 825 for palm/trunk/SOURCE/Makefile

Timestamp:

Feb 19, 2012 3:03:44 AM (12 years ago)

Author:

raasch

Message:

New:
---

droplet growth by condensation may include curvature and solution effects.
Steered by new inipar-parameter curvature_solution_effects.
(advec_particles, check_parameters, header, init_cloud_physics, init_particles, modules, parin, read_var_list, write_var_list)

mean/min/max particle radius added as output quantity. (data_output_ptseries, modules)

Changed:

---

Initialisation of temporary particle array for resorting removed.
(advec_particles)

particle attributes speed_x|y|z_sgs renamed rvar1|2|3.
(advec_particles, data_output_ptseries, modules, init_particles, particle_boundary_conds)

routine wang_kernel and respective module renamed lpm_collision_kernels.
Package (particle) parameters wang_collision_kernel and turbulence_effects_on_collision
replaced by parameter collision_kernel.
(Makefile, advec_particles, check_parameters, diffusion_e, init_3d_model, modules, package_parin, time_integration, new: lpm_collision_kernels, deleted: wang_kernel)

Errors:

---

File:

• palm/trunk/SOURCE/Makefile (modified) (8 diffs)

palm/trunk/SOURCE/Makefile

@@ -4 +4 @@
 # Current revisions:
 # ------------------
-# 
+# wang_kernel renamed lpm_collision_kernels
 #
 # Former revisions:
@@ -83 +83 @@
         init_masks.f90 init_ocean.f90 init_particles.f90 init_pegrid.f90 \
         init_pt_anomaly.f90 init_rankine.f90 init_slope.f90 \
-        interaction_droplets_ptq.f90 local_flush.f90 \
-        local_getenv.f90 local_stop.f90 local_system.f90 local_tremain.f90 \
-        local_tremain_ini.f90 message.f90 modules.f90 netcdf.f90 \
+        interaction_droplets_ptq.f90 local_flush.f90 local_getenv.f90 \
+        local_stop.f90 local_system.f90 local_tremain.f90 local_tremain_ini.f90 \
+        lpm_collision_kernels.f90 message.f90 modules.f90 netcdf.f90 \
         package_parin.f90 palm.f90 parin.f90 particle_boundary_conds.f90 \
         plant_canopy_model.f90 poisfft.f90 \
@@ -108 +108 @@
         user_particle_attributes.f90 user_read_restart_data.f90 \
         user_spectra.f90 user_statistics.f90 wall_fluxes.f90 \
-        wang_kernel.f90 write_3d_binary.f90 write_compressed.f90 \
+        write_3d_binary.f90 write_compressed.f90 \
         write_var_list.f90
 
@@ -124 +124 @@
         data_output_3d.o diffusion_e.o diffusion_s.o diffusion_u.o \
         diffusion_v.o diffusion_w.o diffusivities.o disturb_field.o \
-        disturb_heatflux.o eqn_state_seawater.o exchange_horiz.o exchange_horiz_2d.o fft_xy.o \
-        flow_statistics.o global_min_max.o header.o impact_of_latent_heat.o \
-        inflow_turbulence.o init_1d_model.o init_3d_model.o init_advec.o init_cloud_physics.o \
-        init_coupling.o init_dvrp.o init_grid.o init_masks.o init_ocean.o init_particles.o init_pegrid.o \
-        init_pt_anomaly.o init_rankine.o init_slope.o \
+        disturb_heatflux.o eqn_state_seawater.o exchange_horiz.o \
+        exchange_horiz_2d.o fft_xy.o flow_statistics.o global_min_max.o \
+        header.o impact_of_latent_heat.o inflow_turbulence.o init_1d_model.o \
+        init_3d_model.o init_advec.o init_cloud_physics.o init_coupling.o \
+        init_dvrp.o init_grid.o init_masks.o init_ocean.o init_particles.o \
+        init_pegrid.o init_pt_anomaly.o init_rankine.o init_slope.o \
         interaction_droplets_ptq.o local_flush.o local_getenv.o local_stop.o \
-        local_system.o local_tremain.o local_tremain_ini.o message.o modules.o \
+        local_system.o local_tremain.o local_tremain_ini.o \
+        lpm_collision_kernels.f90 message.o modules.o \
         netcdf.o package_parin.o palm.o parin.o particle_boundary_conds.o \
         plant_canopy_model.o poisfft.o \
@@ -151 +153 @@
         user_module.o user_parin.o user_particle_attributes.o \
         user_read_restart_data.o user_spectra.o user_statistics.o \
-        wall_fluxes.o wang_kernel.o write_3d_binary.o write_compressed.o \
+        wall_fluxes.o write_3d_binary.o write_compressed.o \
         write_var_list.o
 
@@ -181 +183 @@
 
 
-advec_particles.o: modules.o random_function.o wang_kernel.o
+advec_particles.o: modules.o lpm_collision_kernels.o random_function.o
 advec_s_bc.o: modules.o
 advec_s_pw.o: modules.o
@@ -257 +259 @@
 local_tremain.o: modules.o
 local_tremain_ini.o: modules.o
+lpm_collision_kernels.o: modules.o user_module.o
 message.o: modules.o
 modules.o: modules.f90
@@ -328 +331 @@
 user_statistics.o: modules.o user_module.o
 wall_fluxes.o: modules.o
-wang_kernel.o: modules.o user_module.o
 write_3d_binary.o: modules.o random_function.o
 write_compressed.o: modules.o