some mpp tests

rem1776 · Aug 16, 2023 · f783aa4 · f783aa4
1 parent 51ce301
commit f783aa4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am
@@ -71,7 +71,6 @@ TESTS = test_bc_restart.sh test_fms2_io.sh test_atmosphere_io.sh test_io_simple.
 
 TESTS_ENVIRONMENT= srcdir="$(abs_top_srcdir)" ncdump_skip=${skipflag}
 
-# conditional testing options, scaling by 100 * current ranks
 if DO_LARGE_TESTS
  TESTS_ENVIRONMENT+= TEST_FMS2_IO_1_RANKS=4608 \
                      TEST_IO_SIMPLE_1_RANKS=4608 \

diff --git a/test_fms/mpp/Makefile.am b/test_fms/mpp/Makefile.am
@@ -134,6 +134,16 @@ test_mpp_clock_begin_end_id_SOURCES=test_mpp_clock_begin_end_id.F90
 test_super_grid_SOURCES = test_super_grid.F90
 test_mpp_chksum_SOURCES = test_mpp_chksum.F90
 
+
+if DO_LARGE_TESTS
+ TESTS_ENVIRONMENT=TEST_MPP_BROADCAST_1_RANKS=4608 \
+                   TEST_MPP_CHKSUM_1_RANKS=4608 \
+                   TEST_MPP_CHKSUM_2_RANKS=4608 \
+                   TEST_MPP_CHKSUM_3_RANKS=4608 \
+                   TEST_MPP_GATSCAT_1_RANKS=4608
+endif
+
+
 # Run the test programs.
 TESTS = test_mpp_domains2.sh \
   test_redistribute_int.sh \

diff --git a/test_fms/mpp/test_mpp_alltoall.F90 b/test_fms/mpp/test_mpp_alltoall.F90
@@ -34,6 +34,7 @@
 
 program test_mpp_alltoall
 
+#ifndef _OPENMP
   use platform_mod
   use mpp_mod, only : mpp_init, mpp_init_test_requests_allocated, mpp_init_test_peset_allocated, mpp_error, FATAL
   use mpp_mod, only : mpp_pe, mpp_npes, mpp_alltoall
@@ -1654,4 +1655,5 @@ subroutine test_mpp_alltoallw_int8(npes)
 
   end subroutine test_mpp_alltoallw_int8
 
+#endif
 end program test_mpp_alltoall
diff --git a/test_fms/mpp/test_mpp_chksum.F90 b/test_fms/mpp/test_mpp_chksum.F90
@@ -68,7 +68,7 @@ subroutine test_chksum_int()
   out_unit = stdout()
 
   !> generate random arrays
-  length = 1024
+  length = 4608 
   allocate(rands(length), data8(length), data4(length), distData(length))
   call random_number(rands)
   do i = 1, length
@@ -102,12 +102,12 @@ subroutine test_chksum_int()
   end subroutine
 
   subroutine test_chksum_simple()
-    integer :: n2, m, n = 1048576
-    real, dimension(1024) :: a
+    integer :: n2, m, n = 4608*4608 
+    real, dimension(4608) :: a
     real, dimension(:), allocatable :: c
 
    if( modulo(n,npes).EQ.0 )then  !only set up for even division
-     n2 = 1024
+     n2 = 4608 
      a = 0.d0
      if( pe.EQ.root )call random_number(a(1:n2))