Changeset 4564 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Jun 12, 2020 2:03:36 PM (4 years ago)

Author:

raasch

Message:

Vertical nesting method of Huq et al. (2019) removed

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (9 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Vertical nesting method of Huq et al. (2019) removed
+! 
+! 4521 2020-05-06 11:39:49Z schwenkel
 ! Rename variable
 ! 
@@ -398 +401 @@
                usm_surface_energy_balance, usm_green_heat_model
 
-    USE vertical_nesting_mod,                                                                      &
-        ONLY:  vnested, vnest_init
-
-#if defined( __parallel )
-    USE vertical_nesting_mod,                                                                      &
-        ONLY:  vnest_anterpolate, vnest_anterpolate_e, vnest_boundary_conds,                       &
-               vnest_boundary_conds_khkm, vnest_deallocate, vnest_init_fine, vnest_start_time
-#endif
-
     USE virtual_measurement_mod,                                                                   &
         ONLY:  dt_virtual_measurement,                                                             &
@@ -616 +610 @@
 !-- Data exchange between coupled models in case that a call has been omitted
 !-- at the end of the previous run of a job chain.
-    IF ( coupling_mode /= 'uncoupled'  .AND.  run_coupled  .AND. .NOT. vnested )  THEN
+    IF ( coupling_mode /= 'uncoupled'  .AND.  run_coupled )  THEN
 !
 !--    In case of model termination initiated by the local model the coupler
@@ -636 +630 @@
 
        CALL cpu_log( log_point_s(10), 'timesteps', 'start' )
-
-#if defined( __parallel )
-!
-!--    Vertical nesting: initialize fine grid
-       IF ( vnested ) THEN
-          IF ( .NOT. vnest_init  .AND.  simulated_time >= vnest_start_time )  THEN
-             CALL cpu_log( log_point_s(22), 'vnest_init', 'start' )
-             CALL vnest_init_fine
-             vnest_init = .TRUE.
-             CALL cpu_log( log_point_s(22), 'vnest_init', 'stop' )
-          ENDIF
-       ENDIF
-#endif
 
 !
@@ -868 +849 @@
 
 #if defined( __parallel )
-!
-!--       Vertical nesting: Interpolate fine grid data to the coarse grid
-          IF ( vnest_init ) THEN
-             CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'start' )
-             CALL vnest_anterpolate
-             CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'stop' )
-          ENDIF
-
           IF ( nested_run )  THEN
 
@@ -1033 +1006 @@
 !--       Reduce the velocity divergence via the equation for perturbation
 !--       pressure.
-          IF ( intermediate_timestep_count == 1  .OR. &
-                call_psolver_at_all_substeps )  THEN
-
-             IF (  vnest_init ) THEN
+          IF ( intermediate_timestep_count == 1  .OR.  call_psolver_at_all_substeps )  THEN
+
 #if defined( __parallel )
 !
-!--             Compute pressure in the CG, interpolate top boundary conditions
-!--             to the FG and then compute pressure in the FG
-                IF ( coupling_mode == 'vnested_crse' )  CALL pres
-
-                CALL cpu_log( log_point_s(30), 'vnest_bc', 'start' )
-                CALL vnest_boundary_conds
-                CALL cpu_log( log_point_s(30), 'vnest_bc', 'stop' )
-
-                IF ( coupling_mode == 'vnested_fine' )  CALL pres
-
-!--             Anterpolate TKE, satisfy Germano Identity
-                CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'start' )
-                CALL vnest_anterpolate_e
-                CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'stop' )
-#else
-                CONTINUE
+!--          Mass (volume) flux correction to ensure global mass conservation for child domains.
+             IF ( child_domain )  THEN
+                IF ( nesting_mode == 'vertical' )  THEN
+                   CALL pmci_ensure_nest_mass_conservation_vertical
+                ELSE
+                   CALL pmci_ensure_nest_mass_conservation
+                ENDIF
+             ENDIF
 #endif
-
-             ELSE
-#if defined( __parallel )
-!
-!--             Mass (volume) flux correction to ensure global mass conservation for child domains.
-                IF ( child_domain )  THEN
-                   IF ( nesting_mode == 'vertical' )  THEN
-                      CALL pmci_ensure_nest_mass_conservation_vertical
-                   ELSE
-                      CALL pmci_ensure_nest_mass_conservation
-                   ENDIF
-                ENDIF
-#endif
-                CALL pres
-
-             ENDIF
+             CALL pres
 
           ENDIF
@@ -1187 +1135 @@
              ENDIF
              CALL cpu_log( log_point(17), 'diffusivities', 'stop' )
-
-#if defined( __parallel )
-!
-!--          Vertical nesting: set fine grid eddy viscosity top boundary condition
-             IF ( vnest_init )  CALL vnest_boundary_conds_khkm
-#endif
 
           ENDIF
@@ -1402 +1344 @@
 !
 !--    Data exchange between coupled models
-       IF ( coupling_mode /= 'uncoupled'  .AND.  run_coupled  .AND.  .NOT. vnested )  THEN
+       IF ( coupling_mode /= 'uncoupled'  .AND.  run_coupled )  THEN
           time_coupling = time_coupling + dt_3d
 
@@ -1741 +1683 @@
 !$ACC END DATA
 
-#if defined( __parallel )
-!
-!-- Vertical nesting: Deallocate variables initialized for vertical nesting
-    IF ( vnest_init )  CALL vnest_deallocate
-#endif
-
     IF ( myid == 0 )  CALL finish_progress_bar