Changeset 4855 for palm/trunk
- Timestamp:
- Jan 25, 2021 12:30:54 PM (4 years ago)
- Location:
- palm/trunk
- Files:
-
- 4 edited
-
SOURCE/global_min_max.f90 (modified) (3 diffs)
-
SOURCE/pres.f90 (modified) (3 diffs)
-
TESTS/cases/cbl_particle_nested/MONITORING/cbl_particle_nested_rc_N02.000 (modified) (4 diffs)
-
TESTS/cases/rans_tkee/MONITORING/rans_tkee_rc.000 (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/global_min_max.f90
r4828 r4855 23 23 ! ----------------- 24 24 ! $Id$ 25 ! bugfix for correct identification of indices of extreme values in case of non-cyclic 26 ! boundary conditions 27 ! 28 ! 4828 2021-01-05 11:21:41Z Giersch 25 29 ! preprocessor branch for ibm removed 26 30 ! … … 51 55 value1_ijk ) 52 56 57 58 USE control_parameters, & 59 ONLY: bc_lr, bc_ns 53 60 54 61 USE indices, & … … 388 395 389 396 ! 390 !-- Limit index values to the range 0..nx, 0..ny 391 IF ( value_ijk(3) < 0 ) value_ijk(3) = nx +1 + value_ijk(3) 392 IF ( value_ijk(3) > nx ) value_ijk(3) = value_ijk(3) - (nx+1) 393 IF ( value_ijk(2) < 0 ) value_ijk(2) = ny +1 + value_ijk(2) 394 IF ( value_ijk(2) > ny ) value_ijk(2) = value_ijk(2) - (ny+1) 397 !-- Limit index values to the range 0..nx, 0..ny. Non-cyclic setups may have extrema at the 398 !-- outer borders, which should be correctly identified. 399 IF ( bc_lr == 'cyclic' ) THEN 400 IF ( value_ijk(3) < 0 ) value_ijk(3) = nx +1 + value_ijk(3) 401 IF ( value_ijk(3) > nx ) value_ijk(3) = value_ijk(3) - (nx+1) 402 ENDIF 403 IF ( bc_ns == 'cyclic' ) THEN 404 IF ( value_ijk(2) < 0 ) value_ijk(2) = ny +1 + value_ijk(2) 405 IF ( value_ijk(2) > ny ) value_ijk(2) = value_ijk(2) - (ny+1) 406 ENDIF 395 407 396 408 END SUBROUTINE global_min_max -
palm/trunk/SOURCE/pres.f90
r4828 r4855 25 25 ! ----------------- 26 26 ! $Id$ 27 ! bugfix: mean w removal not applied to ghost points of the total domain in case of non-cyclic 28 ! setups 29 ! 30 ! 4828 2021-01-05 11:21:41Z Giersch 27 31 ! Bugfix in OpenMP directives - intel compiler do not allow reduction operations on array elements 28 32 ! … … 357 361 w_l(k) = w_l(k) / ngp_2dh_outer(k,0) 358 362 ENDDO 359 DO i = nxl g, nxrg360 DO j = nys g, nyng363 DO i = nxl, nxr 364 DO j = nys, nyn 361 365 DO k = nzb+1, nzt 362 366 w(k,j,i) = w(k,j,i) - w_l(k) & … … 365 369 ENDDO 366 370 ENDDO 371 ! 372 !-- Instead of running the above loop over ghost points, they are set via exchange_horiz, 373 !-- in order to correctly consider non-cyclic boundary conditions, where ghost boundaries 374 !-- of the total domain must not be set. Otherwise w may continuously increase/decrease 375 !-- at these points. 376 CALL exchange_horiz( w, nbgp ) 367 377 ENDIF 368 378 -
palm/trunk/TESTS/cases/cbl_particle_nested/MONITORING/cbl_particle_nested_rc_N02.000
r4832 r4855 1 1 2 2 ****************************** -------------------------------------------- 3 * PALM 6.0 Rev: 48 28M * atmosphere - nested run without 1D - prerun3 * PALM 6.0 Rev: 4853M * atmosphere - nested run without 1D - prerun 4 4 ****************************** -------------------------------------------- 5 5 6 Date: 2021-01- 05 Run: cbl_particle_nested__gfortran_defa7 Time: 1 6:37:42Run-No.: 006 Date: 2021-01-25 Run: cbl_particle_nested__gfortran_defa 7 Time: 10:23:44 Run-No.: 00 8 8 Run on host: gfortran_d 9 9 Number of PEs: 2 Processor grid (x,y): ( 1, 2) calculated … … 115 115 north/south: nested 116 116 117 use_cmax: T118 117 pt damping layer width = 0.00 m, pt damping factor = 0.0000 119 118 … … 216 215 Disturbances continued during the run from i/j = 10 to i/j = 29 217 216 Random number generator used : random-parallel 218 219 220 221 *** dynamic module disabled222 217 223 218 Particles: … … 259 254 RUN ITER. HH:MM:SS.SS DT(E) UMAX VMAX WMAX U* W* THETA* Z_I ENERG. DISTENERG DIVOLD DIVNEW UMAX(KJI) VMAX(KJI) WMAX(KJI) ADVECX ADVECY MGCYC 260 255 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 261 0 0 00:00:00.00 18.9000A 1.1899D 1.1775D 0.1181 0.000 0.00 0.000E+00 800. 0.923E+00 0.374E-02 0.481E-03 0.119E-03 17 2 30 19 37 14 9 36 370.000 0.000 2256 0 0 00:00:00.00 18.9000A 1.1899D 1.1775D 0.1181 0.000 0.00 0.000E+00 800. 0.923E+00 0.374E-02 0.481E-03 0.119E-03 17 2 30 19 -3 14 9 36 -3 0.000 0.000 2 262 257 0 1 00:00:18.90 0.3890A -57.8201 -55.8650 15.9007 0.329 0.00 -0.333E+00 0. 0.830E+01 0.179E+01 0.323E-01 0.516E-02 4 25 16 4 16 25 8 15 25 0.000 0.000 2 263 258 0 2 00:00:19.28 0.5580A -40.3509 -39.1933 -11.7860 0.208 0.00 -0.534E+00 25. 0.413E+01 0.110E+01 0.122E-02 0.354E-03 4 25 16 4 16 25 8 16 26 0.000 0.000 2 -
palm/trunk/TESTS/cases/rans_tkee/MONITORING/rans_tkee_rc.000
r4446 r4855 11 11 12 12 ****************************** -------------------------------------------- 13 * PALM 6.0 Rev: 4 325M * atmosphere - run with 1D - prerun13 * PALM 6.0 Rev: 4853M * atmosphere - run with 1D - prerun 14 14 ****************************** -------------------------------------------- 15 15 16 Date: 20 19-12-06Run: rans_tkee__gfortran_default__417 Time: 1 2:04:59Run-No.: 0016 Date: 2021-01-25 Run: rans_tkee__gfortran_default__4 17 Time: 10:54:23 Run-No.: 00 18 18 Run on host: gfortran_d 19 19 Number of PEs: 4 Processor grid (x,y): ( 2, 2) calculated … … 23 23 ----------------- 24 24 25 --> Use the TKE-e turbulence closure (RANS mode).25 --> Use the tke-e turbulence closure (RANS mode). 26 26 --> Use the boussinesq approximation for the model equations. 27 27 --> Solve perturbation pressure via multigrid method (w-cycle) … … 104 104 105 105 z_mo = 5.00 m z0 = 0.1000 m z0h = 0.10000 m kappa = 0.40 106 Rif value range: -20.00 <= rif<= 20.00106 zeta value range: -20.00 <= zeta <= 20.00 107 107 108 108 … … 111 111 north/south: cyclic 112 112 113 use_cmax: T114 113 pt damping layer width = 0.00 m, pt damping factor = 0.0000 115 114 … … 183 182 initial TKE is prescribed as 0.10E+00 (m/s)**2 184 183 TKE is not allowed to fall below 0.10E-02 (m/s)**2 185 Mixing length is limited to 1.80 * z184 Mixing length is limited close to surfaces 186 185 RANS-mode constants: c_0 = 0.55000 187 186 c_1 = 1.44000 … … 207 206 Dissipation calculation: prognostic 208 207 209 210 211 *** dynamic module disabled212 213 208 ------------------------------------------------------------------------------ 214 209 … … 220 215 RUN ITER. HH:MM:SS.SS DT(E) UMAX VMAX WMAX U* W* THETA* Z_I ENERG. DISTENERG DIVOLD DIVNEW UMAX(KJI) VMAX(KJI) WMAX(KJI) ADVECX ADVECY MGCYC 221 216 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 222 0 0 00:00:00.00 2.6700A 3.3592 0.8728 0.0000 0.127 0.00 0.000E+00 0. 0.442E+01 0.442E-02 0.000E+00 0.000E+00 20 29 29 6 29 29 0 29 290.000 0.000 0217 0 0 00:00:00.00 2.6700A 3.3592 0.8728 0.0000 0.127 0.00 0.000E+00 0. 0.442E+01 0.442E-02 0.000E+00 0.000E+00 20 29 -3 6 29 -3 0 29 -3 0.000 0.000 0 223 218 0 1 00:00:02.67 2.6600A 3.3803 1.5737 1.1399 0.151 0.00 -0.406E-02 10. 0.444E+01 0.438E-02 0.202E-03 0.796E-04 19 7 19 2 14 13 2 13 1 0.000 0.000 2 224 219 0 2 00:00:05.33 0.2280D 3.3829 1.4716 1.2668 0.147 0.00 -0.469E-02 10. 0.444E+01 0.432E-02 0.137E-03 0.456E-04 19 6 21 2 14 13 2 13 1 0.000 0.000 2 … … 227 222 0 5 00:00:06.84 1.0100D 3.3843 1.5249 1.3737 0.144 0.00 -0.512E-02 0. 0.444E+01 0.402E-02 0.452E-04 0.159E-04 19 5 25 2 17 0 2 13 1 0.000 0.000 2 228 223 0 6 00:00:07.85 1.2400D 3.3841 1.4999 1.3495 0.143 0.00 -0.530E-02 0. 0.444E+01 0.398E-02 0.517E-04 0.120E-04 19 2 28 2 17 0 2 13 1 0.000 0.000 2 229 0 7 00:00:09.09 1.2600D 3.3842 1.4757 1.3212 0.142 0.00 -0.556E-02 0. 0.444E+01 0.394E-02 0.640E-04 0.175E-04 19 0 02 17 0 2 13 1 0.000 0.000 2230 0 8 00:00:10.35 1.3100D 3.3839 1.4629 1.3041 0.141 0.00 -0.562E-02 0. 0.444E+01 0.387E-02 0.619E-04 0.163E-04 19 2 02 17 0 2 13 1 0.000 0.000 2231 0 9 00:00:11.66 1.4100D 3.3834 1.4516 1.2881 0.140 0.00 -0.568E-02 0. 0.444E+01 0.381E-02 0.558E-04 0.154E-04 19 1 02 17 0 2 13 1 0.000 0.000 2232 0 10 00:00:13.07 1.5400D 3.3829 1.4397 1.2708 0.138 0.00 -0.574E-02 0. 0.444E+01 0.376E-02 0.562E-04 0.168E-04 20 2 02 17 0 2 13 1 0.000 0.000 2233 0 11 00:00:14.61 1.7200D 3.3824 1.4277 1.2695 0.137 0.00 -0.587E-02 0. 0.444E+01 0.372E-02 0.579E-04 0.169E-04 20 2 02 17 0 1 12 2 0.000 0.000 2234 0 12 00:00:16.33 1.9600D 3.3819 1.4149 1.2710 0.136 0.00 -0.612E-02 0. 0.444E+01 0.368E-02 0.615E-04 0.179E-04 20 2 02 17 0 1 12 2 0.000 0.000 2235 0 13 00:00:18.29 2.2100D 3.3816 1.4009 1.2651 0.135 0.00 -0.607E-02 0. 0.444E+01 0.364E-02 0.662E-04 0.198E-04 20 2 02 17 0 1 12 2 0.000 0.000 2224 0 7 00:00:09.09 1.2600D 3.3842 1.4757 1.3212 0.142 0.00 -0.556E-02 0. 0.444E+01 0.394E-02 0.640E-04 0.175E-04 19 0 32 2 17 0 2 13 1 0.000 0.000 2 225 0 8 00:00:10.35 1.3100D 3.3839 1.4629 1.3041 0.141 0.00 -0.562E-02 0. 0.444E+01 0.387E-02 0.619E-04 0.163E-04 19 2 32 2 17 0 2 13 1 0.000 0.000 2 226 0 9 00:00:11.66 1.4100D 3.3834 1.4516 1.2881 0.140 0.00 -0.568E-02 0. 0.444E+01 0.381E-02 0.558E-04 0.154E-04 19 1 32 2 17 0 2 13 1 0.000 0.000 2 227 0 10 00:00:13.07 1.5400D 3.3829 1.4397 1.2708 0.138 0.00 -0.574E-02 0. 0.444E+01 0.376E-02 0.562E-04 0.168E-04 20 2 32 2 17 0 2 13 1 0.000 0.000 2 228 0 11 00:00:14.61 1.7200D 3.3824 1.4277 1.2695 0.137 0.00 -0.587E-02 0. 0.444E+01 0.372E-02 0.579E-04 0.169E-04 20 2 32 2 17 0 1 12 2 0.000 0.000 2 229 0 12 00:00:16.33 1.9600D 3.3819 1.4149 1.2710 0.136 0.00 -0.612E-02 0. 0.444E+01 0.368E-02 0.615E-04 0.179E-04 20 2 32 2 17 0 1 12 2 0.000 0.000 2 230 0 13 00:00:18.29 2.2100D 3.3816 1.4009 1.2651 0.135 0.00 -0.607E-02 0. 0.444E+01 0.364E-02 0.662E-04 0.198E-04 20 2 32 2 17 0 1 12 2 0.000 0.000 2 236 231 0 14 00:00:20.50 2.3200D 3.3814 1.3877 1.2533 0.134 0.00 -0.602E-02 0. 0.444E+01 0.359E-02 0.696E-04 0.214E-04 19 6 24 2 17 0 1 12 2 0.000 0.000 2 237 232 0 15 00:00:22.82 2.3300D 3.3814 1.3808 1.2421 0.133 0.00 -0.607E-02 0. 0.444E+01 0.355E-02 0.698E-04 0.221E-04 19 6 24 2 17 0 1 12 2 0.000 0.000 2
Note: See TracChangeset
for help on using the changeset viewer.
