Ignore:
Timestamp:
May 26, 2016 2:44:07 PM (5 years ago)
Author:
witha
Message:

Merged branch/forwind into trunk

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

  • palm/trunk/SOURCE

  • palm/trunk/SOURCE/Makefile

    r1901 r1914  
    5656# Tails removed. lpm_release_set removed. calc_precipitation, impact_of_latent_heat
    5757# removed.
     58#
     59# 1819 2016-04-06 21:05:15Z witha
     60# Added wind turbine model and renamed it from wind_turbine_model to
     61# wind_turbine_model_mod
    5862#
    5963# 1817 2016-04-06 15:44:20Z maronga
     
    330334        user_parin.f90 user_read_restart_data.f90 \
    331335        user_spectra.f90 user_statistics.f90 wall_fluxes.f90 \
    332         write_3d_binary.f90 write_var_list.f90
     336        wind_turbine_model_mod.f90 write_3d_binary.f90 write_var_list.f90
    333337
    334338
     
    383387check_parameters.o: modules.o mod_kinds.o land_surface_model_mod.o \
    384388        netcdf_interface_mod.o plant_canopy_model_mod.o pmc_interface_mod.o radiation_model_mod.o \
    385         spectra_mod.o subsidence_mod.o microphysics_mod.o
     389        spectra_mod.o subsidence_mod.o microphysics_mod.o wind_turbine_model_mod.o
    386390close_file.o: modules.o mod_kinds.o netcdf_interface_mod.o
    387391compute_vpt.o: modules.o mod_kinds.o
     
    429433   lpm_init.o ls_forcing_mod.o netcdf_interface_mod.o plant_canopy_model_mod.o \
    430434   radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \
    431    surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o
     435   surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o \
     436   wind_turbine_model_mod.o
    432437init_advec.o: modules.o mod_kinds.o
    433438init_cloud_physics.o: modules.o mod_kinds.o
     
    486491parin.o: modules.o cpulog_mod.o land_surface_model_mod.o mod_kinds.o netcdf_interface_mod.o \
    487492   plant_canopy_model_mod.o pmc_interface_mod.o progress_bar_mod.o spectra_mod.o \
    488    radiation_model_mod.o microphysics_mod.o
     493   radiation_model_mod.o microphysics_mod.o wind_turbine_model_mod.o
    489494plant_canopy_model_mod.o: modules.o mod_kinds.o
    490495pmc_interface_mod.o: modules.o mod_kinds.o pmc_client_mod.o pmc_general_mod.o\
     
    508513        eqn_state_seawater.o mod_kinds.o microphysics_mod.o \
    509514        nudging_mod.o plant_canopy_model_mod.o production_e.o radiation_model_mod.o \
    510         subsidence_mod.o user_actions.o
     515        subsidence_mod.o user_actions.o wind_turbine_model_mod.o
    511516progress_bar_mod.o: modules.o mod_kinds.o
    512517radiation_model_mod.o : modules.o mod_particle_attributes.o microphysics_mod.o
     
    536541        ls_forcing_mod.o mod_kinds.o nudging_mod.o pmc_interface_mod.o production_e.o \
    537542        prognostic_equations.o progress_bar_mod.o radiation_model_mod.o \
    538         spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o
     543        spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o \
     544        wind_turbine_model_mod.o
    539545time_to_string.o: mod_kinds.o
    540546timestep.o: modules.o cpulog_mod.o mod_kinds.o microphysics_mod.o
     
    572578user_statistics.o: modules.o mod_kinds.o netcdf_interface_mod.o user_module.o
    573579wall_fluxes.o: modules.o mod_kinds.o
     580wind_turbine_model_mod.o: modules.o cpulog_mod.o mod_kinds.o
    574581write_3d_binary.o: modules.o cpulog_mod.o mod_kinds.o land_surface_model_mod.o \
    575582        radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \
Note: See TracChangeset for help on using the changeset viewer.