Changeset 4047

Timestamp:

Jun 21, 2019 6:58:09 PM (5 years ago)

Author:

knoop

Message:

Initial introduction of the dynamics module with only dynamics_swap_timelevel implemented

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (30 diffs)
• dynamics_mod.f90 (added)
• module_interface.f90 (modified) (59 diffs)
• swap_timelevel.f90 (deleted)
• time_integration.f90 (modified) (5 diffs)

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Introduction of the dynamics module and dissolution of swap_timelevel
+#
+# 4043 2019-06-18 16:59:00Z schwenkel
 # Delete droplet_interactions_ptq
 #
 # 4039 2019-06-18 10:32:41Z suehring
 # add dependency for diagnostic output quantities
-# 
+#
 # 4017 2019-06-06 12:16:46Z schwenkel
 # add dependency for init_pegrid
-# 
+#
 # 3994 2019-05-22 18:08:09Z suehring
 # new module for calculation and output of diagnostic quantities added
-# 
+#
 # 3988 2019-05-22 11:32:37Z kanani
 # Add dependencies for virtual_measurement_mod
-# 
+#
 # 3880 2019-04-08 21:43:02Z knoop
 # Add Netcdf data output for indoor model
 # Remove some dependencies
-# 
+#
 # 3744 2019-02-15 18:38:58Z suehring
-# Enable mesoscale offline nesting for chemistry variables as well as 
+# Enable mesoscale offline nesting for chemistry variables as well as
 # initialization of chemistry via dynamic input file.
-# 
+#
 # 3727 2019-02-08 14:52:10Z gronemeier
 # surface_data_output_mod depends on netcdf_interface_mod
@@ -52 +55 @@
 # 3700 2019-01-26 17:03:42Z knoop
 # Rename surface_output_mod into surface_data_output_mod
-# 
+#
 # 3637 2018-12-20 01:51:36Z knoop
 # Implementation of the PALM module interface
-# 
+#
 # 3634 2018-12-18 12:31:28Z knoop
 # OpenACC port for SPEC
-# 
+#
 # 3579 2018-11-29 15:32:39Z suehring
 # Dependency for check_parameters on nesting_offl_mod added
-# 
+#
 # 3569 2018-11-27 17:03:40Z kanani
 # dom_dwd_user, Schrempf:
@@ -69 +72 @@
 # 3525 2018-11-14 16:06:14Z kanani
 # Changes related to clean-up of biometeorology (dom_dwd_user)
-# 
+#
 # 3522 2018-11-13 12:14:36Z suehring
 # Dependencies for virtual measurement module added
-# 
+#
 # 3494 2018-11-06 14:51:27Z suehring
 # Surface output revised
-# 
+#
 # 3474 2018-10-30 21:07:39Z kanani
 # Add virtual measurement module
-# 
+#
 # 3472 2018-10-30 20:43:50Z suehring
 # Add indoor model (kanani, srissman, tlang),
 # minor formatting
-# 
+#
 # 3467 2018-10-30 19:05:21Z suehring
 # Implementation of a new aerosol module salsa.
-# 
-# 
+#
+#
 # 3458 2018-10-30 14:51:23Z kanani
 # from chemistry branch r3443, banzhafs, Russo, forkel, basit:
@@ -93 +96 @@
 # Added chemistry emission module
 # chemistry_model_mod added to flow_statistics
-# 
+#
 # 3448 2018-10-29 18:14:31Z kanani
 # Adjustment of biometeorology dependencies
-# 
+#
 # 3436 2018-10-26 18:35:15Z gronemeier
 # Add surface_mod to user_data_output_mask
-# 
+#
 # 3435 2018-10-26 18:25:44Z gronemeier
 # - Add surface_mod to data_output_mask
 # - Add chemistry_model_mod and surface_mod to init_masks
-# 
+#
 # 3421 2018-10-24 18:39:32Z gronemeier
 # Add netcdf_data_input_mod to netcdf_interface_mod
 # bugfix: add dependencies to chemistry_model_mod
 # Add module for surface data output
-# 
+#
 # 3381 2018-10-19 13:09:06Z raasch
 # dependencies for ocean_mod fixed
-# 
+#
 # 3355 2018-10-16 14:03:34Z knoop
 # Add module for offline nesting;
@@ -117 +120 @@
 # Bugfix, missing dependency for turbulence generator in init_3d_model;
 # Some formatting ajdustments
-# 
+#
 # 3343 2018-10-15 10:38:52Z suehring
 # (from branch resler)
 # Add biometeorology
-# 
-# 
+#
+#
 # 3322 2018-10-09 10:02:39Z kanani
 # Formatting and cleanup
-# 
+#
 # 3298 2018-10-02 12:21:11Z kanani
 # Added missing dependencies and replaced blanks with tabs (forkel)
@@ -134 +137 @@
 # changes related to modularization of the ocean mode,
 # bugfix: dependency to advec_ws was missed in chemistry_model_mod
-# 
+#
 # 3274 2018-09-24 15:42:55Z knoop
 # Added palm dependency of multi_agent_system_mod, because of mas_last_actions
 # call at the end of palm run
-# 
+#
 # 3167 2018-07-24 18:17:30Z suehring
 # Bugfix, add missing dependencies for multi-agent system
-# 
+#
 # 3159 2018-07-20 11:20:01Z sward
 # Added multi agent system
-# 
+#
 # 3130 2018-07-16 11:08:55Z gronemeier
 # add surface_layer_fluxes_mod to turbulence_closure_mod
-# 
+#
 # 3129 2018-07-16 07:45:13Z gronemeier
 # add turbulence_closure_mod to parin
-# 
+#
 # 2963 2018-04-12 14:47:44Z suehring
-# Introduce index for vegetation/wall, pavement/green-wall and water/window 
+# Introduce index for vegetation/wall, pavement/green-wall and water/window
 # surfaces, for clearer access of surface fraction, albedo, emissivity, etc. .
-# 
+#
 # 2955 2018-04-09 15:14:01Z suehring
 # Add log-points to measure CPU time of NetCDF data input.
-# 
+#
 # 2938 2018-03-27 15:52:42Z suehring
 # No initialization of child domains via dynamic input file, except for soil
 # moisture and temperature
 # Apply turbulence generator at non-cyclic lateral boundary in nesting case
