From f00269fa12c3d482a1bc7fa860be0dcc78f0798c Mon Sep 17 00:00:00 2001
From: Elizabeth Hunke <eclare@lanl.gov>
Date: Wed, 14 Aug 2019 16:15:47 -0600
Subject: [PATCH] badger machine files to use LANL IC netcdf libraries

---
 configuration/scripts/machines/Macros.badger_intel | 12 ++++--------
 configuration/scripts/machines/env.badger_intel    | 12 ++++++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configuration/scripts/machines/Macros.badger_intel b/configuration/scripts/machines/Macros.badger_intel
index 2873f97fb..9a92262c2 100644
--- a/configuration/scripts/machines/Macros.badger_intel
+++ b/configuration/scripts/machines/Macros.badger_intel
@@ -31,23 +31,19 @@ else
 endif
 LD:= $(FC)
 
-# set in Macros file
-NETCDF_PATH := /usr/projects/climate/SHARED_CLIMATE/software/conejo/netcdf/3.6.3/intel-13.0.1
-PNETCDF_PATH := /usr/projects/climate/SHARED_CLIMATE/software/conejo/parallel-netcdf/1.3.1/intel-13.0.1/openmpi-1.6.3
-#LAPACK_LIBDIR := /glade/apps/opt/lapack/3.4.2/intel/12.1.5/lib
+NETCDF_PATH := /usr/projects/hpcsoft/toss3/common/netcdf/4.4.0_intel-18.0.5
+PNETCDF_PATH := /usr/projects/hpcsoft/toss3/badger/netcdf/4.4.0_intel-18.0.5_openmpi-2.1.2
 
 PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs 
 
 ifeq ($(ICE_IOTYPE), netcdf)
-  INCLDIR := $(INCLDIR) -I$(NETCDF_PATH)/include
-#  INCLDIR := $(INCLDIR) -I/usr/projects/climate/SHARED_CLIMATE/software/conejo/netcdf/3.6.3/intel-13.0.1/include
+  INCLDIR := $(INCLDIR) -I$(NETCDF_PATH)/include -I$(PNETCDF_PATH)/include
 
   LIB_NETCDF := $(NETCDF_PATH)/lib
   LIB_PNETCDF := $(PNETCDF_PATH)/lib
   LIB_MPI := $(IMPILIBDIR)
 
-  #SLIBS   := -L$(LIB_NETCDF) -lnetcdf -L$(LIB_PNETCDF) -lpnetcdf -L$(LAPACK_LIBDIR) -llapack -lblas
-  SLIBS   := -L$(LIB_NETCDF) -lnetcdf -L$(LIB_PNETCDF) -lpnetcdf 
+  SLIBS   := -L$(LIB_NETCDF) -lnetcdf -L$(LIB_PNETCDF) -lnetcdff 
 else
   SLIBS   := 
 endif
diff --git a/configuration/scripts/machines/env.badger_intel b/configuration/scripts/machines/env.badger_intel
index a184eba51..3e7bb4f8c 100755
--- a/configuration/scripts/machines/env.badger_intel
+++ b/configuration/scripts/machines/env.badger_intel
@@ -12,10 +12,14 @@ if ("$inp" != "-nomodules") then
 #module purge
 #module load intel
 #module load openmpi
-
-setenv NETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/netcdf/3.6.3/intel-13.0.1
-setenv PNETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/parallel-netcdf/1.3.1/intel-13.0.1/openmpi-1.6.3
-#setenv LAPACK_LIBDIR /glade/apps/opt/lapack/3.4.2/intel/12.1.5/lib
+module unload hdf5-serial
+module unload hdf5-parallel
+module unload netcdf-serial
+module unload netcdf-h5parallel
+module load hdf5-serial
+module load netcdf-serial/4.4.0
+module load hdf5-parallel
+module load netcdf-h5parallel/4.4.0
 
 #setenv OMP_STACKSIZE 256M
 #setenv MP_LABELIO yes