Changeset 1350 for XIOS/dev/branch_openmp/src
- Timestamp:
- 11/30/17 12:35:59 (7 years ago)
- Location:
- XIOS/dev/branch_openmp/src/test
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_openmp/src/test/test_unstruct_complete.f90
r954 r1350 44 44 DOUBLE PRECISION,ALLOCATABLE :: field_A_compressed(:,:) 45 45 46 CALL MPI_INIT(ierr) 47 CALL init_wait 48 46 49 CALL xios_initialize(id,return_comm=comm) 47 50 CALL MPI_COMM_RANK(comm,mpi_rank,ierr) 48 51 CALL MPI_COMM_SIZE(comm,mpi_size,ierr) 49 52 50 CALL init_wait53 51 54 52 55 ncell_glo=0 … … 207 210 CALL xios_set_domain_attr("domain_srf", lonvalue_1D=lon, latvalue_1D=lat) 208 211 CALL xios_set_domain_attr("domain_srf", nvertex=4, bounds_lon_1D=bounds_lon, bounds_lat_1D=bounds_lat) 209 !CALL xios_set_compute_connectivity_domain_attr("compute", n_neighbor=n_local, local_neighbor=local_neighbor)212 CALL xios_set_compute_connectivity_domain_attr("compute", n_neighbor=n_local, local_neighbor=local_neighbor) 210 213 211 214 … … 248 251 DEALLOCATE(data_i_index) 249 252 253 CALL xios_finalize() 250 254 CALL MPI_COMM_FREE(comm, ierr) 251 252 CALL xios_finalize()255 256 CALL MPI_FINALIZE(ierr) 253 257 254 258 CONTAINS -
XIOS/dev/branch_openmp/src/test/test_unstruct_omp.f90
r1209 r1350 1 PROGRAM test_unstruct_ omp1 PROGRAM test_unstruct_complete_omp 2 2 3 3 USE xios 4 4 USE mod_wait 5 use omp_lib6 5 IMPLICIT NONE 7 6 INCLUDE "mpif.h" … … 41 40 INTEGER :: list_ind(nlon,nlat) 42 41 INTEGER :: rank,j1,j2,np,ncell_x 43 INTEGER :: data_n_index , provided42 INTEGER :: data_n_index 44 43 INTEGER,ALLOCATABLE :: data_i_index(:) 45 44 DOUBLE PRECISION,ALLOCATABLE :: field_A_compressed(:,:) 45 INTEGER :: provided 46 46 47 47 CALL MPI_INIT_THREAD(3, provided, ierr) … … 50 50 call MPI_Abort() 51 51 endif 52 53 52 54 CALL init_wait 53 CALL MPI_COMM_RANK(MPI_COMM_WORLD,mpi_rank,ierr) 54 CALL MPI_COMM_SIZE(MPI_COMM_WORLD,mpi_size,ierr) 55 if(mpi_rank < mpi_size-2) then 56 57 !$omp parallel default(firstprivate) firstprivate(dtime) 55 56 CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr) 57 CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size_loc,ierr) 58 if(rank < size_loc-2) then 58 59 59 60 CALL xios_initialize(id,return_comm=comm) … … 61 62 CALL MPI_COMM_SIZE(comm,mpi_size,ierr) 62 63 63 mpi_rank = mpi_rank*omp_get_num_threads() + omp_get_thread_num()64 mpi_size = mpi_size*omp_get_num_threads()65 64 66 65 … … 79 78 ALLOCATE(field_A_glo(ncell_glo,llm)) 80 79 ALLOCATE(mask_glo(ncell_glo)) 81 82 lon_glo(:) = 083 lat_glo(:) = 084 bounds_lon_glo(:,:) = 085 bounds_lat_glo(:,:) = 086 i_index_glo(:) = 087 field_A_glo(:,:) = 088 mask_glo(:) = 089 80 90 81 ind=0 … … 189 180 ALLOCATE(mask(ncell)) 190 181 ALLOCATE(n_local(ncell)) 191 192 i_index(:)=0193 lon(:)=0194 lat(:)=0195 bounds_lon(:,:)=0196 bounds_lat(:,:)=0197 field_A_srf(:,:)=0198 mask(:)=0199 n_local(:)=0200 201 182 ncell=0 202 183 data_n_index=0 … … 221 202 ALLOCATE(field_A_compressed(data_n_index,llm)) 222 203 ALLOCATE(data_i_index(data_n_index)) 223 field_A_compressed(:,:)=0224 data_i_index(:)=0225 226 227 204 data_n_index=0 228 205 DO ind=1,ncell … … 256 233 CALL xios_close_context_definition() 257 234 258 !CALL xios_get_compute_connectivity_domain_attr("compute", n_neighbor_max=nbMax)259 !ALLOCATE(local_neighbor(nbMax,ncell))260 !CALL xios_get_compute_connectivity_domain_attr("compute", n_neighbor=n_local, local_neighbor=local_neighbor)235 CALL xios_get_compute_connectivity_domain_attr("compute", n_neighbor_max=nbMax) 236 ALLOCATE(local_neighbor(nbMax,ncell)) 237 CALL xios_get_compute_connectivity_domain_attr("compute", n_neighbor=n_local, local_neighbor=local_neighbor) 261 238 262 239 DO ts=1,24*10 … … 284 261 DEALLOCATE(field_A_compressed) 285 262 DEALLOCATE(data_i_index) 286 !DEALLOCATE(local_neighbor)287 263 288 289 264 CALL xios_finalize() 290 291 print *, mpi_rank, "Client : xios_finalize " 292 293 !$omp barrier 294 295 !$omp master 296 CALL MPI_COMM_FREE(comm, ierr) 297 !$omp end master 298 299 !$omp barrier 300 301 !$omp end parallel 265 print*, "xios finalize OK", rank, size_loc 266 267 !$omp master 268 !call MPI_Barrier(comm) 269 CALL MPI_COMM_FREE(comm, ierr) 270 !$omp end master 271 272 !$omp barrier 273 274 !$omp end parallel 302 275 303 276 … … 307 280 print *, "Server : xios_finalize " 308 281 309 endif 310 282 endif 283 284 CALL MPI_FINALIZE(ierr) 311 285 312 286 CONTAINS … … 388 362 END SUBROUTINE MSE_XIOS_GAUSS_GRID 389 363 390 END PROGRAM test_unstruct_ omp391 392 393 394 395 364 END PROGRAM test_unstruct_complete_omp 365 366 367 368 369
Note: See TracChangeset
for help on using the changeset viewer.