Ignore:
Timestamp:
Mar 15, 2012 10:35:09 AM (10 years ago)
Author:
raasch
Message:

Changed:


Original routine advec_particles split into several new subroutines and renamed
lpm.
init_particles renamed lpm_init
user_advec_particles renamed user_lpm_advec,
particle_boundary_conds renamed lpm_boundary_conds,
set_particle_attributes renamed lpm_set_attributes,
user_init_particles renamed user_lpm_init,
user_particle_attributes renamed user_lpm_set_attributes
(Makefile, lpm_droplet_collision, lpm_droplet_condensation, init_3d_model, modules, palm, read_var_list, time_integration, write_var_list, deleted: advec_particles, init_particles, particle_boundary_conds, set_particle_attributes, user_advec_particles, user_init_particles, user_particle_attributes, new: lpm, lpm_advec, lpm_boundary_conds, lpm_calc_liquid_water_content, lpm_data_output_particles, lpm_droplet_collision, lpm_drollet_condensation, lpm_exchange_horiz, lpm_extend_particle_array, lpm_extend_tails, lpm_extend_tail_array, lpm_init, lpm_init_sgs_tke, lpm_pack_arrays, lpm_read_restart_file, lpm_release_set, lpm_set_attributes, lpm_sort_arrays, lpm_write_exchange_statistics, lpm_write_restart_file, user_lpm_advec, user_lpm_init, user_lpm_set_attributes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/Makefile

    r829 r849  
    44# Current revisions:
    55# ------------------
    6 #
     6# +lpm_advec, lpm_data_output_particles, lpm_droplet_collision,
     7# lpm_droplet_condensation,
     8# lpm_exchange_horiz, lpm_extend_particle_array, lpm_extend_tails,
     9# lpm_extend_tail_array, lpm_init_sgs_tke, lpm_pack_arrays,
     10# lpm_read_restart_file, lpm_release_set, lpm_sort_arrays,
     11# lpm_write_exchange_statistics, lpm_write_restart_file
     12# advec_particles renamed lpm,
     13# init_particles renamed lpm_init,
     14# user_advec_particles renamed user_lpm_advec,
     15# particle_boundary_conds renamed lpm_boundary_conds,
     16# set_particle_attributes renamed lpm_set_attributes
     17# user_init_particles renamed user_lpm_init,
     18# user_particle_attributes renamed user_lpm_set_attributes
    719#
    820# Former revisions:
     
    6880PROG =  palm
    6981
    70 RCS = advec_particles.f90 advec_s_bc.f90 advec_s_pw.f90 advec_s_up.f90 \
     82RCS =   advec_s_bc.f90 advec_s_pw.f90 advec_s_up.f90 \
    7183        advec_ws.f90 advec_s_ups.f90 advec_u_pw.f90 advec_u_up.f90 \
    7284        advec_u_ups.f90 advec_v_pw.f90 advec_v_up.f90 advec_v_ups.f90 \
     
    8799        inflow_turbulence.f90 init_1d_model.f90 init_3d_model.f90 \
    88100        init_advec.f90 init_cloud_physics.f90 init_coupling.f90 init_dvrp.f90 \
    89         init_grid.f90 init_masks.f90 init_ocean.f90 init_particles.f90 \
     101        init_grid.f90 init_masks.f90 init_ocean.f90 \
    90102        init_pegrid.f90 init_pt_anomaly.f90 init_rankine.f90 init_slope.f90 \
    91103        interaction_droplets_ptq.f90 local_flush.f90 local_getenv.f90 \
    92104        local_stop.f90 local_system.f90 local_tremain.f90 \
    93         local_tremain_ini.f90 lpm_collision_kernels.f90 message.f90 \
    94         modules.f90 netcdf.f90 package_parin.f90 palm.f90 parin.f90 \
    95         particle_boundary_conds.f90 plant_canopy_model.f90 poisfft.f90 \
     105        local_tremain_ini.f90 lpm.f90 lpm_advec.f90 lpm_boundary_conds.f90 \
     106        lpm_calc_liquid_water_content.f90 lpm_collision_kernels.f90 \
     107        lpm_data_output_particles.f90 lpm_droplet_collision.f90 \
     108        lpm_droplet_condensation.f90 lpm_exchange_horiz.f90 \
     109        lpm_extend_particle_array.f90 lpm_extend_tails.f90 \
     110        lpm_extend_tail_array.f90 lpm_init.f90 lpm_init_sgs_tke.f90 \
     111        lpm_pack_arrays.f90 lpm_read_restart_file.f90 lpm_release_set.f90 \
     112        lpm_set_attributes.f90 lpm_sort_arrays.f90 \
     113        lpm_write_exchange_statistics.f90 lpm_write_restart_file.f90 \
     114        message.f90 modules.f90 netcdf.f90 package_parin.f90 palm.f90 \
     115        parin.f90 plant_canopy_model.f90 poisfft.f90 \
    96116        poisfft_hybrid.f90 poismg.f90 prandtl_fluxes.f90 pres.f90 print_1d.f90 \
    97117        production_e.f90 prognostic_equations.f90 random_function.f90 \
    98118        random_gauss.f90 read_3d_binary.f90 read_var_list.f90 run_control.f90 \
    99         set_particle_attributes.f90 set_slicer_attributes_dvrp.f90 \
    100         singleton.f90 sor.f90 spline_x.f90 \
    101         spline_y.f90 spline_z.f90 subsidence.f90 \
    102         sum_up_3d_data.f90 surface_coupler.f90 \
    103         swap_timelevel.f90 temperton_fft.f90 time_integration.f90 \
    104         time_to_string.f90 timestep.f90 timestep_scheme_steering.f90 \
    105         transpose.f90 user_3d_data_averaging.f90 user_actions.f90 \
    106         user_additional_routines.f90 user_advec_particles.f90 \
     119        set_slicer_attributes_dvrp.f90 singleton.f90 sor.f90 spline_x.f90 \
     120        spline_y.f90 spline_z.f90 subsidence.f90 sum_up_3d_data.f90 \
     121        surface_coupler.f90 swap_timelevel.f90 temperton_fft.f90 \
     122        time_integration.f90 time_to_string.f90 timestep.f90 \
     123        timestep_scheme_steering.f90 transpose.f90 user_3d_data_averaging.f90 \
     124        user_actions.f90 user_additional_routines.f90 \
    107125        user_check_data_output.f90 user_check_data_output_pr.f90 \
    108126        user_check_parameters.f90 user_data_output_2d.f90 \
     
    110128        user_data_output_mask.f90 user_define_netcdf_grid.f90 \
    111129        user_dvrp_coltab.f90 user_header.f90 user_init.f90 \
    112         user_init_3d_model.f90 user_init_grid.f90 user_init_particles.f90 \
    113         user_init_plant_canopy.f90 user_last_actions.f90 user_module.f90 \
    114         user_parin.f90 user_particle_attributes.f90 user_read_restart_data.f90 \
     130        user_init_3d_model.f90 user_init_grid.f90 \
     131        user_init_plant_canopy.f90 user_last_actions.f90 user_lpm_advec.f90 \
     132        user_lpm_init.f90 user_lpm_set_attributes.f90 user_module.f90 \
     133        user_parin.f90 user_read_restart_data.f90 \
    115134        user_spectra.f90 user_statistics.f90 wall_fluxes.f90 \
    116135        write_3d_binary.f90 write_compressed.f90 write_var_list.f90
    117136
    118 OBJS =  advec_particles.o advec_s_bc.o advec_s_pw.o advec_s_up.o \
    119         advec_s_ups.o advec_u_pw.o advec_u_up.o advec_u_ups.o \
    120         advec_ws.o advec_v_pw.o advec_v_up.o advec_v_ups.o advec_w_pw.o \
    121         advec_w_up.o advec_w_ups.o asselin_filter.o average_3d_data.o \
    122         boundary_conds.o buoyancy.o calc_liquid_water_content.o \
    123         calc_precipitation.o calc_radiation.o calc_spectra.o \
    124         check_for_restart.o check_open.o check_parameters.o close_file.o \
    125         compute_vpt.o coriolis.o cpu_log.o cpu_statistics.o data_log.o \
    126         data_output_dvrp.o data_output_mask.o data_output_profiles.o \
    127         data_output_ptseries.o \
     137OBJS =  advec_s_bc.o advec_s_pw.o advec_s_up.o advec_s_ups.o advec_u_pw.o \
     138        advec_u_up.o advec_u_ups.o advec_ws.o advec_v_pw.o advec_v_up.o \
     139        advec_v_ups.o advec_w_pw.o advec_w_up.o advec_w_ups.o asselin_filter.o \
     140        average_3d_data.o boundary_conds.o buoyancy.o \
     141        calc_liquid_water_content.o calc_precipitation.o calc_radiation.o \
     142        calc_spectra.o check_for_restart.o check_open.o check_parameters.o \
     143        close_file.o compute_vpt.o coriolis.o cpu_log.o cpu_statistics.o \
     144        data_log.o data_output_dvrp.o data_output_mask.o \
     145        data_output_profiles.o data_output_ptseries.o \
    128146        data_output_spectra.o data_output_tseries.o data_output_2d.o \
    129147        data_output_3d.o diffusion_e.o diffusion_s.o diffusion_u.o \
     
    133151        header.o impact_of_latent_heat.o inflow_turbulence.o init_1d_model.o \
    134152        init_3d_model.o init_advec.o init_cloud_physics.o init_coupling.o \
    135         init_dvrp.o init_grid.o init_masks.o init_ocean.o init_particles.o \
    136         init_pegrid.o init_pt_anomaly.o init_rankine.o init_slope.o \
     153        init_dvrp.o init_grid.o init_masks.o init_ocean.o init_pegrid.o \
     154        init_pt_anomaly.o init_rankine.o init_slope.o \
    137155        interaction_droplets_ptq.o local_flush.o local_getenv.o local_stop.o \
    138         local_system.o local_tremain.o local_tremain_ini.o \
    139         lpm_collision_kernels.f90 message.o modules.o \
    140         netcdf.o package_parin.o palm.o parin.o particle_boundary_conds.o \
    141         plant_canopy_model.o poisfft.o \
     156        local_system.o local_tremain.o local_tremain_ini.o lpm.o lpm_advec.o \
     157        lpm_boundary_conds.o lpm_calc_liquid_water_content.o \
     158        lpm_collision_kernels.o lpm_data_output_particles.o \
     159        lpm_droplet_collision.o lpm_droplet_condensation.o \
     160        lpm_exchange_horiz.o lpm_extend_particle_array.o lpm_extend_tails.o \
     161        lpm_extend_tail_array.o lpm_init.o lpm_init_sgs_tke.o \
     162        lpm_pack_arrays.o lpm_read_restart_file.o lpm_release_set.o \
     163        lpm_set_attributes.o lpm_sort_arrays.o lpm_write_exchange_statistics.o \
     164        lpm_write_restart_file.o message.o modules.o netcdf.o package_parin.o \
     165        palm.o parin.o plant_canopy_model.o poisfft.o \
    142166        poisfft_hybrid.o poismg.o prandtl_fluxes.o pres.o print_1d.o \
    143167        production_e.o prognostic_equations.o random_function.o random_gauss.o \
    144168        read_3d_binary.o read_var_list.o run_control.o \
    145         set_particle_attributes.o set_slicer_attributes_dvrp.o \
    146         singleton.o sor.o spline_x.o spline_y.o \
    147         spline_z.o subsidence.o sum_up_3d_data.o surface_coupler.o \
    148         swap_timelevel.o \
    149         temperton_fft.o time_integration.o time_to_string.o \
    150         timestep.o timestep_scheme_steering.o transpose.o \
     169        set_slicer_attributes_dvrp.o singleton.o sor.o spline_x.o spline_y.o \
     170        spline_z.o subsidence.o sum_up_3d_data.o surface_coupler.o \
     171        swap_timelevel.o temperton_fft.o time_integration.o time_to_string.o \
     172        timestep.o timestep_scheme_steering.o transpose.o \
    151173        user_3d_data_averaging.o user_actions.o user_additional_routines.o \
    152         user_advec_particles.o user_check_data_output.o \
    153         user_check_data_output_pr.o user_check_parameters.o \
    154         user_data_output_2d.o user_data_output_3d.o user_data_output_mask.o user_data_output_dvrp.o \
     174        user_check_data_output.o user_check_data_output_pr.o \
     175        user_check_parameters.o user_data_output_2d.o user_data_output_3d.o \
     176        user_data_output_mask.o user_data_output_dvrp.o \
    155177        user_define_netcdf_grid.o user_dvrp_coltab.o user_header.o \
    156178        user_init.o user_init_3d_model.o user_init_grid.o \
    157         user_init_particles.o user_init_plant_canopy.o user_last_actions.o \
    158         user_module.o user_parin.o user_particle_attributes.o \
     179        user_init_plant_canopy.o user_last_actions.o user_lpm_advec.o \
     180        user_lpm_init.o user_lpm_set_attributes.o user_module.o user_parin.o \
    159181        user_read_restart_data.o user_spectra.o user_statistics.o \
    160         wall_fluxes.o write_3d_binary.o write_compressed.o \
    161         write_var_list.o
     182        wall_fluxes.o write_3d_binary.o write_compressed.o write_var_list.o
    162183
    163184CC = cc
     
    188209
    189210
    190 advec_particles.o: modules.o lpm_collision_kernels.o random_function.o
     211advec_particles.o: modules.o
    191212advec_s_bc.o: modules.o
    192213advec_s_pw.o: modules.o
     
    254275init_masks.o: modules.o
    255276init_ocean.o: modules.o eqn_state_seawater.o
    256 init_particles.o: modules.o lpm_collision_kernels.o random_function.o
    257277init_pegrid.o: modules.o fft_xy.o poisfft.o poisfft_hybrid.o
    258278init_pt_anomaly.o: modules.o
     
    264284local_tremain.o: modules.o
    265285local_tremain_ini.o: modules.o
     286lpm_advec.o: modules.o
     287lpm_boundary_conds.o: modules.o
     288lpm_calc_liquid_water_content.o: modules.o
    266289lpm_collision_kernels.o: modules.o user_module.o
     290lpm_data_output_particles.o: modules.o
     291lpm_droplet_collision.o: modules.o lpm_collision_kernels.o
     292lpm_droplet_condensation.o: modules.o lpm_collision_kernels.o
     293lpm_exchange_horiz.o: modules.o
     294lpm_extend_particle_array.o: modules.o
     295lpm_extend_tails.o: modules.o
     296lpm_extend_tail_array.o: modules.o
     297lpm_init.o: modules.o lpm_collision_kernels.o random_function.o
     298lpm_init_sgs_tke.o: modules.o
     299lpm_pack_arrays.o: modules.o
     300lpm_read_restart_file.o: modules.o
     301lpm_release_set.o: modules.o random_function.o
     302lpm_set_attributes.o: modules.o
     303lpm_sort_arrays.o: modules.o
     304lpm_write_exchange_statistics.o: modules.o
     305lpm_write_restart_file.o: modules.o
    267306message.o: modules.o
    268307modules.o: modules.f90
     
    271310palm.o: modules.o
    272311parin.o: modules.o
    273 particle_boundary_conds.o: modules.o
    274312plant_canopy_model.o: modules.o
    275313poisfft.o: modules.o fft_xy.o
     
    292330read_var_list.o: modules.o
    293331run_control.o: modules.o
    294 set_particle_attributes.o: modules.o
    295332set_slicer_attributes_dvrp.o: modules.o
    296333singleton.o: singleton.f90
     
    312349user_actions.o: modules.o user_module.o
    313350user_additional_routines.o: modules.o user_module.o
    314 user_advec_particles.o: modules.o user_module.o
    315351user_check_data_output.o: modules.o user_module.o
    316352user_check_data_output_pr.o: modules.o user_module.o
     
    326362user_init_3d_model.o: modules.o user_module.o
    327363user_init_grid.o: modules.o user_module.o
    328 user_init_particles.o: modules.o user_module.o
    329364user_init_plant_canopy.o: modules.o user_module.o
    330365user_last_actions.o: modules.o user_module.o
     366user_lpm_advec.o: modules.o user_module.o
     367user_lpm_init.o: modules.o user_module.o
     368user_lpm_set_attributes.o: modules.o user_module.o
    331369user_module.o: user_module.f90
    332370user_parin.o: modules.o user_module.o
    333 user_particle_attributes.o: modules.o user_module.o
    334371user_read_restart_data.o: modules.o user_module.o
    335372user_spectra.o: modules.o user_module.o
Note: See TracChangeset for help on using the changeset viewer.