Changeset 1914 for palm/trunk/SOURCE/Makefile

Timestamp:

May 26, 2016 2:44:07 PM (9 years ago)

Author:

witha

Message:

Merged branch/forwind into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/Makefile (modified) (8 diffs, 1 prop)

palm/trunk/SOURCE/Makefile

@@ -56 +56 @@
 # Tails removed. lpm_release_set removed. calc_precipitation, impact_of_latent_heat
 # removed. 
+#
+# 1819 2016-04-06 21:05:15Z witha
+# Added wind turbine model and renamed it from wind_turbine_model to
+# wind_turbine_model_mod
 #
 # 1817 2016-04-06 15:44:20Z maronga
@@ -330 +334 @@
         user_parin.f90 user_read_restart_data.f90 \
         user_spectra.f90 user_statistics.f90 wall_fluxes.f90 \
-        write_3d_binary.f90 write_var_list.f90
+        wind_turbine_model_mod.f90 write_3d_binary.f90 write_var_list.f90
 
 
@@ -383 +387 @@
 check_parameters.o: modules.o mod_kinds.o land_surface_model_mod.o \
         netcdf_interface_mod.o plant_canopy_model_mod.o pmc_interface_mod.o radiation_model_mod.o \
-        spectra_mod.o subsidence_mod.o microphysics_mod.o
+        spectra_mod.o subsidence_mod.o microphysics_mod.o wind_turbine_model_mod.o
 close_file.o: modules.o mod_kinds.o netcdf_interface_mod.o
 compute_vpt.o: modules.o mod_kinds.o
@@ -429 +433 @@
    lpm_init.o ls_forcing_mod.o netcdf_interface_mod.o plant_canopy_model_mod.o \
    radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \
-   surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o
+   surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o \
+   wind_turbine_model_mod.o
 init_advec.o: modules.o mod_kinds.o
 init_cloud_physics.o: modules.o mod_kinds.o
@@ -486 +491 @@
 parin.o: modules.o cpulog_mod.o land_surface_model_mod.o mod_kinds.o netcdf_interface_mod.o \
    plant_canopy_model_mod.o pmc_interface_mod.o progress_bar_mod.o spectra_mod.o \
-   radiation_model_mod.o microphysics_mod.o
+   radiation_model_mod.o microphysics_mod.o wind_turbine_model_mod.o
 plant_canopy_model_mod.o: modules.o mod_kinds.o
 pmc_interface_mod.o: modules.o mod_kinds.o pmc_client_mod.o pmc_general_mod.o\
@@ -508 +513 @@
         eqn_state_seawater.o mod_kinds.o microphysics_mod.o \
         nudging_mod.o plant_canopy_model_mod.o production_e.o radiation_model_mod.o \
-        subsidence_mod.o user_actions.o
+        subsidence_mod.o user_actions.o wind_turbine_model_mod.o
 progress_bar_mod.o: modules.o mod_kinds.o
 radiation_model_mod.o : modules.o mod_particle_attributes.o microphysics_mod.o
@@ -536 +541 @@
         ls_forcing_mod.o mod_kinds.o nudging_mod.o pmc_interface_mod.o production_e.o \
         prognostic_equations.o progress_bar_mod.o radiation_model_mod.o \
-        spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o
+        spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o \
+        wind_turbine_model_mod.o
 time_to_string.o: mod_kinds.o
 timestep.o: modules.o cpulog_mod.o mod_kinds.o microphysics_mod.o
@@ -572 +578 @@
 user_statistics.o: modules.o mod_kinds.o netcdf_interface_mod.o user_module.o
 wall_fluxes.o: modules.o mod_kinds.o
+wind_turbine_model_mod.o: modules.o cpulog_mod.o mod_kinds.o
 write_3d_binary.o: modules.o cpulog_mod.o mod_kinds.o land_surface_model_mod.o \
         radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \