Changeset 1239 for palm/trunk/SOURCE/time_integration.f90
- Timestamp:
- Oct 29, 2013 10:11:53 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/time_integration.f90
r1222 r1239 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! Generalize calc_mean_profile for wider use 23 ! Determine shf and qsws in dependence on data from LSF_DATA 24 ! Determine ug and vg in dependence on data from LSF_DATA 23 25 ! 24 26 ! Former revisions: … … 165 167 USE interaction_droplets_ptq_mod 166 168 USE interfaces 169 USE ls_forcing_mod 167 170 USE particle_attributes 168 171 USE pegrid … … 223 226 224 227 ! 228 !-- Determine ug, vg and w_subs in dependence on data from external file 229 !-- LSF_DATA 230 IF ( large_scale_forcing .AND. lsf_vert ) THEN 231 CALL ls_forcing_vert ( simulated_time ) 232 ENDIF 233 234 ! 225 235 !-- Execute the user-defined actions 226 236 CALL user_actions( 'before_timestep' ) … … 248 258 !-- buoyancy terms (WARNING: only the respective last call of 249 259 !-- calc_mean_profile defines the reference state!) 250 IF ( .NOT. neutral ) CALL calc_mean_profile( pt, 4 )251 IF ( ocean ) CALL calc_mean_profile( rho, 64 )252 IF ( humidity ) CALL calc_mean_profile( vpt, 44 )260 IF ( .NOT. neutral ) CALL calc_mean_profile( pt, 4, 'time_int' ) 261 IF ( ocean ) CALL calc_mean_profile( rho, 64, 'time_int' ) 262 IF ( humidity ) CALL calc_mean_profile( vpt, 44, 'time_int' ) 253 263 ENDIF 254 264 … … 566 576 CALL cpu_log( log_point(19), 'prandtl_fluxes', 'stop' ) 567 577 ENDIF 578 579 ! 580 !-- Determine shf and qsws in dependence on data from external file 581 !-- LSF_DATA 582 IF ( ( large_scale_forcing .AND. lsf_surf ) .AND. & 583 intermediate_timestep_count == intermediate_timestep_count_max )& 584 THEN 585 CALL ls_forcing_surf ( simulated_time ) 586 ENDIF 587 568 588 ! 569 589 !-- Compute the diffusion coefficients
Note: See TracChangeset
for help on using the changeset viewer.