making sure CMakelist.f90 and simulation.f90

match their corresponding files in the develop
branch.
This commit is contained in:
Jose Salcedo Perez 2018-05-28 18:13:59 +00:00
parent 6a53e61c96
commit 9857f46231
2 changed files with 9 additions and 9 deletions

View file

@ -110,12 +110,12 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
endif()
# GCC compiler options
list(APPEND f90flags -cpp -std=f2008ts -fbacktrace -O2 -fstack-arrays -g)
list(APPEND f90flags -cpp -std=f2008ts -fbacktrace -O2 -fstack-arrays)
if(debug)
list(REMOVE_ITEM f90flags -O2 -fstack-arrays)
list(APPEND f90flags -g -Wall -Wno-unused-dummy-argument -pedantic
-fbounds-check -ffpe-trap=invalid,overflow,underflow)
list(APPEND ldflags -g -v -da -Q)
list(APPEND ldflags -g)
endif()
if(profile)
list(APPEND f90flags -pg)

View file

@ -513,13 +513,13 @@ contains
! Create a new datatype that consists of all values for a given filter
! bin and then use that to broadcast. This is done to minimize the
! chance of the 'count' argument of MPI_BCAST exceeding 2**31
!n = size(results, 3)
!count_per_filter = size(results, 1) * size(results, 2)
!call MPI_TYPE_CONTIGUOUS(count_per_filter, MPI_DOUBLE, &
! result_block, mpi_err)
!call MPI_TYPE_COMMIT(result_block, mpi_err)
!call MPI_BCAST(results, n, result_block, 0, mpi_intracomm, mpi_err)
!call MPI_TYPE_FREE(result_block, mpi_err)
n = size(results, 3)
count_per_filter = size(results, 1) * size(results, 2)
call MPI_TYPE_CONTIGUOUS(count_per_filter, MPI_DOUBLE, &
result_block, mpi_err)
call MPI_TYPE_COMMIT(result_block, mpi_err)
call MPI_BCAST(results, n, result_block, 0, mpi_intracomm, mpi_err)
call MPI_TYPE_FREE(result_block, mpi_err)
end associate
end do
end if