Changeset 3467 for palm/trunk/SOURCE/Makefile

Timestamp:

Oct 30, 2018 7:05:21 PM (6 years ago)

Author:

suehring

Message:

Branch salsa @3446 re-integrated into trunk

Location:

palm/trunk/SOURCE

Files:

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

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Implementation of a new aerosol module salsa.
+# 
+# 
+# 3458 2018-10-30 14:51:23Z kanani
 # from chemistry branch r3443, banzhafs, Russo, forkel, basit:
 # radiation_model_mod added to chemistry_model_mod
@@ -628 +632 @@
         read_restart_data_mod.f90 \
         run_control.f90 \
+        salsa_mod.f90 \
+        salsa_util_mod.f90 \
         set_slicer_attributes_dvrp.f90 \
         singleton_mod.f90 \
@@ -693 +699 @@
 
 CC = cc
-CFLAGS = -O
+CFLAGS = -O 
 
 F90 =
@@ -703 +709 @@
 # The following line is needed for palm_simple_install, don't remove it!
 #to_be_replaced_by_include
-
 
 .SUFFIXES:
@@ -746 +751 @@
         bulk_cloud_model_mod.o \
         mod_kinds.o \
-        modules.o
+        modules.o \
+        salsa_util_mod.o
 advec_w_pw.o: \
         mod_kinds.o \
@@ -765 +771 @@
         ocean_mod.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         turbulence_closure_mod.o \
         urban_surface_mod.o
@@ -793 +800 @@
         modules.o \
         pmc_interface_mod.o \
+        salsa_mod.o \
         surface_mod.o \
         turbulence_closure_mod.o
@@ -837 +845 @@
         pmc_interface_mod.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         spectra_mod.o \
         subsidence_mod.o \
@@ -853 +862 @@
         modules.o \
         netcdf_data_input_mod.o \
+        salsa_mod.o \
         surface_mod.o
 chemistry_model_mod.o: \
@@ -916 +926 @@
         modules.o \
         netcdf_interface_mod.o \
+        salsa_mod.o \
         surface_mod.o
 data_output_profiles.o: \
@@ -960 +971 @@
         ocean_mod.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         surface_mod.o \
         urban_surface_mod.o \
@@ -976 +988 @@
         netcdf_interface_mod.o \
         ocean_mod.o \
+        salsa_mod.o \
         turbulence_closure_mod.o \
         urban_surface_mod.o
@@ -1062 +1075 @@
         pmc_interface_mod.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         spectra_mod.o \
         subsidence_mod.o \
@@ -1097 +1111 @@
         random_generator_parallel_mod.o \
         read_restart_data_mod.o \
+        salsa_mod.o \
         surface_layer_fluxes_mod.o \
         surface_mod.o \
@@ -1131 +1146 @@
         modules.o \
         netcdf_interface_mod.o \
-        radiation_model_mod.o
+        radiation_model_mod.o \
+        salsa_mod.o
 init_pegrid.o: \
         mod_kinds.o \
@@ -1343 +1359 @@
         ocean_mod.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         spectra_mod.o \
         turbulence_closure_mod.o \
@@ -1386 +1403 @@
         pmc_interface_mod.o \
         pmc_particle_interface.o \
+        salsa_mod.o \
         surface_layer_fluxes_mod.o \
         time_to_string.o \
@@ -1410 +1428 @@
         radiation_model_mod.o \
         read_restart_data_mod.o \
+        salsa_mod.o \
         spectra_mod.o \
         surface_output_mod.o \
@@ -1444 +1463 @@
         pmc_mpi_wrapper_mod.o \
         pmc_parent_mod.o \
+        salsa_mod.o \
         surface_mod.o
 pmc_child_mod.o: \
@@ -1522 +1542 @@
         plant_canopy_model_mod.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         subsidence_mod.o \
         surface_mod.o \
@@ -1564 +1585 @@
         random_function_mod.o\
         random_generator_parallel_mod.o \
+        salsa_mod.o \
         spectra_mod.o \
         surface_mod.o \
@@ -1576 +1598 @@
         mod_kinds.o \
         modules.o
+salsa_mod.o: \
+        modules.o \
+        mod_kinds.o \
+        advec_ws.o \
+        advec_s_pw.o \
+        advec_s_up.o \
+        chemistry_model_mod.o \
+        diffusion_s.o \
+        netcdf_data_input_mod.o \
+        plant_canopy_model_mod.o \
+        salsa_util_mod.o \
+        surface_mod.o \
+        netcdf_data_input_mod.o
+salsa_util_mod.o: \
+        mod_kinds.o \
+        modules.o
 set_slicer_attributes_dvrp.o: \
         mod_kinds.o \
@@ -1603 +1641 @@
         modules.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         surface_mod.o \
         turbulence_closure_mod.o \
@@ -1642 +1681 @@
         ocean_mod.o \
         pmc_interface_mod.o \
+        salsa_mod.o \
         turbulence_closure_mod.o \
         urban_surface_mod.o
@@ -1681 +1721 @@
         progress_bar_mod.o \
         radiation_model_mod.o \
+        salsa_mod.o \
         spectra_mod.o \
         surface_layer_fluxes_mod.o \