Changeset 86 for palm/trunk
- Timestamp:
- May 16, 2007 4:00:18 PM (18 years ago)
- Location:
- palm/trunk
- Files:
-
- 5 edited
-
INSTALL/example_rc (modified) (1 diff)
-
SCRIPTS/.mrun.config.default (modified) (2 diffs)
-
SOURCE/CURRENT_MODIFICATIONS (modified) (1 diff)
-
SOURCE/data_output_dvrp.f90 (modified) (15 diffs)
-
SOURCE/user_interface.f90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/INSTALL/example_rc
r83 r86 1 1 2 2 ************************* ---------------------------- 3 * PALM 3.2a Rev: 8 2M* 3D - run without 1D - prerun3 * PALM 3.2a Rev: 83 * 3D - run without 1D - prerun 4 4 ************************* ---------------------------- 5 5 -
palm/trunk/SCRIPTS/.mrun.config.default
r83 r86 21 21 %host_identifier breg*-en0 ibmb 22 22 %host_identifier berni*-en0 ibmb 23 %host_identifier tgg* lctit 23 24 # 24 25 #%remote_username <replace by your linux cluster username> lcmuk parallel … … 44 45 %fopts -axW:-cpp:-g:-CB:-inline_debug_info:-r8:-nbs:-convert:little:endian lcmuk trace 45 46 %lopts -axW:-cpp:-g:-CB:-inline_debug_info:-r8:-nbs:-Vaxlib lcmuk trace 47 # 48 #%remote_username <replace by your tsubame username> lctit parallel 49 #%tmp_user_catalog <replace by your user_catalog> lctit parallel 50 #%tmp_data_catalog <replace by your data_catalog> lctit parallel 51 %cpp_options -Mpreprocess:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf lctit parallel 52 %netcdf_inc -I:/home2/usr5/mkanda/netcdf-3.6.2/include lctit parallel 53 %netcdf_lib -L/home2/usr5/mkanda/netcdf-3.6.2/lib:-lnetcdf lctit parallel 54 %compiler_name_ser pgf95 lctit parallel 55 %compiler_name mpif90 lctit parallel 56 %fopts -r8:-fast:-fastsse lctit parallel 57 %lopts -r8:-fast:-fastsse lctit parallel 46 58 # 47 59 #%remote_username <replace by your HLRN username> ibmh parallel -
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r85 r86 12 12 Errors: 13 13 ------ 14 Bugfix: work_fft*_vec removed from some PRIVATE-declarations (poisfft .f90).14 Bugfix: work_fft*_vec removed from some PRIVATE-declarations (poisfft). 15 15 16 poisfft 16 Bugfix: field_chr renamed field_char (user_interface). 17 18 poisfft, user_interface -
palm/trunk/SOURCE/data_output_dvrp.f90
r83 r86 32 32 ! Actual revisions: 33 33 ! ----------------- 34 ! TEST: different colours for isosurfaces 34 35 ! TEST: write statements 35 36 ! … … 103 104 !-- Set lock to avoid recursive calls of DVRP_STEERING_UPDATE 104 105 lock_steering_update = .TRUE. 105 106 106 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: vor steering_update' 107 ! CALL local_flush( 9 ) 107 108 CALL DVRP_STEERING_UPDATE( m-1, data_output_dvrp ) 108 109 109 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: nach steering_update' 110 ! CALL local_flush( 9 ) 110 111 lock_steering_update = .FALSE. 111 112 ENDIF … … 139 140 !-- Select the plot mode (in case of isosurface or slicer only if user has 140 141 !-- defined a variable which shall be plotted; otherwise do nothing) 141 IF ( mode_dvrp(m)(1:9) == 'particles' .AND. particle_advection ) THEN 142 143 WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang particles' 144 CALL local_flush( 9 ) 142 IF ( mode_dvrp(m)(1:9) == 'particles' .AND. particle_advection .AND. & 143 simulated_time >= particle_advection_start ) THEN 144 145 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang particles' 146 ! CALL local_flush( 9 ) 145 147 ! 146 148 !-- DVRP-Calls for plotting particles: … … 169 171 ! 170 172 !-- Particles have a tail 171 172 173 173 ! WRITE (9,*) '--- before ALLOCATE simtime=',simulated_time,' #of_tails=', number_of_tails, & 174 ! ' max#of_tp=', maximum_number_of_tailpoints 175 ! CALL local_flush( 9 ) 174 176 ALLOCATE( psize(number_of_tails), p_t(number_of_tails), & 175 177 p_c(number_of_tails*maximum_number_of_tailpoints), & … … 177 179 p_y(number_of_tails*maximum_number_of_tailpoints), & 178 180 p_z(number_of_tails*maximum_number_of_tailpoints) ) 179 180 181 ! WRITE (9,*) '--- after ALLOCATE' 182 ! CALL local_flush( 9 ) 181 183 psize = 0.0; p_t = 0; p_c = 0.0; p_x = 0.0; p_y = 0.0 182 184 p_z = 0.0; … … 187 189 IF ( nn /= 0 ) THEN 188 190 k = k + 1 189 190 191 192 191 ! IF ( simulated_time > 1338.0 ) THEN 192 ! WRITE (9,*) '--- particle ',n,' tail_id=',nn,' #of_tp=',particles(n)%tailpoints 193 ! CALL local_flush( 9 ) 194 ! ENDIF 193 195 DO j = 1, particles(n)%tailpoints 194 196 i = i + 1 … … 200 202 superelevation 201 203 p_c(i) = particle_tail_coordinates(j,4,nn) 202 203 204 205 206 204 ! IF ( simulated_time > 1338.0 ) THEN 205 ! WRITE (9,*) '--- tp= ',i,' x=',p_x(i),' y=',p_y(i), & 206 ! ' z=',p_z(i),' c=',p_c(i) 207 ! CALL local_flush( 9 ) 208 ! ENDIF 207 209 ENDDO 208 210 psize(k) = particles(n)%dvrp_psize 209 211 p_t(k) = particles(n)%tailpoints - 1 210 211 212 213 212 ! IF ( simulated_time > 1338.0 ) THEN 213 ! WRITE (9,*) '--- t= ',k,' psize=',psize(k),' p_t=',p_t(k) 214 ! CALL local_flush( 9 ) 215 ! ENDIF 214 216 ENDIF 215 217 ENDDO 216 217 218 ! WRITE (9,*) '--- after locally storing the particle attributes' 219 ! CALL local_flush( 9 ) 218 220 ENDIF 219 221 … … 238 240 3, psize, p_c, p_t ) 239 241 ELSE 240 241 242 ! WRITE (9,*) '--- before DVRP_PARTICLES' 243 ! CALL local_flush( 9 ) 242 244 CALL DVRP_PARTICLES( m-1, number_of_tails, p_x, p_y, p_z, 15, & 243 245 psize, p_c, p_t ) 244 245 246 247 248 249 250 251 252 253 254 246 ! WRITE (9,*) '--- after DVRP_PARTICLES' 247 ! WRITE (9,*) 'm-1 = ',m-1 248 ! WRITE (9,*) 'number_of_tails=', number_of_tails 249 ! WRITE (9,*) 'p_x =', p_x 250 ! WRITE (9,*) 'p_y =', p_y 251 ! WRITE (9,*) 'p_z =', p_z 252 ! WRITE (9,*) 'psize =', psize 253 ! WRITE (9,*) 'p_c =', p_c 254 ! WRITE (9,*) 'p_t =', p_t 255 256 ! CALL local_flush( 9 ) 255 257 ENDIF 256 258 ENDIF 257 259 258 260 CALL DVRP_VISUALIZE( m-1, 3, dvrp_filecount ) 259 260 261 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende particles' 262 ! CALL local_flush( 9 ) 261 263 262 264 DEALLOCATE( psize, p_c, p_t, p_x, p_y, p_z ) … … 313 315 DO k = nzb, nz_do3d 314 316 local_pf(i,j,k) = w(k,j,i) 317 ENDDO 318 ENDDO 319 ENDDO 320 DO k = nzb, nz_do3d 321 DO j = nys+1, nyn 322 DO i = nxl, nxr+1 323 local_pf(i,j,k) = 0.25 * local_pf(i,j-1,k) + & 324 0.50 * local_pf(i,j,k) + & 325 0.25 * local_pf(i,j+1,k) 315 326 ENDDO 316 327 ENDDO … … 407 418 IF ( mode_dvrp(m)(1:10) == 'isosurface' ) THEN 408 419 409 410 420 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang isosurface' 421 ! CALL local_flush( 9 ) 411 422 ! 412 423 !-- DVRP-Calls for plotting isosurfaces: … … 417 428 !-- Preliminary settings for w! 418 429 IF ( output_variable == 'w' ) THEN 419 CALL DVRP_MATERIAL_RGB( m-1, 1, 0.3, 0.8, 0.3, 0.0 ) 430 IF ( tv == 1 ) THEN 431 CALL DVRP_MATERIAL_RGB( m-1, 1, 0.8, 0.1, 0.1, 0.0 ) 432 ELSE 433 CALL DVRP_MATERIAL_RGB( m-1, 1, 0.1, 0.1, 0.8, 0.0 ) 434 ENDIF 420 435 ELSE 421 436 CALL DVRP_MATERIAL_RGB( m-1, 1, 0.9, 0.9, 0.9, 0.0 ) … … 428 443 CALL DVRP_THRESHOLD( m-1, threshold(tv) ) 429 444 CALL DVRP_VISUALIZE( m-1, 1, dvrp_filecount ) 430 431 445 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende isosurface' 446 ! CALL local_flush( 9 ) 432 447 433 448 CALL cpu_log( log_point_s(26), 'dvrp_isosurface', 'stop' ) … … 435 450 ELSEIF ( mode_dvrp(m)(1:6) == 'slicer' ) THEN 436 451 437 438 452 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang slicer' 453 ! CALL local_flush( 9 ) 439 454 ! 440 455 !-- DVRP-Calls for plotting slicers: … … 465 480 CALL cpu_log( log_point_s(27), 'dvrp_slicer', 'stop' ) 466 481 467 468 482 ! WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende slicer' 483 ! CALL local_flush( 9 ) 469 484 ENDIF 470 485 … … 480 495 481 496 CALL cpu_log( log_point(27), 'data_output_dvrp', 'stop' ) 482 483 497 ! WRITE ( 9, * ) '*** myid=', myid, ' Ende data_output_dvrp' 498 ! CALL local_flush( 9 ) 484 499 485 500 #endif -
palm/trunk/SOURCE/user_interface.f90
r77 r86 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: field_chr renamed field_char 7 7 ! 8 8 ! Former revisions: … … 163 163 ! 164 164 ! IF ( initializing_actions == 'read_restart_data' ) THEN 165 ! READ ( 13 ) field_ch r166 ! DO WHILE ( TRIM( field_ch r ) /= '*** end user ***' )167 ! 168 ! SELECT CASE ( TRIM( field_ch r ) )165 ! READ ( 13 ) field_char 166 ! DO WHILE ( TRIM( field_char ) /= '*** end user ***' ) 167 ! 168 ! SELECT CASE ( TRIM( field_char ) ) 169 169 ! 170 170 ! CASE ( 'u2_av' ) … … 174 174 ! CASE DEFAULT 175 175 ! PRINT*, '+++ user_init: unknown variable named "', & 176 ! TRIM( field_ch r ), '" found in'176 ! TRIM( field_char ), '" found in' 177 177 ! PRINT*, ' data from prior run on PE ', myid 178 178 ! CALL local_stop … … 180 180 ! END SELECT 181 181 ! 182 ! READ ( 13 ) field_ch r182 ! READ ( 13 ) field_char 183 183 ! 184 184 ! ENDDO
Note: See TracChangeset
for help on using the changeset viewer.
