Better logic

Author: mathomp4

GEOSldas_App/ldas_setup

@@ -1392,7 +1392,7 @@ class LDASsetup:
                   MY_ENSEMBLE_FORCING= self.rqdExeInp.get('ENSEMBLE_FORCING', 'NO').upper(),
                   MY_ADAS_EXPDIR     = self.adas_expdir,
                   MY_EXPDIR          = self.expdir,
-                  DETECTED_MPI_STACK = MPI_STACK,
+                  DETECTED_MPI_STACK = DETECTED_MPI_STACK,
                   BUILT_ON_SLES15    = BUILT_ON_SLES15
                   )
 

GEOSldas_App/lenkf_j_template.py

@@ -63,6 +63,10 @@
 
 source $GEOSBIN/g5_modules
 
+setenv MPI_STACK {DETECTED_MPI_STACK}
+
+if ( ${{MPI_STACK}} == "openmpi" ) then
+
 # OPENMPI flags
 # Turn off warning about TMPDIR on NFS
 setenv OMPI_MCA_shmem_mmap_enable_nfs_warning 0
@@ -81,12 +85,16 @@
 # disable file locks
 setenv OMPI_MCA_sharedfp "^lockedfile,individual"
 
-setenv BUILT_ON_SLES15 = {BUILT_ON_SLES15}
+else if ( ${{MPI_STACK}} == "intelmpi" ) then
+
+setenv BUILT_ON_SLES15 {BUILT_ON_SLES15}
 
 if ( ${{BUILT_ON_SLES15}} == TRUE ) then
 setenv I_MPI_FABRICS shm:ofi
 setenv I_MPI_OFI_PROVIDER psm3
-endif
+endif # BUILT_ON_SLES15
+
+endif # MPI_STACK
 
 # By default, ensure 0-diff across processor architecture by limiting MKL's freedom to pick algorithms.
 # As of June 2021, MKL_CBWR=AVX2 is fastest setting that works for both haswell and skylake at NCCS.