Changeset 4048 for palm/trunk/SOURCE/module_interface.f90

Timestamp:

Jun 21, 2019 9:00:21 PM (5 years ago)

Author:

knoop

Message:

Moved turbulence_closure_mod calls into module_interface

File:

• palm/trunk/SOURCE/module_interface.f90 (modified) (13 diffs)

palm/trunk/SOURCE/module_interface.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Moved turbulence_closure_mod calls into this module_interface
+! 
+! 4047 2019-06-21 18:58:09Z knoop
 ! Introduction of the dynamics module
 !
@@ -168 +171 @@
 
     USE turbulence_closure_mod, &
-        ONLY:  tcm_swap_timelevel
+        ONLY:  tcm_check_parameters, &
+               tcm_check_data_output, &
+               tcm_init_arrays, &
+               tcm_init, &
+               tcm_actions, &
+               tcm_prognostic_equations, &
+               tcm_swap_timelevel, &
+               tcm_3d_data_averaging, &
+               tcm_data_output_2d, &
+               tcm_data_output_3d
 
     USE control_parameters,                                                    &
@@ -659 +671 @@
 
     CALL dynamics_check_parameters
+    CALL tcm_check_parameters
 
     IF ( bulk_cloud_model )     CALL bcm_check_parameters
@@ -797 +810 @@
     CALL dynamics_check_data_output( variable, unit )
 
+    CALL tcm_check_data_output( variable, unit )
+
     IF ( unit == 'illegal'  .AND.  biometeorology )  THEN
        CALL bio_check_data_output( variable, unit, i, j, ilen, k )
@@ -946 +961 @@
 
     CALL dynamics_init_arrays
+    CALL tcm_init_arrays
 
     IF ( bulk_cloud_model    )  CALL bcm_init_arrays
@@ -977 +993 @@
 
     CALL dynamics_init
+    CALL tcm_init
 
     IF ( biometeorology      )  CALL bio_init
@@ -1074 +1091 @@
 
     CALL dynamics_actions( location )
+    CALL tcm_actions( location )
 
     IF ( bulk_cloud_model    )  CALL bcm_actions( location )
@@ -1102 +1120 @@
 
     CALL dynamics_actions( i, j, location )
+    CALL tcm_actions( i, j, location )
 
     IF ( bulk_cloud_model    )  CALL bcm_actions( i, j, location )
@@ -1185 +1204 @@
 
     CALL dynamics_prognostic_equations
+    CALL tcm_prognostic_equations
 
     IF ( bulk_cloud_model    )  CALL bcm_prognostic_equations
@@ -1210 +1230 @@
 
     CALL dynamics_prognostic_equations( i, j, i_omp_start, tn )
+    CALL tcm_prognostic_equations( i, j, i_omp_start, tn )
 
     IF ( bulk_cloud_model    )  CALL bcm_prognostic_equations( i, j, i_omp_start, tn )
@@ -1267 +1288 @@
 
     CALL dynamics_3d_data_averaging( mode, variable )
+    CALL tcm_3d_data_averaging( mode, variable )
 
     IF ( biometeorology      )  CALL bio_3d_data_averaging( mode, variable )
@@ -1315 +1337 @@
             )
 
+    IF ( .NOT. found )  THEN
+       CALL tcm_data_output_2d(                                                  &
+               av, variable, found, grid, mode, local_pf, nzb_do, nzt_do &
+            )
+    ENDIF
+
     IF ( .NOT. found  .AND.  biometeorology )  THEN
        CALL bio_data_output_2d(                                                &
@@ -1406 +1434 @@
     CALL dynamics_data_output_3d( av, variable, found, local_pf, fill_value, nzb_do, nzt_do )
     resorted = .FALSE.
+
+    IF ( .NOT. found )  THEN
+       CALL tcm_data_output_3d( av, variable, found, local_pf, nzb_do, nzt_do )
+       resorted = .TRUE.
+    ENDIF
 
     IF ( .NOT. found  .AND.  biometeorology )  THEN