-# 
+#
 # 2936 2018-03-27 14:49:27Z suehring
 # Added dependencies for parent and child synchronization
-# 
+#
 # 2921 2018-03-22 15:05:23Z Giersch
 # date_and_time_mod dependency has been added to read/write_restart_data_mod
-# 
+#
 # 2918 2018-03-21 15:52:14Z gronemeier
-# read/write_3d_binary and read/write_var_list has been removed, 
+# read/write_3d_binary and read/write_var_list has been removed,
 # read/write_restart_data_mod, wrd_write_string and
-# user_read/write_restart_data_mod has been added, dependencies with respect to 
+# user_read/write_restart_data_mod has been added, dependencies with respect to
 # the aforementioned routines have been added/removed
 #
 # 2847 2018-03-02 21:45:58Z suehring
 # Changed format and enforced sorting
-# 
+#
 # 2817 2018-02-19 16:32:21Z knoop
 # Preliminary gust module interface implemented
-# 
+#
 # 2802 2018-02-14 16:21:39Z thiele
 # Changed lpm from subroutine to module.
 # Introduce particle transfer in nested models.
-# 
+#
 # 2773 2018-01-30 14:12:54Z suehring
 # Nesting of chemical species
-# 
+#
 # 2718 2018-01-02 08:49:38Z maronga
 # Corrected "Former revisions" section
-# 
+#
 # 2697 2017-12-14 17:57:20Z kanani
 # Bugfix, missing dependencies
-# 
+#
 # 2696 2017-12-14 17:12:51Z kanani
 # Change in file header (GPL part)
 # Implementation of uv exposure model (FK)
-# Bugfix, removed loop dependcy for vertical_nesting_mod and 
+# Bugfix, removed loop dependcy for vertical_nesting_mod and
 # turbulence_closure_mod, added depencies for vertical_nesting_mod (TG)
 # implemented turbulence_closure_mod (TG)
@@ -205 +208 @@
 # For LSM, add dependency on calc_mean_profile (??)
 # poismg_noopt modularized and renamed into poismg_noopt_mod
-# add dependencies for netcdf_data_input_mod, calc_mean_profile, 
+# add dependencies for netcdf_data_input_mod, calc_mean_profile,
 # radiation_module_mod, land_surface_model_mod (MS)
-# 
+#
 # 2608 2017-11-13 14:04:26Z schwenkel
-# Added diagnostic_quantities_mod 
-# 
+# Added diagnostic_quantities_mod
+#
 # 2600 2017-11-01 14:11:20Z raasch
 # comment line concerning bound checks removed
-# 
+#
 # 2599 2017-11-01 13:18:45Z hellstea
 # virtual_flight_mod, synthetic_turbulence_generator_mod and
@@ -220 +223 @@
 # 2563 2017-10-19 15:36:10Z Giersch
 # wind_turbine_model_mod and synthetic_turbulence_generator_mod were added to
-# write_var_list and virtual_flight_mod was deleted from read_var_list 
+# write_var_list and virtual_flight_mod was deleted from read_var_list
 #
 # 2544 2017-10-13 18:09:32Z maronga
-# Added date_and_time_mod 
-# 
+# Added date_and_time_mod
+#
 # 2371 2017-08-24 13:01:17Z kanani
 # Corrected dependencies for vertical_nesting_mod
-# 
+#
 # 2370 2017-08-23 06:11:43Z raasch
 # dependency bugfix for synthetic_turbulence_generator
-# 
+#
 # 2365 2017-08-21 14:59:59Z kanani
 # Added dependencies for vertical_nesting_mod
-# 
+#
 # 2339 2017-08-07 13:55:26Z gronemeier
 # corrected timestamp in header
-# 
+#
 # 2338 2017-08-07 12:15:38Z gronemeier
 # Modularize 1D model
-# 
+#
 # 2320 2017-07-21 12:47:43Z suehring
 # -ls_forcing nudging
 # +large_scale_forcing_nudging
-# 
+#
 # 2318 2017-07-20 17:27:44Z suehring
 # Add further dependencies on surface_mod
-# 
+#
 # 2317 2017-07-20 17:27:19Z suehring
 # Added time_integration_spinup
-# 
+#
 # 2269 2017-06-09 11:57:32Z suehring
 # Add dependency in read_3d_binary
-# 
+#
 # 2263 2017-06-08 14:59:01Z schwenkel
 # Implemented splitting and merging algorithm
-# 
+#
 # 2259 2017-06-08 09:09:11Z gronemeier
 # Implemented synthetic turbulence generator
@@ -261 +264 @@
 # 2256 2017-06-07 13:58:08Z suehring
 # Remove ring dependency in init_pegrid
-# 
+#
 # 2238 2017-05-31 16:49:16Z suehring
 # Bugfix, further missing dependency on surface_mod
-# 
+#
 # 2237 2017-05-31 10:34:53Z suehring
-# Bugfix, add dependencies on surface_mod for surface_coupler, 
-# plant_canopy_model_mod and ls_forcing_mod 
-# 
+# Bugfix, add dependencies on surface_mod for surface_coupler,
+# plant_canopy_model_mod and ls_forcing_mod
+#
 # 2233 2017-05-30 18:08:54Z suehring
 #
@@ -274 +277 @@
 # +dependencies for surface_mod
 # -wall_fluxes
-# 
+#
 # 2130 2017-01-24 16:25:39Z raasch
 # dependency for timestep updated
@@ -280 +283 @@
 # 2118 2017-01-17 16:38:49Z raasch
 # -cuda_fft_interfaces_mod
-# 
+#
 # 2050 2016-11-08 15:00:55Z gronemeier
 # Implement turbulent outflow method
-# 
+#
 # 2007 2016-08-24 15:47:17Z kanani
 # urban surface module added,
 # cleaned up some lines (compiler flags/options), which were accidentally
 # added in rev1938
-# 
+#
 # 1998 2016-08-20 18:45:34Z knoop
 # Bugfix: added netcdf_interface to dependency list for user_init_land_surface
@@ -294 +297 @@
 # 1986 2016-08-10 14:07:17Z gronemeier
 # POSIX-calls module added
