Changeset 2938 for palm/trunk/SOURCE/turbulence_closure_mod.f90
- Timestamp:
- Mar 27, 2018 3:52:42 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/turbulence_closure_mod.f90
r2918 r2938 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Further todo's 28 ! 29 ! 2936 2018-03-27 14:49:27Z suehring 27 30 ! - defined l_grid only within this module 28 31 ! - Moved l_wall definition from modules.f90 … … 69 72 !> add OpenMP directives whereever possible 70 73 !> remove debug output variables (dummy1, dummy2, dummy3) 74 !> @todo Move initialization of wall-mixing length from init_grid 75 !> @todo Check for random disturbances 71 76 !> @note <Enter notes on the module> 72 77 !> @bug TKE-e closure still crashes due to too small dt … … 284 289 285 290 USE control_parameters, & 286 ONLY: message_string, neutral, turbulent_inflow, turbulent_outflow 291 ONLY: message_string, nest_domain, neutral, turbulent_inflow, & 292 turbulent_outflow 287 293 288 294 IMPLICIT NONE … … 302 308 rans_tke_e = .TRUE. 303 309 304 IF ( INDEX( initializing_actions, 'set_1d-model_profiles' ) 305 == 0) THEN310 IF ( INDEX( initializing_actions, 'set_1d-model_profiles' ) == 0 & 311 .AND. .NOT. nest_domain ) THEN 306 312 message_string = 'Initializing without 1D model while ' // & 307 313 'using TKE-e closure&' // & … … 826 832 ONLY: use_sgs_for_particles, wang_kernel 827 833 834 USE pmc_interface, & 835 ONLY: nested_run 836 828 837 IMPLICIT NONE 829 838 … … 847 856 ALLOCATE( e_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 848 857 #endif 849 858 ! 859 !-- Allocate arrays required for dissipation. 860 !-- Please note, if it is a nested run, arrays need to be allocated even if 861 !-- they do not necessarily need to be transferred, which is attributed to 862 !-- the design of the model coupler which allocates memory for each variable. 850 863 IF ( rans_tke_e .OR. use_sgs_for_particles .OR. wang_kernel .OR. & 851 collision_turbulence ) THEN864 collision_turbulence .OR. nested_run ) THEN 852 865 #if defined( __nopointer ) 853 866 ALLOCATE( diss(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) … … 858 871 #else 859 872 ALLOCATE( diss_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 860 IF ( rans_tke_e ) THEN873 IF ( rans_tke_e .OR. nested_run ) THEN 861 874 ALLOCATE( diss_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 862 875 ALLOCATE( diss_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) … … 871 884 872 885 IF ( rans_tke_e .OR. use_sgs_for_particles .OR. & 873 wang_kernel .OR. collision_turbulence ) THEN886 wang_kernel .OR. collision_turbulence .OR. nested_run ) THEN 874 887 diss => diss_1 875 IF ( rans_tke_e ) THEN888 IF ( rans_tke_e .OR. nested_run ) THEN 876 889 diss_p => diss_2; tdiss_m => diss_3 877 890 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.