Changeset 3298 for palm/trunk/SOURCE/Makefile

Timestamp:

Oct 2, 2018 12:21:11 PM (6 years ago)

Author:

kanani

Message:

Merge chemistry branch at r3297 to trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• Makefile (modified) (19 diffs, 1 prop)

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Added missing dependencies and replaced blanks with tabs (forkel)
+# Added chemistry emission module (Russo)
+# Added chemistry_model_mod to flow_statistics (basit)
+#
+# 3294 2018-10-01 02:37:10Z raasch
 # changes related to modularization of the ocean mode,
 # bugfix: dependency to advec_ws was missed in chemistry_model_mod
@@ -473 +478 @@
         check_open.f90 \
         check_parameters.f90 \
+        chem_emissions_mod.f90 \
         chem_gasphase_mod.f90 \
         chemistry_model_mod.f90 \
@@ -576 +582 @@
         random_gauss.f90 \
         random_generator_parallel_mod.f90 \
-        read_restart_data_mod.f90 \
+        read_restart_data_mod.f90 \
         run_control.f90 \
         set_slicer_attributes_dvrp.f90 \
@@ -636 +642 @@
         wind_turbine_model_mod.f90 \
         wrd_write_string.f90 \
-        write_restart_data_mod.f90
+        write_restart_data_mod.f90
 
 
@@ -757 +763 @@
         bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
+        chem_emissions_mod.o \
         gust_mod.o \
         init_vertical_profiles.o \
@@ -778 +785 @@
         vertical_nesting_mod.o \
         wind_turbine_model_mod.o
+chem_emissions_mod.o: \
+        chem_gasphase_mod.o \
+        chem_modules.o \
+        date_and_time_mod.o \
+        mod_kinds.o \
+        modules.o \
+        netcdf_data_input_mod.o \
+        surface_mod.o
 chemistry_model_mod.o: \
         advec_ws.o \
         chem_gasphase_mod.o \
         chem_modules.o \
+        date_and_time_mod.o \
         diffusion_s.o \
         mod_kinds.o \
         modules.o \
         netcdf_data_input_mod.o \
-        surface_mod.o
+        surface_mod.o \
+        user_module.o
 chem_gasphase_mod.o: \
         mod_kinds.o \
@@ -831 +848 @@
         basic_constants_and_equations_mod.o \
         bulk_cloud_model_mod.o \
+        chemistry_model_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -868 +886 @@
         basic_constants_and_equations_mod.o \
         bulk_cloud_model_mod.o \
+        chemistry_model_mod.o\
         cpulog_mod.o \
         gust_mod.o \
@@ -942 +961 @@
         basic_constants_and_equations_mod.o \
         bulk_cloud_model_mod.o \
+        chemistry_model_mod.o \
         cpulog_mod.o \
         gust_mod.o \
@@ -960 +980 @@
         basic_constants_and_equations_mod.o \
         bulk_cloud_model_mod.o \
+        chemistry_model_mod.o \
         cpulog_mod.o \
         date_and_time_mod.o \
@@ -986 +1007 @@
         basic_constants_and_equations_mod.o \
         bulk_cloud_model_mod.o \
-        chemistry_model_mod.o \
+        chem_emissions_mod.o \
         cpulog_mod.o \
         disturb_heatflux.o \
@@ -1217 +1238 @@
         basic_constants_and_equations_mod.o \
         mod_kinds.o \
-        modules.o
+        modules.o \
+        time_to_string.o
 modules.o: \
         mod_kinds.o
@@ -1233 +1255 @@
         mod_kinds.o
 netcdf_data_input_mod.o: \
+        chem_modules.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1274 +1297 @@
         chem_photolysis_mod.o \
         cpulog_mod.o \
+        date_and_time_mod.o \
         land_surface_model_mod.o \
         mod_kinds.o \
@@ -1282 +1306 @@
         pmc_particle_interface.o \
         surface_layer_fluxes_mod.o \
+        time_to_string.o \
         write_restart_data_mod.o
 parin.o: \
@@ -1545 +1570 @@
         buoyancy.o \
         calc_mean_profile.o \
+        chem_emissions_mod.o \
         chemistry_model_mod.o \
         chem_modules.o \
@@ -1558 +1584 @@
         modules.o \
         multi_agent_system_mod.o \
- ocean_mod.o \
+        ocean_mod.o \
         pmc_interface_mod.o \
         prognostic_equations.o \
@@ -1567 +1593 @@
         surface_mod.o \
         synthetic_turbulence_generator_mod.o \
+        time_to_string.o \
         turbulence_closure_mod.o\
         urban_surface_mod.o \
@@ -1584 +1611 @@
         radiation_model_mod.o \
         surface_layer_fluxes_mod.o \
+        time_to_string.o \
         urban_surface_mod.o
 time_to_string.o: \