Changeset 4564 for palm/trunk/SOURCE/time_integration.f90
- Timestamp:
- Jun 12, 2020 2:03:36 PM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/time_integration.f90
r4521 r4564 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Vertical nesting method of Huq et al. (2019) removed 28 ! 29 ! 4521 2020-05-06 11:39:49Z schwenkel 27 30 ! Rename variable 28 31 ! … … 398 401 usm_surface_energy_balance, usm_green_heat_model 399 402 400 USE vertical_nesting_mod, &401 ONLY: vnested, vnest_init402 403 #if defined( __parallel )404 USE vertical_nesting_mod, &405 ONLY: vnest_anterpolate, vnest_anterpolate_e, vnest_boundary_conds, &406 vnest_boundary_conds_khkm, vnest_deallocate, vnest_init_fine, vnest_start_time407 #endif408 409 403 USE virtual_measurement_mod, & 410 404 ONLY: dt_virtual_measurement, & … … 616 610 !-- Data exchange between coupled models in case that a call has been omitted 617 611 !-- at the end of the previous run of a job chain. 618 IF ( coupling_mode /= 'uncoupled' .AND. run_coupled .AND. .NOT. vnested) THEN612 IF ( coupling_mode /= 'uncoupled' .AND. run_coupled ) THEN 619 613 ! 620 614 !-- In case of model termination initiated by the local model the coupler … … 636 630 637 631 CALL cpu_log( log_point_s(10), 'timesteps', 'start' ) 638 639 #if defined( __parallel )640 !641 !-- Vertical nesting: initialize fine grid642 IF ( vnested ) THEN643 IF ( .NOT. vnest_init .AND. simulated_time >= vnest_start_time ) THEN644 CALL cpu_log( log_point_s(22), 'vnest_init', 'start' )645 CALL vnest_init_fine646 vnest_init = .TRUE.647 CALL cpu_log( log_point_s(22), 'vnest_init', 'stop' )648 ENDIF649 ENDIF650 #endif651 632 652 633 ! … … 868 849 869 850 #if defined( __parallel ) 870 !871 !-- Vertical nesting: Interpolate fine grid data to the coarse grid872 IF ( vnest_init ) THEN873 CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'start' )874 CALL vnest_anterpolate875 CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'stop' )876 ENDIF877 878 851 IF ( nested_run ) THEN 879 852 … … 1033 1006 !-- Reduce the velocity divergence via the equation for perturbation 1034 1007 !-- pressure. 1035 IF ( intermediate_timestep_count == 1 .OR. & 1036 call_psolver_at_all_substeps ) THEN 1037 1038 IF ( vnest_init ) THEN 1008 IF ( intermediate_timestep_count == 1 .OR. call_psolver_at_all_substeps ) THEN 1009 1039 1010 #if defined( __parallel ) 1040 1011 ! 1041 !-- Compute pressure in the CG, interpolate top boundary conditions 1042 !-- to the FG and then compute pressure in the FG 1043 IF ( coupling_mode == 'vnested_crse' ) CALL pres 1044 1045 CALL cpu_log( log_point_s(30), 'vnest_bc', 'start' ) 1046 CALL vnest_boundary_conds 1047 CALL cpu_log( log_point_s(30), 'vnest_bc', 'stop' ) 1048 1049 IF ( coupling_mode == 'vnested_fine' ) CALL pres 1050 1051 !-- Anterpolate TKE, satisfy Germano Identity 1052 CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'start' ) 1053 CALL vnest_anterpolate_e 1054 CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'stop' ) 1055 #else 1056 CONTINUE 1012 !-- Mass (volume) flux correction to ensure global mass conservation for child domains. 1013 IF ( child_domain ) THEN 1014 IF ( nesting_mode == 'vertical' ) THEN 1015 CALL pmci_ensure_nest_mass_conservation_vertical 1016 ELSE 1017 CALL pmci_ensure_nest_mass_conservation 1018 ENDIF 1019 ENDIF 1057 1020 #endif 1058 1059 ELSE 1060 #if defined( __parallel ) 1061 ! 1062 !-- Mass (volume) flux correction to ensure global mass conservation for child domains. 1063 IF ( child_domain ) THEN 1064 IF ( nesting_mode == 'vertical' ) THEN 1065 CALL pmci_ensure_nest_mass_conservation_vertical 1066 ELSE 1067 CALL pmci_ensure_nest_mass_conservation 1068 ENDIF 1069 ENDIF 1070 #endif 1071 CALL pres 1072 1073 ENDIF 1021 CALL pres 1074 1022 1075 1023 ENDIF … … 1187 1135 ENDIF 1188 1136 CALL cpu_log( log_point(17), 'diffusivities', 'stop' ) 1189 1190 #if defined( __parallel )1191 !1192 !-- Vertical nesting: set fine grid eddy viscosity top boundary condition1193 IF ( vnest_init ) CALL vnest_boundary_conds_khkm1194 #endif1195 1137 1196 1138 ENDIF … … 1402 1344 ! 1403 1345 !-- Data exchange between coupled models 1404 IF ( coupling_mode /= 'uncoupled' .AND. run_coupled .AND. .NOT. vnested) THEN1346 IF ( coupling_mode /= 'uncoupled' .AND. run_coupled ) THEN 1405 1347 time_coupling = time_coupling + dt_3d 1406 1348 … … 1741 1683 !$ACC END DATA 1742 1684 1743 #if defined( __parallel )1744 !1745 !-- Vertical nesting: Deallocate variables initialized for vertical nesting1746 IF ( vnest_init ) CALL vnest_deallocate1747 #endif1748 1749 1685 IF ( myid == 0 ) CALL finish_progress_bar 1750 1686
Note: See TracChangeset
for help on using the changeset viewer.