Skip to content

Commit ecba40d

Browse files
rem1776rem1776
authored andcommitted
fix mpi struct bug with gcc and remove mpp test
1 parent 18c7178 commit ecba40d

4 files changed

Lines changed: 2 additions & 161 deletions

File tree

offloading/metadata_transfer.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ subroutine fms_metadata_transfer_init(this, dtype)
126126
!lengths = (/1, 1, 1, ATTR_NAME_MAX_LENGTH, ATTR_VALUE_MAX_LENGTH/)
127127
lengths = (/1, 1, ATTR_NAME_MAX_LENGTH, ATTR_NAME_MAX_LENGTH, ATTR_VALUE_MAX_LENGTH/)
128128

129-
call MPI_Type_create_struct(5, lengths, displacements, types, mpi_id, ierror)
129+
call MPI_Type_create_struct(4, lengths, displacements, types, mpi_id, ierror)
130130
if(ierror /= MPI_SUCCESS) then
131131
call mpp_error(FATAL, "fms_metadata_transfer_init: MPI_Type_create_struct failed")
132132
end if

test_fms/offloading/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ AM_CPPFLAGS = -I${top_srcdir}/include -I$(MODDIR)
2929
LDADD = ${top_builddir}/libFMS/libFMS.la
3030

3131
# Build this test program.
32-
check_PROGRAMS = test_io_offloading test_mpp_redistribute test_metadata_transfer
32+
check_PROGRAMS = test_io_offloading test_metadata_transfer
3333

3434
# This is the source code for the test.
3535
test_io_offloading_SOURCES = test_io_offloading.F90
36-
test_mpp_redistribute_SOURCES = test_mpp_redistribute.F90
3736
test_metadata_transfer_SOURCES= test_metadata_transfer.F90
3837

3938
# Run the test program.

test_fms/offloading/test_io_offloading.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,4 @@ test_expect_success "test metadata transfer" '
3434
mpirun -n 4 ./test_metadata_transfer
3535
'
3636

37-
test_expect_success "test mpp redistribute" '
38-
mpirun -n 7 ./test_mpp_redistribute
39-
'
40-
4137
test_done

test_fms/offloading/test_mpp_redistribute.F90

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)