From 56fdfd92404dd13e1b06eb72b1649d60728b5c35 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 7 Oct 2021 14:02:21 -0400
Subject: [PATCH] Closes #94. Update mpi variables in regrid

---
 CHANGELOG.md             |  2 ++
 GEOS_Util/post/regrid.pl | 36 +++++++++++++++---------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b8f9f8..ee7f8e42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Changed the Intel MPI and MVAPICH2 flags in `regrid.pl` to be modern
+
 ### Removed
 
 ## [1.4.10] - 2021-10-08
diff --git a/GEOS_Util/post/regrid.pl b/GEOS_Util/post/regrid.pl
index c3199429..f3ff1bb2 100755
--- a/GEOS_Util/post/regrid.pl
+++ b/GEOS_Util/post/regrid.pl
@@ -2478,31 +2478,25 @@ sub regrid_upperair_rsts_CS {
 
 if (\$?I_MPI_ROOT) then
 
-  # intel scaling suggestions
-  #--------------------------
+  # Based on GEOSgcm NCCS Intel MPI settings
+  #-----------------------------------------
   
-  setenv I_MPI_DAPL_UD on
-
-  setenv DAPL_UCM_CQ_SIZE 4096
-  setenv DAPL_UCM_QP_SIZE 4096
-
-  setenv I_MPI_DAPL_UD_SEND_BUFFER_NUM 4096
-  setenv I_MPI_DAPL_UD_RECV_BUFFER_NUM 4096
-  setenv I_MPI_DAPL_UD_ACK_SEND_POOL_SIZE 4096
-  setenv I_MPI_DAPL_UD_ACK_RECV_POOL_SIZE 4096
-  setenv I_MPI_DAPL_UD_RNDV_EP_NUM 2
-  setenv I_MPI_DAPL_UD_REQ_EVD_SIZE 2000
-
-  setenv DAPL_UCM_REP_TIME 2000
-  setenv DAPL_UCM_RTU_TIME 2000
-  setenv DAPL_UCM_RETRY 7
-  setenv DAPL_ACK_RETRY 7
-  setenv DAPL_ACK_TIMER 20
-  setenv DAPL_UCM_RETRY 10
-  setenv DAPL_ACK_RETRY 10
+  setenv I_MPI_ADJUST_ALLREDUCE 12
+  setenv I_MPI_ADJUST_GATHERV 3
+
+  setenv I_MPI_SHM_HEAP_VSIZE 512
+  setenv PSM2_MEMORY large
+  setenv I_MPI_EXTRA_FILESYSTEM 1
+  setenv I_MPI_EXTRA_FILESYSTEM_FORCE gpfs
+  setenv ROMIO_FSTYPE_FORCE "gpfs:"
 
 else if (\$?MVAPICH2) then
+
   setenv MV2_ENABLE_AFFINITY 0
+  setenv MV2_ENABLE_AFFINITY     0
+  setenv SLURM_DISTRIBUTION block
+  setenv MV2_MPIRUN_TIMEOUT 100
+  setenv MV2_GATHERV_SSEND_THRESHOLD 256
 
 endif