From b3ad62bd330f11ebe1d226df55747a2ad259bc0f Mon Sep 17 00:00:00 2001
From: "Xianwu.Xue" <Xianwu.Xue@noaa.gov>
Date: Wed, 20 Oct 2021 18:32:31 -0400
Subject: [PATCH] Update build modules to remove hardwired ver nums

 On branch feature/gefs_v12_github_port2acorn
 Changes to be committed:
	modified:   modulefiles/fv3gfs/enkf_chgres_recenter_nc.wcoss2
	modified:   modulefiles/gfs_bufr.wcoss2

Refs: #345
---
 .../fv3gfs/enkf_chgres_recenter_nc.wcoss2     | 24 +++++++++----------
 modulefiles/gfs_bufr.wcoss2                   | 23 ++++++++----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.wcoss2 b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.wcoss2
index ee089fdcef..7001224e3e 100644
--- a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.wcoss2
+++ b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.wcoss2
@@ -2,21 +2,21 @@
 ## enkf_chgres_recenter component - wcoss2/acorn
 #############################################################
 
-module load intel/19.1.3.304
-module load PrgEnv-intel/8.1.0
+module load intel/${intel_ver:-19.1.3.304}
+module load PrgEnv-intel/${PrgEnv_intel_ver:-8.1.0}
 
-module load craype/2.7.10
-module load cray-mpich/8.1.9
+module load craype/${craype_ver:-2.7.10}
+module load cray-mpich/${cray_mpich_ver:-8.1.9}
 
-module load bacio/2.4.1
-module load w3nco/2.4.1
-module load ip/3.3.3
-module load sp/2.3.3
-module load cmake/3.20.2
+module load bacio/${bacio_ver:-2.4.1}
+module load w3nco/${w3nco_ver:-2.4.1}
+module load ip/${ip_ver:-3.3.3}
+module load sp/${sp_ver:-2.3.3}
+module load cmake/${cmake_ver:-3.20.2}
 
-module load hdf5/1.10.6
-module load netcdf/4.7.4
+module load hdf5/${hdf5_ver:-1.10.6}
+module load netcdf/${netcdf_ver:-4.7.4}
 
-module load curl/7.72.0
+module load curl/${curl_ver:-7.72.0}
 
 export FC=ftn
diff --git a/modulefiles/gfs_bufr.wcoss2 b/modulefiles/gfs_bufr.wcoss2
index 3b409d9f50..317711fb78 100644
--- a/modulefiles/gfs_bufr.wcoss2
+++ b/modulefiles/gfs_bufr.wcoss2
@@ -3,22 +3,19 @@
 #############################################################
 
 # Loading pe environment
-module load intel/19.1.3.304
-module load PrgEnv-intel/8.1.0
+module load intel/${intel_ver:-19.1.3.304}
+module load PrgEnv-intel/${PrgEnv_intel_ver:-8.1.0}
 
-module load craype/2.7.10
-module load cray-mpich/8.1.9
+module load craype/${craype_ver:-2.7.10}
+module load cray-mpich/${cray_mpich_ver:-8.1.9}
 
 # Loding nceplibs modules
-module load nemsio/2.5.2
-module load bacio/2.4.1
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load bufr/11.5.0
-module load sigio/2.3.2
-
-#module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
-#module load gempak/7.3.1
+module load nemsio/${nemsio_ver:-2.5.2}
+module load bacio/${bacio_ver:-2.4.1}
+module load w3emc/${w3emc_ver:-2.7.3}
+module load w3nco/${w3nco_ver:-2.4.1}
+module load bufr/${bufr_ver:-11.5.0}
+module load sigio/${sigio_ver:-2.3.2}
 
 export myFC=ftn
 export myFCFLAGS="-O3 -convert big_endian -traceback -g -fp-model source -qopenmp"