Changeset 1835 for palm

Timestamp:

Apr 7, 2016 4:31:50 PM (9 years ago)

Author:

raasch

Message:

bugfix for r1834: merge comments removed from Makefile

File:

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

palm/trunk/SOURCE/Makefile

@@ -20 +20 @@
 # Current revisions:
 # ------------------
-# 
+# bugfix: merge comments removed
 # 
 # Former revisions:
@@ -461 +461 @@
    land_surface_model_mod.o spectra_mod.o
 nudging.o: modules.o cpulog.o mod_kinds.o
-<<<<<<< .mine
-package_parin.o: modules.o mod_kinds.o \
-   plant_canopy_model.o radiation_model.o
-=======
-package_parin.o: modules.o mod_kinds.o spectrum.o
->>>>>>> .r1832
+package_parin.o: modules.o mod_kinds.o plant_canopy_model.o radiation_model.o
 palm.o: modules.o cpulog.o ls_forcing.o mod_kinds.o nudging.o\
         pmc_interface.o surface_layer_fluxes.o
 parin.o: modules.o cpulog.o land_surface_model_mod.o mod_kinds.o netcdf_interface.o \
-<<<<<<< .mine
-   pmc_interface.o progress_bar.o spectra_mod.o
-plant_canopy_model.o: modules.o mod_kinds.o
-=======
-   plant_canopy_model_mod.o pmc_interface.o progress_bar.o radiation_model_mod.o 
+   plant_canopy_model_mod.o pmc_interface.o progress_bar.o spectra_mod.o \
+   radiation_model_mod.o
 plant_canopy_model_mod.o: modules.o mod_kinds.o
->>>>>>> .r1832
 pmc_interface.o: modules.o mod_kinds.o pmc_client.o pmc_general.o\
         pmc_handle_communicator.o pmc_mpi_wrapper.o pmc_server.o
@@ -503 +494 @@
 random_gauss.o: mod_kinds.o random_function.o random_generator_parallel.o
 random_generator_parallel.o: mod_kinds.o
-<<<<<<< .mine
 read_3d_binary.o: modules.o cpulog.o mod_kinds.o land_surface_model_mod.o \
-   radiation_model.o random_function.o random_generator_parallel.o \
+   radiation_model_mod.o random_function.o random_generator_parallel.o \
    spectra_mod.o
-read_var_list.o: modules.o mod_kinds.o netcdf_interface.o plant_canopy_model.o \
+read_var_list.o: modules.o mod_kinds.o netcdf_interface.o plant_canopy_model_mod.o \
    spectra_mod.o
-=======
-read_3d_binary.o: modules.o cpulog.o mod_kinds.o land_surface_model_mod.o\
-                  radiation_model_mod.o random_function.o\
-                  random_generator_parallel.o
-read_var_list.o: modules.o mod_kinds.o netcdf_interface.o plant_canopy_model_mod.o
->>>>>>> .r1832
 run_control.o: modules.o cpulog.o mod_kinds.o
 set_slicer_attributes_dvrp.o: modules.o mod_kinds.o
@@ -567 +551 @@
 user_spectra.o: modules.o mod_kinds.o spectra_mod.o user_module.o
 user_statistics.o: modules.o mod_kinds.o netcdf_interface.o user_module.o
-wall_fluxes.o: modules.o mod_kinds.o
-<<<<<<< .mine
+wall_fluxes.o: modules.o mod_kinds.
 write_3d_binary.o: modules.o cpulog.o mod_kinds.o land_surface_model_mod.o \
-        radiation_model.o random_function.o random_generator_parallel.o \
+        radiation_model_mod.o random_function.o random_generator_parallel.o \
         spectra_mod.o
-write_var_list.o: modules.o mod_kinds.o netcdf_interface.o plant_canopy_model.o\
-   spectra_mod.o =======
-write_3d_binary.o: modules.o cpulog.o mod_kinds.o land_surface_model_mod.o\
-                   radiation_model_mod.o random_function.o\
-                   random_generator_parallel.o
-write_var_list.o: modules.o mod_kinds.o netcdf_interface.o plant_canopy_model_mod.o >>>>>>> .r1832
+write_var_list.o: modules.o mod_kinds.o netcdf_interface.o plant_canopy_model_mod.o\
+   spectra_mod.o