-# 
+#
 # 1972 2016-07-26 07:52:02Z maronga
 # Removed some dependencies due to further modularization of land surface model
-# 
+#
 # 1957 2016-07-07 10:43:48Z suehring
 # flight module added
@@ -305 +308 @@
 #
 # 1938 2016-06-13 15:26:05Z hellstea
-# Some dependency errors corrected 
-# 
+# Some dependency errors corrected
+#
 # 1934 2016-06-13 09:46:57Z hellstea
 # poismg renamed poismg_noopt, poismg_fast_mod renamed poismg_mod
-# 
+#
 # 1914 2016-05-26 14:44:07Z witha
 # Added wind_turbine_model_mod
@@ -320 +323 @@
 #
 # 1850 2016-04-08 13:29:27Z maronga
-# Adapted for modularization of microphysics 
+# Adapted for modularization of microphysics
 # Several files renamed --> _mod
 # Bugfix for previous commit
@@ -335 +338 @@
 # 1833 2016-04-07 14:23:03Z raasch
 # spectrum renamed spectra_mod, depencies for spectra changed
-# 
+#
 # 1826 2016-04-07 12:01:39Z maronga
 # Renamed radiation_model to radiation_model_mod.
 # Renamed plant_canopy_model to plant_canopy_model_mod.
-# 
+#
 # 1822 2016-04-07 07:49:42Z hoffmann
 # Tails removed. lpm_release_set removed. calc_precipitation, impact_of_latent_heat
-# removed. 
+# removed.
 #
 # 1817 2016-04-06 15:44:20Z maronga
 # Renamed land_surface_model to land_surface_model_mod.
-# 
+#
 # 1808 2016-04-05 19:44:00Z raasch
 # -local_flush, -local_getenv
@@ -372 +375 @@
 #
 # 1762 2016-02-25 12:31:13Z hellstea
-# +pmc_interface, +pmc routines 
+# +pmc_interface, +pmc routines
 #
 # 1747 2016-02-08 12:25:53Z raasch
@@ -378 +381 @@
 #
 # 1691 2015-10-26 16:17:44Z maronga
-# Replaced prandtl_fluxes with surface_layer_fluxes. Added radiation_model to 
+# Replaced prandtl_fluxes with surface_layer_fluxes. Added radiation_model to
 # prognostic_equations
-# 
+#
 # 1585 2015-04-30 07:05:52Z maronga
 # Added user_init_radiation.f90
-# 
+#
 # 1575 2015-03-27 09:56:27Z raasch
 # +poismg_fast
@@ -389 +392 @@
 # 1551 2015-03-03 14:18:16Z maronga
 # Bugfix: further adjustments for the land surface model and radiation model
-# 
+#
 # 1517 2015-01-07 19:12:25Z hoffmann
 # advec_s_bc added to prognostic_equations
@@ -395 +398 @@
 # 1500 2014-12-03 17:42:41Z maronga
 # Bugfix: missing adjustments for land surface model and radiation model
-# 
+#
 # 1496 2014-12-02 17:25:50Z maronga
-# Added land surface model and radiation model files: land_surface_model, 
+# Added land surface model and radiation model files: land_surface_model,
 # radiation_model, user_init_land_surface
-# 
+#
 # 1484 2014-10-21 10:53:05Z kanani
 # plant_canopy_model-dependency added for check_parameters, header, init_3d_model,
 # package_parin, read_var_list, user_init_plant_canopy, write_var_list
-# 
+#
 # 1444 2014-08-02 20:10:32Z letzel
 # bugfix: cpulog added to lpm_advec
-# 
+#
 # 1404 2014-05-14 09:01:39Z keck
 # bugfix: dependencies added for progress_bar
@@ -412 +415 @@
 # 1402 2014-05-09 14:25:13Z raasch
 # progress_bar added
-# 
+#
 # 1400 2014-05-09 14:03:54Z knoop
 # Added new module random_generator_parallel
-# 
+#
 # 1380 2014-04-28 12:40:45Z heinze
 # bugfix: mod_particle_attributes  added to check_open
-# nudging added to time_integration 
+# nudging added to time_integration
 #
 # 1374 2014-04-25 12:55:07Z raasch
@@ -426 +429 @@
 # Added new module calc_mean_profile, previously in module buoyancy,
 # removed buoyancy dependency from nudging
-# 
+#
 # 1363 2014-04-17 12:28:49Z keck
 # bugfix: cpulog added to lpm_pack_arrays
@@ -432 +435 @@
 # 1361 2014-04-16 15:17:48Z hoffmann
 # cpulog added to microphysics
-# 
+#
 # 1359 2014-04-11 17:15:14Z hoffmann
-# mod_particle_attributes added, lpm_sort_arrays removed, 
+# mod_particle_attributes added, lpm_sort_arrays removed,
 # lpm_extend_particle_array removed
 #
@@ -606 +609 @@
         disturb_field.f90 \
         disturb_heatflux.f90 \
+        dynamics_mod.f90 \
         exchange_horiz_2d.f90 \
         exchange_horiz.f90 \
@@ -679 +683 @@
         surface_mod.f90 \
         surface_data_output_mod.f90 \
-        swap_timelevel.f90 \
         synthetic_turbulence_generator_mod.f90 \
         temperton_fft_mod.f90 \
@@ -715 +718 @@
 
 CC = cc
-CFLAGS = -O 
+CFLAGS = -O
 
 F90 =
@@ -736 +739 @@
 
 clean:
-        rm -f $(PROG) $(OBJS) *.mod *.smod *.i *.lst 
+        rm -f $(PROG) $(OBJS) *.mod *.smod *.i *.lst
 
 .f90.o:
@@ -994 +997 @@
         random_generator_parallel_mod.o \
         surface_mod.o
+dynamics_mod.o: \
+        mod_kinds.o \
+        modules.o
 exchange_horiz.o: \
         cpulog_mod.o \
@@ -1179 +1185 @@
         chemistry_model_mod.o \
         diagnostic_output_quantities_mod.o \
+        dynamics_mod.o \
         gust_mod.o \
         indoor_model_mod.o \
@@ -1194 +1201 @@
         surface_data_output_mod.o \
         synthetic_turbulence_generator_mod.o \
+        turbulence_closure_mod.o \
         urban_surface_mod.o \
         user_module.o \
