add new layouts

rem1776 · Aug 11, 2023 · 7f081d5 · 7f081d5
1 parent ae1146e
commit 7f081d5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 60 deletions.
diff --git a/configure.ac b/configure.ac
@@ -110,15 +110,15 @@ AS_IF([test ${enable_8byte_int:-no} = yes],
   [enable_8byte_int=yes],
   [enable_8byte_int=no])
 
-AC_ARG_ENABLE([scaling-tests],
-  [AS_HELP_STRING([--enable-scaling-tests],
+AC_ARG_ENABLE([large-tests],
+  [AS_HELP_STRING([--enable-large-tests],
     [Enables larger core counts for unit tests. (Default no)])])
-AS_IF([test ${enable_scaling_tests:-no} = yes],
-  [enable_scaling_tests=yes],
-  [enable_scaling_tests=no])
-AS_IF([test "x$enable_scaling_tests" != "xno"],
-        [ AM_CONDITIONAL([DO_SCALING_TESTS], true)],
-        [ AM_CONDITIONAL([DO_SCALING_TESTS], false)])
+AS_IF([test ${enable_large_tests:-no} = yes],
+  [enable_large_tests=yes],
+  [enable_large_tests=no])
+AS_IF([test "x$enable_large_tests" != "xno"],
+        [ AM_CONDITIONAL([DO_LARGE_TESTS], true)],
+        [ AM_CONDITIONAL([DO_LARGE_TESTS], false)])
 
 # user enabled testing with input files
 AC_MSG_CHECKING([whether to enable tests with input files])

diff --git a/mpp/include/mpp_domains_define.inc b/mpp/include/mpp_domains_define.inc
@@ -7425,6 +7425,7 @@ if ( is == ie ) then      ! x-alignment
  else if ( is == ieg ) then
     alignment = EAST
  else
+    print *, 'asdfg',  'is', is, 'ie', ie, 'isg', isg, 'ieg', ieg
     call mpp_error(FATAL, 'mpp_domains_define.inc: The contact region is not on the x-boundary of the tile')
  end if
  if ( js > je ) then

diff --git a/test_fms/diag_manager/Makefile.am b/test_fms/diag_manager/Makefile.am
@@ -35,33 +35,6 @@ test_diag_manager_SOURCES = test_diag_manager.F90
 test_diag_manager_time_SOURCES = test_diag_manager_time.F90
 test_diag_update_buffer_SOURCES= test_diag_update_buffer.F90
 
-if DO_SCALING_TESTS
- TESTS_ENVIRONMENT= TEST_DIAG_MANAGER2_1_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_2_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_3_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_4_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_5_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_6_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_7_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_8_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_9_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_10_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_11_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_12_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_13_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_14_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_15_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_16_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_17_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_18_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_19_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_20_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_21_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_22_RANKS=1028 \
-                    TEST_DIAG_MANAGER2_23_RANKS=1028
-endif
-
-
 TEST_EXTENSIONS = .sh
 SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
                   $(abs_top_srcdir)/test_fms/tap-driver.sh

diff --git a/test_fms/fms2_io/Makefile.am b/test_fms/fms2_io/Makefile.am
@@ -68,17 +68,8 @@ 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_SCALING_TESTS
- TESTS_ENVIRONMENT+= TEST_FMS2_IO_1_RANKS=768 \
-                     TEST_ATMOSPHERE_IO_1_RANKS=600 \
-                     TEST_ATMOSPHERE_IO_2_RANKS=600 \
-                     TEST_ATMOSPHERE_IO_3_RANKS=600 \
-                     TEST_BC_RESTART_1_RANKS=1600 \
-                     TEST_BC_RESTART_2_RANKS=1600 \
-                     TEST_BC_RESTART_3_RANKS=1600 \
-                     TEST_GLOBAL_ATT_1_RANKS=100 \
-                     TEST_IO_WITH_MASK_1_RANKS=500 \
-                     TEST_READ_ASCII_FILE_1_RANKS=600
+if DO_LARGE_TESTS
+ TESTS_ENVIRONMENT+= TEST_FMS2_IO_1_RANKS=2880
 endif
 
 if SKIP_NCDUMP_CHECKS

diff --git a/test_fms/fms2_io/test_fms2_io.F90 b/test_fms/fms2_io/test_fms2_io.F90
@@ -97,11 +97,6 @@ program main
 npes_group = 1
 debug = .true.
 
-! using large test option
-if ( npes .eq. 768) then
-    nx = nx * 10; ny = ny * 10; nz = nz * 10
-    io_layout = (/ 1, 64/)
-endif
 
 !Parse command line arguments.
 call get_argument(parser, "-t",  buf)
@@ -149,11 +144,17 @@ program main
 call mpp_domains_init()
 do i = 1,ntiles
   global_indices(:, i) = (/1, nx, 1, ny/)
-  layout(:, i) = (/2, npes/ntiles/2 /)
+  layout(:, i) = (/12 , npes/ntiles/16 /)
   pe_start(i) = (i-1)*(npes/ntiles)
   pe_end(i) = i*(npes/ntiles) - 1
 enddo
-ocn_layout = (/1, npes/)
+ocn_layout = (/12, 36/)
+
+! using large test option
+if ( npes .eq. 2880) then
+    nx = 1080; ny = 1080; nz = 10 
+    io_layout = (/ 6, 3/)
+endif
 
 call fms2_io_init()
 !Run tests.

diff --git a/test_fms/mpp/Makefile.am b/test_fms/mpp/Makefile.am
@@ -25,13 +25,6 @@ AM_CPPFLAGS = -I${top_srcdir}/include -I$(MODDIR)
 # Link to the FMS library.
 LDADD = ${top_builddir}/libFMS/libFMS.la
 
-if DO_SCALING_TESTS
- TESTS_ENVIRONMENT= TEST_MPP_DOMAINS2_2_RANKS=1028  \
-                    TEST_MPP_ALLTOALL_1_RANKS=64  \
-                    TEST_MPP_BROADCAST_1_RANKS=1028 \
-                    TEST_MPP2_1_RANKS=128
-endif
-
 # Build these test programs.
 check_PROGRAMS = test_mpp \
   test_super_grid \