From ecc1361680b4ade6a5db60a1e7ef024e944c8fac Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Tue, 20 Jun 2023 13:35:31 -0400
Subject: [PATCH] fix: ifort 2022.3.0 & greater ICE bug in alltoall test +
 missing input nmls in mpp scripts (#1158)

---
 test_fms/mpp/Makefile.am                        | 6 ++++++
 test_fms/mpp/test_clock_init.sh                 | 3 +++
 test_fms/mpp/test_global_arrays.sh              | 3 +++
 test_fms/mpp/test_mpp_alltoall.sh               | 3 +++
 test_fms/mpp/test_mpp_global_sum_ad.sh          | 3 +++
 test_fms/mpp/test_mpp_npes.sh                   | 3 +++
 test_fms/mpp/test_mpp_pe.sh                     | 2 ++
 test_fms/mpp/test_mpp_root_pe.sh                | 3 +++
 test_fms/mpp/test_mpp_sum.sh                    | 3 +++
 test_fms/mpp/test_mpp_transmit.sh               | 3 +++
 test_fms/mpp/test_stderr.sh                     | 3 +++
 test_fms/mpp/test_stdin.sh                      | 3 +++
 test_fms/mpp/test_stdout.sh                     | 3 +++
 test_fms/mpp/test_system_clock.sh               | 3 +++
 test_fms/mpp/test_update_domains_performance.sh | 4 ++++
 15 files changed, 48 insertions(+)

diff --git a/test_fms/mpp/Makefile.am b/test_fms/mpp/Makefile.am
index 66f12d9d1e..1d44b9bc93 100644
--- a/test_fms/mpp/Makefile.am
+++ b/test_fms/mpp/Makefile.am
@@ -134,6 +134,12 @@ 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
 
+# ifort gets a internal error during compilation for this test, issue #1071
+# we'll just remove the openmp flag if present since it doesn't use openmp at all
+test_mpp_alltoall.$(OBJEXT): FCFLAGS:=  $(filter-out -fopenmp,$(FCFLAGS))
+test_mpp_alltoall.$(OBJEXT): CPPFLAGS:= $(filter-out -fopenmp,$(CPPFLAGS))
+
+
 # Run the test programs.
 TESTS = test_mpp_domains2.sh \
   test_redistribute_int.sh \
diff --git a/test_fms/mpp/test_clock_init.sh b/test_fms/mpp/test_clock_init.sh
index 93b29c4172..7ce49da379 100755
--- a/test_fms/mpp/test_clock_init.sh
+++ b/test_fms/mpp/test_clock_init.sh
@@ -28,6 +28,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 test_expect_success "clock initialization" '
     mpirun -n 1 ./test_clock_init
 '
diff --git a/test_fms/mpp/test_global_arrays.sh b/test_fms/mpp/test_global_arrays.sh
index dc5cbce9ee..596d1ecb0a 100755
--- a/test_fms/mpp/test_global_arrays.sh
+++ b/test_fms/mpp/test_global_arrays.sh
@@ -27,6 +27,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 test_expect_success "global array functions with mixed precision" '
     mpirun -n 8 ./test_global_arrays
 '
diff --git a/test_fms/mpp/test_mpp_alltoall.sh b/test_fms/mpp/test_mpp_alltoall.sh
index f54dcde599..c186b11efb 100755
--- a/test_fms/mpp/test_mpp_alltoall.sh
+++ b/test_fms/mpp/test_mpp_alltoall.sh
@@ -26,6 +26,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 # Run the test for one processor
 test_expect_success "mpp all-to-all with mixed precision" '
     mpirun -n 4 ./test_mpp_alltoall
diff --git a/test_fms/mpp/test_mpp_global_sum_ad.sh b/test_fms/mpp/test_mpp_global_sum_ad.sh
index 8c5b1b6cc2..71296789f7 100755
--- a/test_fms/mpp/test_mpp_global_sum_ad.sh
+++ b/test_fms/mpp/test_mpp_global_sum_ad.sh
@@ -27,6 +27,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 # Run the test
 test_expect_success "mpp global adjoint sum with mixed precision" '
     mpirun -n 4 ./test_mpp_global_sum_ad
diff --git a/test_fms/mpp/test_mpp_npes.sh b/test_fms/mpp/test_mpp_npes.sh
index 23295e4e29..edc3e4997d 100755
--- a/test_fms/mpp/test_mpp_npes.sh
+++ b/test_fms/mpp/test_mpp_npes.sh
@@ -28,6 +28,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 export NUM_PES=1
 test_expect_success "get number of PEs single processor" '
     mpirun -n 1 ./test_mpp_npes
diff --git a/test_fms/mpp/test_mpp_pe.sh b/test_fms/mpp/test_mpp_pe.sh
index dde00bfd99..8936de1174 100755
--- a/test_fms/mpp/test_mpp_pe.sh
+++ b/test_fms/mpp/test_mpp_pe.sh
@@ -27,6 +27,8 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
 
 # Run the tests
 test_expect_success "get current PE single processor" '
diff --git a/test_fms/mpp/test_mpp_root_pe.sh b/test_fms/mpp/test_mpp_root_pe.sh
index 23cd707a71..7970004172 100755
--- a/test_fms/mpp/test_mpp_root_pe.sh
+++ b/test_fms/mpp/test_mpp_root_pe.sh
@@ -28,6 +28,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 # Run the test
 test_expect_success "get correct root PE single processor" '
     mpirun -n 1 ./test_mpp_root_pe
diff --git a/test_fms/mpp/test_mpp_sum.sh b/test_fms/mpp/test_mpp_sum.sh
index bd90ecb17a..fa00ea1e23 100755
--- a/test_fms/mpp/test_mpp_sum.sh
+++ b/test_fms/mpp/test_mpp_sum.sh
@@ -28,6 +28,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 # Run the test for 5 processors
 test_expect_success "mpp_sum with mixed precision" '
     mpirun -n 5 ./test_mpp_sum
diff --git a/test_fms/mpp/test_mpp_transmit.sh b/test_fms/mpp/test_mpp_transmit.sh
index a1c4483590..77f610f091 100755
--- a/test_fms/mpp/test_mpp_transmit.sh
+++ b/test_fms/mpp/test_mpp_transmit.sh
@@ -28,6 +28,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 # Run the test for 5 processors
 test_expect_success "mpp transmit with mixed precision" '
     mpirun -n 6 ./test_mpp_transmit
diff --git a/test_fms/mpp/test_stderr.sh b/test_fms/mpp/test_stderr.sh
index ebf8adc222..25f8190b65 100755
--- a/test_fms/mpp/test_stderr.sh
+++ b/test_fms/mpp/test_stderr.sh
@@ -27,6 +27,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 test_expect_success "get stderr" '
     mpirun -n 1 ./test_stderr
 '
diff --git a/test_fms/mpp/test_stdin.sh b/test_fms/mpp/test_stdin.sh
index f13d38df28..0a8df299dc 100755
--- a/test_fms/mpp/test_stdin.sh
+++ b/test_fms/mpp/test_stdin.sh
@@ -26,6 +26,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 test_expect_success "correct STDIN writes" '
     mpirun -n 1 ./test_stdin
 '
diff --git a/test_fms/mpp/test_stdout.sh b/test_fms/mpp/test_stdout.sh
index 67befda83b..ddce1baf2a 100755
--- a/test_fms/mpp/test_stdout.sh
+++ b/test_fms/mpp/test_stdout.sh
@@ -28,6 +28,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 # Run test with one processor
 test_expect_success "get stdout with 1 PE" '
     mpirun -n 2 ./test_stdout
diff --git a/test_fms/mpp/test_system_clock.sh b/test_fms/mpp/test_system_clock.sh
index cdc620adaa..0cf357e824 100755
--- a/test_fms/mpp/test_system_clock.sh
+++ b/test_fms/mpp/test_system_clock.sh
@@ -27,6 +27,9 @@
 # Set common test settings.
 . ../test-lib.sh
 
+# ensure input.nml file present
+touch input.nml
+
 # Run the test for one processor
 test_expect_success "system clock functionality" '
     mpirun -n 1 ./test_system_clock
diff --git a/test_fms/mpp/test_update_domains_performance.sh b/test_fms/mpp/test_update_domains_performance.sh
index 9efd622b61..36303abd53 100755
--- a/test_fms/mpp/test_update_domains_performance.sh
+++ b/test_fms/mpp/test_update_domains_performance.sh
@@ -26,6 +26,10 @@
 
 # Set common test settings.
 . ../test-lib.sh
+
+# ensure input.nml file present
+touch input.nml
+
 # Run the test for one processor
 test_expect_success "domain update performance with 1 PE" '
     mpirun -n 1 ./test_update_domains_performance