Changeset 3872

Timestamp:

Apr 8, 2019 3:03:06 PM (6 years ago)

Author:

knoop

Message:

Including last commit, salsa dependency for advec_ws removed

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (1 diff)
• advec_ws.f90 (modified) (1 diff)
• prognostic_equations.f90 (modified) (1 diff)
• salsa_mod.f90 (modified) (2 diffs)
• salsa_util_mod.f90 (modified) (1 diff)
• time_integration.f90 (modified) (1 diff)

palm/trunk/SOURCE/Makefile

@@ -777 +777 @@
 advec_ws.o: \
         mod_kinds.o \
-        modules.o \
-        salsa_util_mod.o
+        modules.o
 advec_w_pw.o: \
         mod_kinds.o \

palm/trunk/SOURCE/advec_ws.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Moved all USE statements to module level + removed salsa dependency
+! 
+! 3871 2019-04-08 14:38:39Z knoop
 ! Moving initialization of bcm specific flux arrays into bulk_cloud_model_mod
 ! 

palm/trunk/SOURCE/prognostic_equations.f90

@@ -461 +461 @@
                salsa_boundary_conds, salsa_diagnostics, salsa_driver,          &
                salsa_gas, salsa_gases_from_chem, skip_time_do_salsa
-
-    USE salsa_util_mod,                                                        &
-        ONLY:  sums_salsa_ws_l
 
     USE statistics,                                                            &

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Introduced salsa_actions module interface
+! 
+! 3871 2019-04-08 14:38:39Z knoop
 ! Major changes in formatting, performance and data input structure (see branch
 ! the history for details)
@@ -7142 +7145 @@
     INTEGER(iwp)  ::  dummy  !< call location string
 
-    IF ( bulk_cloud_model    )   dummy = i + j
+    IF ( salsa    )   dummy = i + j
 
     SELECT CASE ( location )

palm/trunk/SOURCE/salsa_util_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! moved decrlaration of sums_salsa_ws_l to statistics module
+! 
+! 3871 2019-04-08 14:38:39Z knoop
 ! Formatting changes
 !

palm/trunk/SOURCE/time_integration.f90

@@ -665 +665 @@
                sums_wsus_ws_l, sums_vs2_ws_l, sums_wsvs_ws_l, sums_ws2_ws_l, sums_wspts_ws_l,      &
                sums_wsqs_ws_l, sums_wssas_ws_l, sums_wsqcs_ws_l, sums_wsqrs_ws_l, sums_wsncs_ws_l, &
-               sums_wsnrs_ws_l, sums_wsss_ws_l, weight_substep
-
-    USE salsa_util_mod,                                                                            &
-           ONLY:  sums_salsa_ws_l
+               sums_wsnrs_ws_l, sums_wsss_ws_l, weight_substep, sums_salsa_ws_l
 
     USE surface_mod,                                                                               &