Changeset 222 for palm/trunk/SOURCE
- Timestamp:
- Jan 12, 2009 4:04:16 PM (16 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r221 r222 12 12 13 13 User can check user parameters and deduce further quantities in user_check_parameters 14 15 Check that PALM is called with mrun -K parallel for coupling 14 16 15 17 check_for_restart, check_parameters, data_output_dvrp, init_dvrp, init_pegrid, local_stop, modules, package_parin, palm, surface_coupler, timestep, user_additional_routines … … 57 59 ------ 58 60 61 Bugfixes for nonparallel execution (check_for_restart, cpu_statistics, inflow_turbulence, init_coupling, timestep) 62 59 63 Size of pf3d adjusted to the required output size (1 gridpoint less, along 60 64 all three dimensions), because output of a subset of the data … … 78 82 Bugfix: abort in case that absolute temperature is below zero (init_cloud_physics) 79 83 80 advec_particles, c ombine_plot_fields, data_output_2d, header, init_cloud_physics, production_e, read_3d_binary84 advec_particles, check_for_restart, combine_plot_fields, cpu_statistics, data_output_2d, header, inflow_turbulence, init_cloud_physics, init_coupling, production_e, read_3d_binary, timestep -
palm/trunk/SOURCE/check_for_restart.f90
r206 r222 5 5 ! ----------------- 6 6 ! Implementation of an MPI-1 coupling: replaced myid with target_id 7 ! Bugfix for nonparallel execution 7 8 ! 8 9 ! Former revisions: … … 80 81 81 82 terminate_coupled = 3 83 #if defined( __parallel ) 82 84 CALL MPI_SENDRECV( terminate_coupled, 1, MPI_INTEGER, & 83 85 target_id, 0, & … … 85 87 target_id, 0, & 86 88 comm_inter, status, ierr ) 89 #endif 87 90 ENDIF 88 91 … … 125 128 terminate_coupled = 5 126 129 ENDIF 130 #if defined( __parallel ) 127 131 CALL MPI_SENDRECV( terminate_coupled, 1, MPI_INTEGER, & 128 132 target_id, 0, & … … 130 134 target_id, 0, & 131 135 comm_inter, status, ierr ) 136 #endif 132 137 ENDIF 133 138 ELSE -
palm/trunk/SOURCE/check_parameters.f90
r217 r222 8 8 ! Implementation of an MPI-1 coupling: replaced myid with target_id, 9 9 ! deleted __mpi2 directives 10 ! Check that PALM is called with mrun -K parallel for coupling 10 11 ! 11 12 ! Former revisions: … … 234 235 0 ) 235 236 ENDIF 237 #else 238 WRITE( message_string, * ) 'coupling requires PALM to be called with', & 239 ' ''mrun -K parallel''' 240 CALL handle_palm_message( 'check_parameters', 'PA0141', 1, 2, 0, 6, 0 ) 236 241 #endif 237 242 ENDIF -
palm/trunk/SOURCE/cpu_statistics.f90
r198 r222 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix for nonparallel execution 7 7 ! 8 8 ! Former revisions: … … 125 125 !-- Write cpu-times sorted by size 126 126 CALL check_open( 18 ) 127 #if defined( __parallel ) 127 128 WRITE ( 18, 100 ) TRIM( run_description_header ), & 128 129 numprocs * threads_per_task, pdims(1), pdims(2), & 129 130 threads_per_task 131 #else 132 WRITE ( 18, 100 ) TRIM( run_description_header ), & 133 numprocs * threads_per_task, 1, 1, & 134 threads_per_task 135 #endif 130 136 DO 131 137 ii = MAXLOC( sum ) -
palm/trunk/SOURCE/inflow_turbulence.f90
r198 r222 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix for nonparallel execution 7 7 ! 8 8 ! Former revisions: … … 92 92 i = recycling_plane 93 93 94 #if defined( __parallel ) 94 95 IF ( myidx == id_recycling ) THEN 95 96 … … 107 108 108 109 ENDIF 110 #else 111 DO j = nys-1, nyn+1 112 DO k = nzb, nzt+1 113 114 inflow_dist(k,j,1) = u(k,j,i+1) - avpr(k,1) 115 inflow_dist(k,j,2) = v(k,j,i) - avpr(k,2) 116 inflow_dist(k,j,3) = w(k,j,i) - avpr(k,3) 117 inflow_dist(k,j,4) = pt(k,j,i) - avpr(k,4) 118 inflow_dist(k,j,5) = e(k,j,i) - avpr(k,5) 119 120 ENDDO 121 ENDDO 122 #endif 109 123 110 124 ! -
palm/trunk/SOURCE/init_coupling.f90
r206 r222 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix for nonparallel execution 7 7 ! 8 8 ! Former revisions: … … 41 41 !-- In this case, distribute PEs to 2 new communicators. 42 42 !-- ATTENTION: numprocs will be reset according to the new communicators 43 #if defined ( __parallel ) 43 44 IF ( myid == 0 ) THEN 44 45 READ (*,*,ERR=10,END=10) coupling_mode, bc_data(1), bc_data(2) … … 108 109 ENDIF 109 110 #endif 111 #endif 110 112 111 113 IF ( coupling_mode == 'ocean_to_atmosphere' ) coupling_char = '_O' -
palm/trunk/SOURCE/timestep.f90
r206 r222 5 5 ! ----------------- 6 6 ! Implementation of a MPI-1 Coupling: replaced myid with target_id 7 ! Bugfix for nonparallel execution 7 8 ! 8 9 ! Former revisions: … … 216 217 !-- and its reason, provided the remote model has not already been 217 218 !-- informed of another termination reason (terminate_coupled > 0) before. 219 #if defined( __parallel ) 218 220 IF ( coupling_mode /= 'uncoupled' .AND. terminate_coupled == 0 ) THEN 219 221 terminate_coupled = 2 … … 223 225 comm_inter, status, ierr ) 224 226 ENDIF 225 227 #endif 226 228 ENDIF 227 229
Note: See TracChangeset
for help on using the changeset viewer.