Changeset 3467 for palm/trunk/SOURCE/swap_timelevel.f90

Timestamp:

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

Author:

suehring

Message:

Branch salsa @3446 re-integrated into trunk

Location:

palm/trunk/SOURCE

Files:

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

palm/trunk/SOURCE/swap_timelevel.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Implementation of a new aerosol module salsa.
+! 
+! 3303 2018-10-03 12:04:15Z raasch
 ! bugfix for swapping in case of ocean mode
 ! 
@@ -158 +161 @@
     USE control_parameters,                                                    &
         ONLY:  air_chemistry, humidity, land_surface, neutral, ocean_mode,     &
-               passive_scalar, timestep_count, urban_surface
+               passive_scalar, simulated_time, timestep_count, urban_surface,  &
+               time_since_reference_point
 
     USE gust_mod,                                                              &
@@ -176 +180 @@
     USE pmc_interface,                                                         &
         ONLY: nested_run, pmci_set_swaplevel
+         
+    USE salsa_mod,                                                             &
+        ONLY:  salsa, salsa_swap_timelevel, skip_time_do_salsa             
 
     USE turbulence_closure_mod,                                                &
@@ -285 +292 @@
        CALL ocean_swap_timelevel( MOD( timestep_count, 2 ) )
     ENDIF
+   
+    IF ( salsa  .AND.  simulated_time >= time_since_reference_point )  THEN
+       CALL salsa_swap_timelevel(  MOD( timestep_count, 2 ) )
+    ENDIF  
 
     CALL tcm_swap_timelevel( MOD( timestep_count, 2) )