@@ -1508 +1516 @@
         netcdf_interface_mod.o \
         surface_mod.o
-swap_timelevel.o: \
-        cpulog_mod.o \
-        mod_kinds.o \
-        module_interface.o \
-        modules.o \
-        pmc_interface_mod.o \
-        turbulence_closure_mod.o
 synthetic_turbulence_generator_mod.o: \
         basic_constants_and_equations_mod.o \

palm/trunk/SOURCE/module_interface.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Introduction of the dynamics module
+!
+! 4039 2019-06-18 10:32:41Z suehring
 ! Introduce diagnostic output
-! 
+!
 ! 4028 2019-06-13 12:21:37Z schwenkel
 ! Further modularization of particle code components
-! 
+!
 ! 4017 2019-06-06 12:16:46Z schwenkel
-! local_pf need INTENT(INOUT) attribute rather than INTENT(OUT). This is 
+! local_pf need INTENT(INOUT) attribute rather than INTENT(OUT). This is
 ! because INTENT(OUT) sets the array to not-defined. Especially for outputs that
-! are not defined everywhere, e.g. land-surface outputs, this will be 
-! problematic as NaN will be output.   
-! 
+! are not defined everywhere, e.g. land-surface outputs, this will be
+! problematic as NaN will be output.
+!
 ! 3987 2019-05-22 09:52:13Z kanani
 ! Introduce switchable DEBUG file output via debug_message routine
-! 
+!
 ! 3956 2019-05-07 12:32:52Z monakurppa
-! - Added calls for salsa_non_advective_processes and 
+! - Added calls for salsa_non_advective_processes and
 !   salsa_exchange_horiz_bounds
 ! - Moved the call for salsa_data_output_2d/3d before that of
@@ -46 +49 @@
 !   salsa output variable and encounters a segmentation fault for "Ntot" due
 !   to the shortoutput name
-! 
+!
 ! 3931 2019-04-24 16:34:28Z schwenkel
 ! Changed non_transport_physics to non_advective_processes
-! 
+!
 ! 3930 2019-04-24 14:57:18Z forkel
 ! Correct/complete module_interface introduction for chemistry model
 !
 ! 3887 2019 -04-12 08:47:41Z schwenkel
-! Changes related to global restructuring of location messages and introduction 
+! Changes related to global restructuring of location messages and introduction
 ! of additional debug messages
-!  
+!
 ! 3880 2019 -04-08 21:43:02Z knoop
 ! Add a call for salsa_prognostic_equations
-! 
+!
 ! 3840 2019-03-29 10:35:52Z knoop
 ! bugfix: intent of dummy arguments changed to inout
-! 
+!
 ! 3770 2019-02-28 11:22:32Z moh.hefny
 ! removed unused variables in module_interface_check_data_output_ts
@@ -68 +71 @@
 ! 3767 08:18:02Z raasch
 ! unused variable file_index removed from subroutine parameter list
-! 
+!
 ! 3766 2019-02-26 16:23:41Z raasch
 ! first argument removed from module_interface_rrd_*, statement added to avoid
 ! compiler warning about unused variable, file reformatted with respect to coding
 ! standards
-! 
+!
 ! 3762 2019-02-25 16:54:16Z suehring
 ! only pass required arguments to surface_data_output_rrd_local
-! 
+!
 ! 3747 2019-02-16 15:15:23Z gronemeier
 ! Call user_init_arrays
-! 
+!
 ! 3745 2019-02-15 18:57:56Z suehring
 ! Add indoor model
-! 
+!
 ! 3744 2019-02-15 18:38:58Z suehring
 ! Removed bio_check_parameters as the method is empty.
-! 
+!
 ! 3735 2019-02-12 09:52:40Z dom_dwd_user
-! Accepting variable j from check_parameters and passing it to 
+! Accepting variable j from check_parameters and passing it to
 ! bio_check_data_output
 ! Add required restart data for surface output module
-! 
+!
 ! 3731 2019-02-11 13:06:27Z suehring
 ! Add check_parameters routine for virtual measurements
-! 
+!
 ! 3711 2019-01-31 13:44:26Z knoop
 ! Introduced module_interface_init_checks for post-init checks
-! 
+!
 ! 3705 2019-01-29 19:56:39Z suehring
 ! Add last_actions for virtual measurements
-! 
+!
 ! 3704 2019-01-29 19:51:41Z suehring
 ! Some interface calls moved to module_interface + cleanup
-! 
+!
 ! 3684 2019-01-20 20:20:58Z knoop
 ! Bugfix: made unit intend INOUT
-! 
+!
 ! 3650 2019-01-04 13:01:33Z kanani
 ! Add restart routines for biometeorology
-! 
+!
 ! 3649 2019-01-02 16:52:21Z suehring
 ! Initialize strings, in order to avoid compiler warnings for non-initialized
 ! characters with intent(out) attribute
-! 
+!
 ! 3648 2019-01-02 16:35:46Z suehring
 ! Rename subroutines for surface-data output
-! 
+!
 ! 3641 2018-12-23 22:10:01Z knoop
 ! Initial implementation of the PALM module interface
 !
-! 
+!
 ! Description:
 ! ------------
@@ -136 +139 @@
 !-- load module-specific control parameters.
 !-- ToDo: move all of them to respective module or a dedicated central module
+
+    USE dynamics_mod, &
+        ONLY:  dynamics_parin, &
+               dynamics_check_parameters, &
+               dynamics_check_data_output_ts, &
+               dynamics_check_data_output_pr, &
+               dynamics_check_data_output, &
+               dynamics_init_masks, &
+               dynamics_define_netcdf_grid, &
+               dynamics_init_arrays, &
+               dynamics_init, &
+               dynamics_init_checks, &
+               dynamics_header, &
+               dynamics_actions, &
+               dynamics_non_advective_processes, &
+               dynamics_exchange_horiz, &
+               dynamics_prognostic_equations, &
+               dynamics_swap_timelevel, &
+               dynamics_3d_data_averaging, &
+               dynamics_data_output_2d, &
+               dynamics_data_output_3d, &
+               dynamics_statistics, &
+               dynamics_rrd_global, &
+               dynamics_rrd_local, &
+               dynamics_wrd_global, &
+               dynamics_wrd_local, &
+               dynamics_last_actions
+
+    USE turbulence_closure_mod, &
+        ONLY:  tcm_swap_timelevel
+
     USE control_parameters,                                                    &
         ONLY:  air_chemistry,                                                  &
