Changeset 2263 for palm/trunk/SOURCE/Makefile

Timestamp:

Jun 8, 2017 2:59:01 PM (8 years ago)

Author:

schwenkel

Message:

Implemented splitting and merging algorithm

File:

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

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Implemented splitting and merging algorithm
+# 
+# 2259 2017-06-08 09:09:11Z gronemeier
 # Implemented synthetic turbulence generator
 #
@@ -354 +357 @@
         lpm_data_output_particles.f90 lpm_droplet_collision.f90 \
         lpm_droplet_condensation.f90 lpm_exchange_horiz.f90 \
-        lpm_init.f90 lpm_init_sgs_tke.f90 \
+        lpm_init.f90 lpm_init_sgs_tke.f90 lpm_merging.f90 \
         lpm_pack_arrays.f90 lpm_read_restart_file.f90 \
-        lpm_set_attributes.f90 \
+        lpm_set_attributes.f90 lpm_splitting.f90 \
         lpm_write_exchange_statistics.f90 lpm_write_restart_file.f90 \
         ls_forcing_mod.f90 message.f90 microphysics_mod.f90 modules.f90 mod_kinds.f90 \
@@ -509 +512 @@
 local_tremain.o: modules.o cpulog_mod.o mod_kinds.o
 local_tremain_ini.o: modules.o cpulog_mod.o mod_kinds.o
-lpm.o: modules.o cpulog_mod.o lpm_exchange_horiz.o lpm_init.o lpm_pack_arrays.o \
-        mod_kinds.o mod_particle_attributes.o
+lpm.o: modules.o cpulog_mod.o lpm_exchange_horiz.o lpm_init.o lpm_merging.o lpm_pack_arrays.o \
+        lpm_splitting.o mod_kinds.o mod_particle_attributes.o
 lpm_advec.o: modules.o cpulog_mod.o mod_kinds.o mod_particle_attributes.o surface_mod.o
 lpm_boundary_conds.o: modules.o cpulog_mod.o mod_kinds.o mod_particle_attributes.o
@@ -530 +533 @@
         surface_mod.o
 lpm_init_sgs_tke.o: modules.o mod_kinds.o mod_particle_attributes.o surface_mod.o
+lpm_merging.o: modules.o cpulog_mod.o mod_kinds.o mod_particle_attributes.o
 lpm_pack_arrays.o: modules.o cpulog_mod.o mod_kinds.o mod_particle_attributes.o
 lpm_read_restart_file.o: modules.o mod_kinds.o mod_particle_attributes.o \
         lpm_pack_arrays.o
 lpm_set_attributes.o: modules.o cpulog_mod.o mod_kinds.o mod_particle_attributes.o
+lpm_splitting.o: modules.o cpulog_mod.o mod_kinds.o \
+        mod_particle_attributes.o lpm_exchange_horiz.o
 lpm_write_exchange_statistics.o: modules.o mod_kinds.o mod_particle_attributes.o
 lpm_write_restart_file.o: modules.o mod_kinds.o mod_particle_attributes.o