Changeset 3294 for palm/trunk/SOURCE/flow_statistics.f90
- Timestamp:
- Oct 1, 2018 2:37:10 AM (6 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/flow_statistics.f90 (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/flow_statistics.f90
r3274 r3294 25 25 ! ----------------- 26 26 ! $Id$ 27 ! ocean renamed ocean_mode 28 ! 29 ! 3274 2018-09-24 15:42:55Z knoop 27 30 ! Modularization of all bulk cloud physics code components 28 31 ! … … 296 299 dt_3d, humidity, initializing_actions, land_surface, & 297 300 large_scale_forcing, large_scale_subsidence, max_pr_user, & 298 message_string, neutral, ocean , passive_scalar, simulated_time,&299 simulated_time _at_begin, use_subsidence_tendencies,&300 use_su rface_fluxes, use_top_fluxes, ws_scheme_mom,&301 ws_scheme_ sca301 message_string, neutral, ocean_mode, passive_scalar, & 302 simulated_time, simulated_time_at_begin, & 303 use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, & 304 ws_scheme_mom, ws_scheme_sca 302 305 303 306 USE cpulog, & … … 432 435 !-- According to the Neumann bc for the horizontal velocity components, 433 436 !-- the corresponding fluxes has to satisfiy the same bc. 434 IF ( ocean ) THEN437 IF ( ocean_mode ) THEN 435 438 sums_us2_ws_l(nzt+1,:) = sums_us2_ws_l(nzt,:) 436 439 sums_vs2_ws_l(nzt+1,:) = sums_vs2_ws_l(nzt,:) … … 459 462 sums_l(:,17,i) = sums_wspts_ws_l(:,i) & 460 463 * heatflux_output_conversion ! w*pt* 461 IF ( ocean 464 IF ( ocean_mode ) sums_l(:,66,i) = sums_wssas_ws_l(:,i) ! w*sa* 462 465 IF ( humidity ) sums_l(:,49,i) = sums_wsqs_ws_l(:,i) & 463 466 * waterflux_output_conversion ! w*q* … … 490 493 ! 491 494 !-- Horizontally averaged profile of salinity 492 IF ( ocean ) THEN495 IF ( ocean_mode ) THEN 493 496 !$OMP DO 494 497 DO i = nxl, nxr … … 563 566 sums_l(:,2,0) = sums_l(:,2,0) + sums_l(:,2,i) 564 567 sums_l(:,4,0) = sums_l(:,4,0) + sums_l(:,4,i) 565 IF ( ocean ) THEN568 IF ( ocean_mode ) THEN 566 569 sums_l(:,23,0) = sums_l(:,23,0) + sums_l(:,23,i) 567 570 ENDIF … … 592 595 CALL MPI_ALLREDUCE( sums_l(nzb,4,0), sums(nzb,4), nzt+2-nzb, MPI_REAL, & 593 596 MPI_SUM, comm2d, ierr ) 594 IF ( ocean ) THEN597 IF ( ocean_mode ) THEN 595 598 IF ( collective_wait ) CALL MPI_BARRIER( comm2d, ierr ) 596 599 CALL MPI_ALLREDUCE( sums_l(nzb,23,0), sums(nzb,23), nzt+2-nzb, & … … 623 626 sums(:,2) = sums_l(:,2,0) 624 627 sums(:,4) = sums_l(:,4,0) 625 IF ( ocean ) sums(:,23) = sums_l(:,23,0)628 IF ( ocean_mode ) sums(:,23) = sums_l(:,23,0) 626 629 IF ( humidity ) THEN 627 630 sums(:,44) = sums_l(:,44,0) … … 648 651 ! 649 652 !-- Salinity 650 IF ( ocean ) THEN653 IF ( ocean_mode ) THEN 651 654 sums(:,23) = sums(:,23) / ngp_2dh_s_inner(:,sr) 652 655 hom(:,1,23,sr) = sums(:,23) ! sa … … 930 933 ! 931 934 !-- Salinity flux w"sa" 932 IF ( ocean ) THEN935 IF ( ocean_mode ) THEN 933 936 sums_l(k,65,tn) = sums_l(k,65,tn) & 934 937 - 0.5_wp * ( kh(k,j,i) + kh(k+1,j,i) )& … … 1000 1003 sums_l(k+ki,61,tn) = sums_l(k+ki,61,tn) + & 1001 1004 0.0_wp * rmask(j,i,sr) ! v"pt" 1002 IF ( ocean ) THEN1005 IF ( ocean_mode ) THEN 1003 1006 sums_l(k+ki,65,tn) = sums_l(k+ki,65,tn) + & 1004 1007 surf_def_h(l)%sasws(m) * rmask(j,i,sr) ! w"sa" … … 1053 1056 sums_l(nzb,61,tn) = sums_l(nzb,61,tn) + & 1054 1057 0.0_wp * rmask(j,i,sr) ! v"pt" 1055 IF ( ocean ) THEN1058 IF ( ocean_mode ) THEN 1056 1059 sums_l(nzb,65,tn) = sums_l(nzb,65,tn) + & 1057 1060 surf_lsm_h%sasws(m) * rmask(j,i,sr) ! w"sa" … … 1104 1107 sums_l(nzb,61,tn) = sums_l(nzb,61,tn) + & 1105 1108 0.0_wp * rmask(j,i,sr) ! v"pt" 1106 IF ( ocean ) THEN1109 IF ( ocean_mode ) THEN 1107 1110 sums_l(nzb,65,tn) = sums_l(nzb,65,tn) + & 1108 1111 surf_usm_h%sasws(m) * rmask(j,i,sr) ! w"sa" … … 1276 1279 0.0_wp * rmask(j,i,sr) ! v"pt" 1277 1280 1278 IF ( ocean ) THEN1281 IF ( ocean_mode ) THEN 1279 1282 sums_l(nzt,65,tn) = sums_l(nzt,65,tn) + & 1280 1283 surf_def_h(2)%sasws(m) * rmask(j,i,sr) ! w"sa" … … 1336 1339 !-- Salinity flux and density (density does not belong to here, 1337 1340 !-- but so far there is no other suitable place to calculate) 1338 IF ( ocean ) THEN1341 IF ( ocean_mode ) THEN 1339 1342 IF( .NOT. ws_scheme_sca .OR. sr /= 0 ) THEN 1340 1343 pts = 0.5_wp * ( sa(k,j,i) - hom(k,1,23,sr) + & … … 1562 1565 ! 1563 1566 !-- Density at top follows Neumann condition 1564 IF ( ocean ) THEN1567 IF ( ocean_mode ) THEN 1565 1568 sums_l(nzt+1,64,tn) = sums_l(nzt,64,tn) 1566 1569 sums_l(nzt+1,71,tn) = sums_l(nzt,71,tn) … … 2032 2035 first = .TRUE. 2033 2036 2034 IF ( ocean ) THEN2037 IF ( ocean_mode ) THEN 2035 2038 DO k = nzt, nzb+1, -1 2036 2039 IF ( first .AND. hom(k,1,18,sr) < -1.0E-8_wp ) THEN … … 2080 2083 dptdz_threshold = 0.2_wp / 100.0_wp 2081 2084 2082 IF ( ocean ) THEN2085 IF ( ocean_mode ) THEN 2083 2086 DO k = nzt+1, nzb+5, -1 2084 2087 IF ( dptdz(k) > dptdz_threshold .AND. &
Note: See TracChangeset
for help on using the changeset viewer.