@@ -213 +247 @@
               chem_rrd_local,                                                  &
               chem_wrd_local
-     
-    USE diagnostic_output_quantities_mod,                                      & 
+
+    USE diagnostic_output_quantities_mod,                                      &
         ONLY:  doq_3d_data_averaging,                                          &
                doq_check_data_output,                                          &
@@ -257 +291 @@
                im_data_output_3d,                                              &
                im_init
-               
+
     USE lagrangian_particle_model_mod,                                         &
         ONLY:  lpm_parin,                                                      &
                lpm_header,                                                     &
                lpm_check_parameters,                                           &
-               lpm_init_arrays,                                                &                              
+               lpm_init_arrays,                                                &
                lpm_init,                                                       &
                lpm_actions,                                                    &
@@ -269 +303 @@
                lpm_wrd_local,                                                  &
                lpm_wrd_global
-               
+
     USE land_surface_model_mod,                                                &
         ONLY:  lsm_parin,                                                      &
@@ -317 +351 @@
                ocean_rrd_local,                                                &
                ocean_wrd_local
-               
+
     USE particle_attributes,                                                   &
-        ONLY:  particle_advection               
+        ONLY:  particle_advection
 
     USE plant_canopy_model_mod,                                                &
@@ -394 +428 @@
                usm_rrd_local,                                                  &
                usm_wrd_local
+
+    USE virtual_measurement_mod,                                               &
+        ONLY:  vm_check_parameters,                                            &
+               vm_init,                                                        &
+               vm_last_actions,                                                &
+               vm_parin
+
+    USE wind_turbine_model_mod,                                                &
+        ONLY:  wtm_parin,                                                      &
+               wtm_check_parameters,                                           &
+               wtm_init_arrays,                                                &
+               wtm_init,                                                       &
+               wtm_actions,                                                    &
+               wtm_rrd_global,                                                 &
+               wtm_wrd_global
 
     USE user,                                                                  &
@@ -415 +464 @@
                user_wrd_local,                                                 &
                user_last_actions
-
-    USE virtual_measurement_mod,                                               &
-        ONLY:  vm_check_parameters,                                            &
-               vm_init,                                                        &
-               vm_last_actions,                                                &
-               vm_parin
-
-    USE wind_turbine_model_mod,                                                &
-        ONLY:  wtm_parin,                                                      &
-               wtm_check_parameters,                                           &
-               wtm_init_arrays,                                                &
-               wtm_init,                                                       &
-               wtm_actions,                                                    &
-               wtm_rrd_global,                                                 &
-               wtm_wrd_global
 
     IMPLICIT NONE
@@ -518 +552 @@
        MODULE PROCEDURE module_interface_non_advective_processes_ij
     END INTERFACE module_interface_non_advective_processes
-    
+
     INTERFACE module_interface_exchange_horiz
        MODULE PROCEDURE module_interface_exchange_horiz
     END INTERFACE module_interface_exchange_horiz
-    
+
     INTERFACE module_interface_prognostic_equations
        MODULE PROCEDURE module_interface_prognostic_equations
@@ -581 +615 @@
 
     IF ( debug_output )  CALL debug_message( 'reading module-specific parameters', 'start' )
+
+    CALL dynamics_parin
 
     CALL bio_parin
@@ -588 +624 @@
     CALL gust_parin
     CALL im_parin
-    CALL lpm_parin      
+    CALL lpm_parin
     CALL lsm_parin
     ! ToDo: create parin routine for large_scale_forcing and nudging (should be seperate modules or new module switch)
@@ -600 +636 @@
     CALL surface_data_output_parin
     CALL stg_parin
-    CALL user_parin ! ToDo: make user code a single Fortran module
     CALL usm_parin
     CALL vm_parin
     CALL wtm_parin
 
+    CALL user_parin
+
     IF ( debug_output )  CALL debug_message( 'reading module-specific parameters', 'end' )
 
@@ -620 +657 @@
 
     IF ( debug_output )  CALL debug_message( 'checking module-specific parameters', 'start' )
+
+    CALL dynamics_check_parameters
 
     IF ( bulk_cloud_model )     CALL bcm_check_parameters
@@ -625 +664 @@
     IF ( gust_module_enabled )  CALL gust_check_parameters
     IF ( indoor_model )         CALL im_check_parameters
-    IF ( particle_advection )   CALL lpm_check_parameters        
+    IF ( particle_advection )   CALL lpm_check_parameters
     IF ( land_surface )         CALL lsm_check_parameters
     IF ( large_scale_forcing  .OR.  nudging )  CALL lsf_nudging_check_parameters ! ToDo: create single module switch
@@ -639 +678 @@
     IF ( virtual_measurement )  CALL vm_check_parameters
     IF ( wind_turbine )         CALL wtm_check_parameters
+
     IF ( user_module_enabled )  CALL user_check_parameters
 
@@ -663 +703 @@
     IF ( debug_output )  CALL debug_message( 'checking module-specific data output ts', 'start' )
 
+    CALL dynamics_check_data_output_ts( dots_max, dots_num, dots_label, dots_unit )
+
     IF ( radiation )  THEN
        CALL radiation_check_data_output_ts( dots_max, dots_num )
@@ -694 +736 @@
     IF ( debug_output )  CALL debug_message( 'checking module-specific data output pr', 'start' )
 
+    CALL dynamics_check_data_output_pr( variable, var_count, unit, dopr_unit )
+
     IF ( unit == 'illegal' .AND.  bulk_cloud_model )  THEN
        CALL bcm_check_data_output_pr( variable, var_count, unit, dopr_unit )
@@ -751 +795 @@
     IF ( debug_output )  CALL debug_message( 'checking module-specific data output 2d/3d', 'start' )
 
+    CALL dynamics_check_data_output( variable, unit )
+
     IF ( unit == 'illegal'  .AND.  biometeorology )  THEN
        CALL bio_check_data_output( variable, unit, i, j, ilen, k )
@@ -763 +809 @@
        CALL chem_check_data_output( variable, unit, i, ilen, k )
     ENDIF
