Commit 5e132e71 authored by Keith Bennett's avatar Keith Bennett

Merge branch 'keith/bugfixes'

parents 30c1771d 30303324
......@@ -18,6 +18,20 @@ PROGRAM check_mpi_version
PRINT*, 'OpenMPI 1.10.1 detected. This contains a serious bug and ', &
'should not be used.'
STOP 1
ELSE IF (OMPI_MAJOR_VERSION == 2 .AND. OMPI_MINOR_VERSION == 1 &
.AND. OMPI_RELEASE_VERSION == 1) THEN
PRINT*, '*** ERROR ***'
PRINT*, 'OpenMPI 2.1.1 detected. This contains a serious bug and ', &
'should not be used.'
STOP 1
ELSE IF (OMPI_MAJOR_VERSION == 2 .AND. OMPI_MINOR_VERSION == 1 &
.AND. OMPI_RELEASE_VERSION == 2) THEN
PRINT*, '*** ERROR ***'
PRINT*, 'OpenMPI 2.1.2 detected. This contains a serious bug and ', &
'should not be used.'
STOP 1
END IF
END PROGRAM check_mpi_version
......@@ -646,6 +646,8 @@ CONTAINS
var%time = 0
var%time_increment = 0
var%padding = 0
var%id = ''
var%name = ''
END SUBROUTINE initialise_block_type
......
......@@ -917,7 +917,7 @@ CONTAINS
REAL(r4), DIMENSION(:), INTENT(IN), OPTIONAL :: dim_mults
INTEGER, INTENT(IN), OPTIONAL :: geometry, rank_write
REAL(r4), DIMENSION(:), ALLOCATABLE :: r4array
INTEGER :: i, errcode, intn
INTEGER :: errcode, intn
TYPE(sdf_block_type), POINTER :: b
LOGICAL :: convert
......@@ -1018,7 +1018,7 @@ CONTAINS
REAL(r4), DIMENSION(:), INTENT(IN), OPTIONAL :: dim_mults
INTEGER, INTENT(IN), OPTIONAL :: geometry, rank_write
REAL(r4), DIMENSION(:), ALLOCATABLE :: r4array
INTEGER :: i, errcode, intn
INTEGER :: errcode, intn
TYPE(sdf_block_type), POINTER :: b
LOGICAL :: convert
......
......@@ -917,7 +917,7 @@ CONTAINS
REAL(r8), DIMENSION(:), INTENT(IN), OPTIONAL :: dim_mults
INTEGER, INTENT(IN), OPTIONAL :: geometry, rank_write
REAL(r4), DIMENSION(:), ALLOCATABLE :: r4array
INTEGER :: i, errcode, intn
INTEGER :: errcode, intn
TYPE(sdf_block_type), POINTER :: b
LOGICAL :: convert
......@@ -1018,7 +1018,7 @@ CONTAINS
REAL(r8), DIMENSION(:), INTENT(IN), OPTIONAL :: dim_mults
INTEGER, INTENT(IN), OPTIONAL :: geometry, rank_write
REAL(r4), DIMENSION(:), ALLOCATABLE :: r4array
INTEGER :: i, errcode, intn
INTEGER :: errcode, intn
TYPE(sdf_block_type), POINTER :: b
LOGICAL :: convert
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment