Changeset 3582 for palm/trunk/SOURCE/swap_timelevel.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)
• swap_timelevel.f90 (modified) (4 diffs)

palm/trunk/SOURCE/swap_timelevel.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Move the control parameter "salsa" from salsa_mod to control_parameters 
+! (M. Kurppa)
 ! 
 ! Former revisions:
@@ -162 +163 @@
         ONLY:  air_chemistry, humidity, land_surface, neutral, ocean_mode,     &
                passive_scalar, simulated_time, timestep_count, urban_surface,  &
-               time_since_reference_point
+               time_since_reference_point, salsa
 
     USE gust_mod,                                                              &
@@ -182 +183 @@
          
     USE salsa_mod,                                                             &
-        ONLY:  salsa, salsa_swap_timelevel, skip_time_do_salsa             
+        ONLY:  salsa_swap_timelevel, skip_time_do_salsa             
 
     USE turbulence_closure_mod,                                                &
@@ -295 +296 @@
     IF ( salsa  .AND.  simulated_time >= time_since_reference_point )  THEN
        CALL salsa_swap_timelevel(  MOD( timestep_count, 2 ) )
-    ENDIF  
+    ENDIF     
 
     CALL tcm_swap_timelevel( MOD( timestep_count, 2) )