-    
+
     IF ( unit == 'illegal' )  THEN
        CALL doq_check_data_output( variable, unit )
@@ -796 +842 @@
        CALL im_check_data_output( variable, unit )
     ENDIF
-   
+
     IF ( unit == 'illegal'  .AND.  urban_surface                      &
         .AND.  variable(1:4) == 'usm_' )  THEN  ! ToDo: remove aditional conditions
@@ -827 +873 @@
 
     IF ( debug_output )  CALL debug_message( 'initializing module-specific masks', 'start' )
+
+    CALL dynamics_init_masks( variable, unit )
 
     IF ( unit == 'illegal'  .AND.  air_chemistry                               &
@@ -897 +945 @@
     IF ( debug_output )  CALL debug_message( 'initializing module-specific arrays', 'start' )
 
+    CALL dynamics_init_arrays
+
     IF ( bulk_cloud_model    )  CALL bcm_init_arrays
     IF ( air_chemistry       )  CALL chem_init_arrays
     IF ( gust_module_enabled )  CALL gust_init_arrays
-    IF ( particle_advection  )  CALL lpm_init_arrays        
+    IF ( particle_advection  )  CALL lpm_init_arrays
     IF ( land_surface        )  CALL lsm_init_arrays
     IF ( ocean_mode          )  CALL ocean_init_arrays
@@ -907 +957 @@
     IF ( surface_output      )  CALL surface_data_output_init_arrays
     IF ( wind_turbine        )  CALL wtm_init_arrays
+
     IF ( user_module_enabled )  CALL user_init_arrays
 
@@ -924 +975 @@
 
     IF ( debug_output )  CALL debug_message( 'module-specific initialization', 'start' )
+
+    CALL dynamics_init
 
     IF ( biometeorology      )  CALL bio_init
@@ -931 +984 @@
     IF ( gust_module_enabled )  CALL gust_init
     IF ( indoor_model        )  CALL im_init
-    IF ( particle_advection  )  CALL lpm_init    
+    IF ( particle_advection  )  CALL lpm_init
     IF ( large_scale_forcing )  CALL lsf_init
     IF ( land_surface        )  CALL lsm_init
@@ -942 +995 @@
     IF ( wind_turbine        )  CALL wtm_init
     IF ( radiation           )  CALL radiation_init
+
     IF ( user_module_enabled )  CALL user_init
 
@@ -960 +1014 @@
     IF ( debug_output )  CALL debug_message( 'module-specific post-initialization checks', 'start' )
 
+    CALL dynamics_init_checks
+
     IF ( biometeorology      )  CALL bio_init_checks
 
@@ -980 +1036 @@
 
     IF ( debug_output )  CALL debug_message( 'module-specific header output', 'start' )
+
+    CALL dynamics_header( io )
 
     IF ( biometeorology      )  CALL bio_header ( io )
@@ -986 +1044 @@
     IF ( virtual_flight      )  CALL flight_header( io )
     IF ( gust_module_enabled )  CALL gust_header( io )
-    IF ( particle_advection  )  CALL lpm_header( io )    
+    IF ( particle_advection  )  CALL lpm_header( io )
     IF ( land_surface        )  CALL lsm_header( io )
     IF ( large_scale_forcing )  CALL lsf_nudging_header( io )
@@ -996 +1054 @@
     IF ( calculate_spectra   )  CALL spectra_header( io )
     IF ( syn_turb_gen        )  CALL stg_header( io )
+
     IF ( user_module_enabled )  CALL user_header( io )
 
@@ -1014 +1073 @@
     CHARACTER (LEN=*), INTENT(IN) ::  location !< call location string
 
+    CALL dynamics_actions( location )
 
     IF ( bulk_cloud_model    )  CALL bcm_actions( location )
     IF ( air_chemistry       )  CALL chem_actions( location )
     IF ( gust_module_enabled )  CALL gust_actions( location )
-    IF ( particle_advection  )  CALL lpm_actions( location )    
+    IF ( particle_advection  )  CALL lpm_actions( location )
     IF ( ocean_mode          )  CALL ocean_actions( location )
     IF ( salsa               )  CALL salsa_actions( location )
     IF ( wind_turbine        )  CALL wtm_actions( location )
+
     IF ( user_module_enabled )  CALL user_actions( location )
 
@@ -1040 +1101 @@
     CHARACTER (LEN=*), INTENT(IN) ::  location  !< call location string
 
+    CALL dynamics_actions( i, j, location )
 
     IF ( bulk_cloud_model    )  CALL bcm_actions( i, j, location )
@@ -1047 +1109 @@
     IF ( salsa               )  CALL salsa_actions( i, j, location )
     IF ( wind_turbine        )  CALL wtm_actions( i, j, location )
+
     IF ( user_module_enabled )  CALL user_actions( i, j, location )
 
@@ -1058 +1121 @@
 !> Compute module-specific non_advective_processes (vector-optimized)
 !------------------------------------------------------------------------------!
- SUBROUTINE module_interface_non_advective_processes()
-
-
-    IF ( bulk_cloud_model    )  CALL bcm_non_advective_processes()
-    IF ( air_chemistry       )  CALL chem_non_advective_processes()
-    IF ( salsa               )  CALL salsa_non_advective_processes()
+ SUBROUTINE module_interface_non_advective_processes
+
+
+    CALL dynamics_non_advective_processes
+
+    IF ( bulk_cloud_model    )  CALL bcm_non_advective_processes
+    IF ( air_chemistry       )  CALL chem_non_advective_processes
+    IF ( salsa               )  CALL salsa_non_advective_processes
 
 
@@ -1080 +1145 @@
     INTEGER(iwp), INTENT(IN) ::  j            !< grid index in y-direction
 
+    CALL dynamics_non_advective_processes( i, j )
 
     IF ( bulk_cloud_model    )  CALL bcm_non_advective_processes( i, j )
@@ -1087 +1153 @@
 
  END SUBROUTINE module_interface_non_advective_processes_ij
- 
-!------------------------------------------------------------------------------!
-! Description:
-! ------------
-!> Exchange horiz for module-specific quantities 
-!------------------------------------------------------------------------------!
- SUBROUTINE module_interface_exchange_horiz()
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Exchange horiz for module-specific quantities
+!------------------------------------------------------------------------------!
+ SUBROUTINE module_interface_exchange_horiz
 
 
     IF ( debug_output_timestep )  CALL debug_message( 'module-specific exchange_horiz', 'start' )
 
-    IF ( bulk_cloud_model    )  CALL bcm_exchange_horiz()
-    IF ( air_chemistry       )  CALL chem_exchange_horiz_bounds()
-    IF ( salsa               )  CALL salsa_exchange_horiz_bounds()
+    CALL dynamics_exchange_horiz
+
+    IF ( bulk_cloud_model    )  CALL bcm_exchange_horiz
+    IF ( air_chemistry       )  CALL chem_exchange_horiz_bounds
+    IF ( salsa               )  CALL salsa_exchange_horiz_bounds
 
     IF ( debug_output_timestep )  CALL debug_message( 'module-specific exchange_horiz', 'end' )
@@ -1113 +1181 @@
 !> Compute module-specific prognostic_equations (vector-optimized)
 !------------------------------------------------------------------------------!
- SUBROUTINE module_interface_prognostic_equations()
-
-
-    IF ( bulk_cloud_model    )  CALL bcm_prognostic_equations()
-    IF ( air_chemistry       )  CALL chem_prognostic_equations()
-    IF ( gust_module_enabled )  CALL gust_prognostic_equations()
-    IF ( ocean_mode          )  CALL ocean_prognostic_equations()
-    IF ( salsa               )  CALL salsa_prognostic_equations()
+ SUBROUTINE module_interface_prognostic_equations
+
+
+    CALL dynamics_prognostic_equations
+
+    IF ( bulk_cloud_model    )  CALL bcm_prognostic_equations
+    IF ( air_chemistry       )  CALL chem_prognostic_equations
+    IF ( gust_module_enabled )  CALL gust_prognostic_equations
+    IF ( ocean_mode          )  CALL ocean_prognostic_equations
+    IF ( salsa               )  CALL salsa_prognostic_equations
 
 
@@ -1139 +1209 @@
     INTEGER(iwp), INTENT(IN) ::  tn           !< task number of openmp task
 
+    CALL dynamics_prognostic_equations( i, j, i_omp_start, tn )
 
     IF ( bulk_cloud_model    )  CALL bcm_prognostic_equations( i, j, i_omp_start, tn )
@@ -1162 +1233 @@
 
     IF ( debug_output_timestep )  CALL debug_message( 'module-specific swap timelevel', 'start' )
+
+    CALL dynamics_swap_timelevel( swap_mode )
+    CALL tcm_swap_timelevel( swap_mode )
 
     IF ( bulk_cloud_model    )  CALL bcm_swap_timelevel( swap_mode )
@@ -1192 +1266 @@
     IF ( debug_output_timestep )  CALL debug_message( 'module-specific 3d data averaging', 'start' )
 
+    CALL dynamics_3d_data_averaging( mode, variable )
+
     IF ( biometeorology      )  CALL bio_3d_data_averaging( mode, variable )
     IF ( bulk_cloud_model    )  CALL bcm_3d_data_averaging( mode, variable )
     IF ( air_chemistry       )  CALL chem_3d_data_averaging( mode, variable )
-    CALL doq_3d_data_averaging( mode, variable )
+    CALL doq_3d_data_averaging( mode, variable )  ! ToDo: this seems to be not according to the design
     IF ( gust_module_enabled )  CALL gust_3d_data_averaging( mode, variable )
     IF ( land_surface        )  CALL lsm_3d_data_averaging( mode, variable )
@@ -1202 +1278 @@
     IF ( salsa               )  CALL salsa_3d_data_averaging( mode, variable )
     IF ( urban_surface       )  CALL usm_3d_data_averaging( mode, variable )
+
     IF ( user_module_enabled )  CALL user_3d_data_averaging( mode, variable )
 
@@ -1234 +1311 @@
     IF ( debug_output_timestep )  CALL debug_message( 'module-specific 2d data output', 'start' )
 
+    CALL dynamics_data_output_2d(                                                  &
+               av, variable, found, grid, mode, local_pf, two_d, nzb_do, nzt_do, fill_value &
+            )
+
     IF ( .NOT. found  .AND.  biometeorology )  THEN
        CALL bio_data_output_2d(                                                &
@@ -1251 +1332 @@
             )
     ENDIF
-    
+
     IF ( .NOT. found )  THEN
        CALL doq_output_2d(                                                     &
@@ -1323 +1404 @@
     IF ( debug_output_timestep )  CALL debug_message( 'module-specific 3d data output', 'start' )
 
+    CALL dynamics_data_output_3d( av, variable, found, local_pf, fill_value, nzb_do, nzt_do )
+    resorted = .FALSE.
+
     IF ( .NOT. found  .AND.  biometeorology )  THEN
        CALL bio_data_output_3d( av, variable, found, local_pf, nzb_do, nzt_do )
@@ -1337 +1421 @@
        resorted = .TRUE.
     ENDIF
-    
+
     IF ( .NOT. found )  THEN
        CALL doq_output_3d( av, variable, found, local_pf, fill_value, nzb_do, nzt_do )
        resorted = .TRUE.
     ENDIF
-    
+
     IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
        CALL gust_data_output_3d( av, variable, found, local_pf, fill_value, nzb_do, nzt_do )
        resorted = .TRUE.
     ENDIF
-   
+
     IF ( .NOT. found  .AND.  indoor_model )  THEN
        CALL im_data_output_3d( av, variable, found, local_pf, fill_value, nzb_do, nzt_do )
@@ -1400 +1484 @@
     IF ( debug_output_timestep )  CALL debug_message( 'module-specific statistics', 'start' )
 
+    CALL dynamics_statistics( mode, sr, tn )
+
     IF ( gust_module_enabled )  CALL gust_statistics( mode, sr, tn, dots_max )
     IF ( air_chemistry       )  CALL chem_statistics( mode, sr, tn )
+
     IF ( user_module_enabled )  CALL user_statistics( mode, sr, tn )
 
@@ -1422 +1509 @@
 
     IF ( debug_output )  CALL debug_message( 'module-specific read global restart data', 'start' )
+
+    CALL dynamics_rrd_global( found ) ! ToDo: change interface to pass variable
 
     IF ( .NOT. found )  CALL bio_rrd_global( found ) ! ToDo: change interface to pass variable
@@ -1427 +1516 @@
     IF ( .NOT. found )  CALL flight_rrd_global( found ) ! ToDo: change interface to pass variable
     IF ( .NOT. found )  CALL gust_rrd_global( found ) ! ToDo: change interface to pass variable
-    IF ( .NOT. found )  CALL lpm_rrd_global( found ) ! ToDo: change interface to pass variable        
+    IF ( .NOT. found )  CALL lpm_rrd_global( found ) ! ToDo: change interface to pass variable
     IF ( .NOT. found )  CALL ocean_rrd_global( found ) ! ToDo: change interface to pass variable
     IF ( .NOT. found )  CALL stg_rrd_global ( found ) ! ToDo: change interface to pass variable
     IF ( .NOT. found )  CALL wtm_rrd_global( found ) ! ToDo: change interface to pass variable
     IF ( .NOT. found )  CALL surface_data_output_rrd_global( found )
+
     IF ( .NOT. found )  CALL user_rrd_global( found ) ! ToDo: change interface to pass variable
 
@@ -1449 +1539 @@
 
     IF ( debug_output )  CALL debug_message( 'module-specific write global restart data', 'start' )
+
+    CALL dynamics_wrd_global
 
     IF ( biometeorology )       CALL bio_wrd_global
@@ -1458 +1550 @@
     IF ( wind_turbine )         CALL wtm_wrd_global
     IF ( surface_output )       CALL surface_data_output_wrd_global
+
     IF ( user_module_enabled )  CALL user_wrd_global
 
@@ -1504 +1597 @@
     IF ( debug_output )  CALL debug_message( 'module-specific read local restart data', 'start' )
 
+    CALL dynamics_rrd_local(                                                   &
+           map_index,                                                          &
+           nxlf, nxlc, nxl_on_file,                                            &
+           nxrf, nxrc, nxr_on_file,                                            &
+           nynf, nync, nyn_on_file,                                            &
+           nysf, nysc, nys_on_file,                                            &
+           tmp_2d, tmp_3d, found                                               &
+        ) ! ToDo: change interface to pass variable
+
     IF ( .NOT. found )  CALL bio_rrd_local(                                    &
                                found                                           &
@@ -1525 +1627 @@
                                tmp_3d, found                                   &
                             ) ! ToDo: change interface to pass variable
-                            
+
 !     IF ( .NOT. found )  CALL doq_rrd_local(                                    &
 !                                map_index,                                      &
@@ -1600 +1702 @@
 !-- Surface data do not need overlap data, so do not pass these information.
     IF ( .NOT. found )  CALL surface_data_output_rrd_local( found )
-                           
+
     IF ( .NOT. found )  CALL user_rrd_local(                                   &
                                map_index,                                      &
@@ -1626 +1728 @@
     IF ( debug_output )  CALL debug_message( 'module-specific write local restart data', 'start' )
 
+    CALL dynamics_wrd_local
+
     IF ( biometeorology )       CALL bio_wrd_local
     IF ( bulk_cloud_model )     CALL bcm_wrd_local
@@ -1631 +1735 @@
     CALL doq_wrd_local
     IF ( gust_module_enabled )  CALL gust_wrd_local
-    IF ( particle_advection )   CALL lpm_wrd_local    
+    IF ( particle_advection )   CALL lpm_wrd_local
     IF ( land_surface )         CALL lsm_wrd_local
     IF ( ocean_mode )           CALL ocean_wrd_local
@@ -1638 +1742 @@
     IF ( urban_surface )        CALL usm_wrd_local
     IF ( surface_output )       CALL surface_data_output_wrd_local
+
     IF ( user_module_enabled )  CALL user_wrd_local
 
@@ -1656 +1761 @@
     IF ( debug_output )  CALL debug_message( 'module-specific last actions', 'start' )
 
+    CALL dynamics_last_actions
+
     IF ( virtual_measurement )  CALL vm_last_actions
+
     IF ( user_module_enabled )  CALL user_last_actions
 

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added remainings of swap_timelevel upon its dissolution
+! 
+! 4043 2019-06-18 16:59:00Z schwenkel
 ! Further LPM modularization
 !
@@ -575 +578 @@
                turbulent_inflow, turbulent_outflow, urban_surface,                                 &
                use_initial_profile_as_reference, use_single_reference_value, u_gtrans, v_gtrans,   &
-               virtual_flight, virtual_measurement, ws_scheme_mom, ws_scheme_sca
+               virtual_flight, virtual_measurement, ws_scheme_mom, ws_scheme_sca, timestep_count
 
     USE cpulog,                                                                                    &
@@ -610 +613 @@
 
     USE module_interface,                                                                          &
-        ONLY:  module_interface_actions
+        ONLY:  module_interface_actions, module_interface_swap_timelevel
 
     USE multi_agent_system_mod,                                                                    &
@@ -631 +634 @@
     USE pmc_interface,                                                                             &
         ONLY:  nested_run, nesting_mode, pmci_boundary_conds, pmci_datatrans, pmci_synchronize,    &
-        pmci_ensure_nest_mass_conservation, pmci_ensure_nest_mass_conservation_vertical
+        pmci_ensure_nest_mass_conservation, pmci_ensure_nest_mass_conservation_vertical,           &
+        pmci_set_swaplevel
 
     USE progress_bar,                                                                              &
@@ -1135 +1139 @@
 
 !
-!--       Swap the time levels in preparation for the next time step.
-          CALL swap_timelevel
+!--       Incrementing timestep counter
+          timestep_count = timestep_count + 1
+
+          CALL cpu_log( log_point(28), 'swap_timelevel', 'start' )
+!
+!--       Set the swap level for all modules
+          CALL module_interface_swap_timelevel( MOD( timestep_count, 2) )
+!
+!--       Set the swap level for steering the pmc data transfer
+          IF ( nested_run )  CALL pmci_set_swaplevel( MOD( timestep_count, 2) + 1 )  !> @todo: why the +1 ?
+
+          CALL cpu_log( log_point(28), 'swap_timelevel', 'stop' )
 
 !