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

Timestamp:

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

Author:

suehring

Message:

Merge branch salsa with trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• boundary_conds.f90 (modified) (3 diffs)

palm/trunk/SOURCE/boundary_conds.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Move the control parameter "salsa" from salsa_mod to control_parameters 
+! (M. Kurppa)
 ! 
 ! Former revisions:
@@ -225 +226 @@
                bc_dirichlet_s, bc_radiation_l, bc_radiation_n, bc_radiation_r, &
                bc_radiation_s, bc_pt_t_val, bc_q_t_val, bc_s_t_val,            &
-               child_domain, constant_diffusion, coupling_mode, &
-               dt_3d, humidity, ibc_pt_b, ibc_pt_t, ibc_q_b, ibc_q_t, ibc_s_b, &
-               ibc_s_t, ibc_uv_b, ibc_uv_t,                           &
-               intermediate_timestep_count, nesting_offline, nudging,          &
-               ocean_mode, passive_scalar, rans_mode, rans_tke_e, tsc, use_cmax
+               child_domain, constant_diffusion, coupling_mode, dt_3d,         &
+               humidity, ibc_pt_b, ibc_pt_t, ibc_q_b, ibc_q_t, ibc_s_b,        &
+               ibc_s_t, ibc_uv_b, ibc_uv_t, intermediate_timestep_count,       &
+               nesting_offline, nudging, ocean_mode, passive_scalar, rans_mode,&
+               rans_tke_e, tsc, salsa, use_cmax
 
     USE grid_variables,                                                        &
@@ -248 +249 @@
  
     USE salsa_mod,                                                             &
-        ONLY:  salsa, salsa_boundary_conds        
+        ONLY:  salsa_boundary_conds        
 
     USE surface_mod,                                                           &