Changeset 3582 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Nov 29, 2018 7:16:36 PM (5 years ago)

Author:

suehring

Message:

Merge branch salsa with trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• prognostic_equations.f90 (modified) (4 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Move the control parameter "salsa" from salsa_mod to control_parameters 
+! (M. Kurppa)
 ! 
 ! Former revisions:
@@ -373 +374 @@
                use_upstream_for_tke, wind_turbine, ws_scheme_mom,              & 
                ws_scheme_sca, urban_surface, land_surface,                     &
-               time_since_reference_point
+               time_since_reference_point, salsa
 
     USE coriolis_mod,                                                          &
@@ -415 +416 @@
     USE salsa_mod,                                                             &
         ONLY:  aerosol_mass, aerosol_number, dt_salsa, last_salsa_time, nbins, &
-               ncc_tot, ngast, salsa, salsa_boundary_conds, salsa_diagnostics, &
+               ncc_tot, ngast, salsa_boundary_conds, salsa_diagnostics,        &
                salsa_driver, salsa_gas, salsa_gases_from_chem, salsa_tendency, &
                skip_time_do_salsa
@@ -548 +549 @@
 
     ENDIF       
-
 !
 !-- Run SALSA and aerosol dynamic processes. SALSA is run with a longer time