Merge pull request #12 from nwu63/updated-packages

Updated packages
mdolab · Feb 12, 2020 · 0fd4483 · 0fd4483
2 parents 1a04b7f + 327ab08
commit 0fd4483
Show file tree

Hide file tree

Showing 9 changed files with 297 additions and 376 deletions.
diff --git a/config/defaults/config.LINUX_GFORTRAN_OPENMPI.mk b/config/defaults/config.LINUX_GFORTRAN_OPENMPI.mk
@@ -17,16 +17,12 @@ CC   = mpicc
 # so it is included in ${PETSC_LIB}. Otherwise you will have to
 # specify the HDF5 library.
 
-# ----------- CGNS 3.2.x ------------------
-CGNS_VERSION_FLAG=
+# ----------- CGNS ------------------
+# CGNS_VERSION_FLAG=               # for CGNS 3.2.x
+CGNS_VERSION_FLAG=-DUSECGNSMODULE  # for CGNS 3.3.x
 CGNS_INCLUDE_FLAGS=-I$(CGNS_HOME)/include
 CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns
 
-# # ----------- CGNS 3.3.x ------------------
-# CGNS_VERSION_FLAG=-DUSECGNSMODULE
-# CGNS_INCLUDE_FLAGS=-I$(HOME)/packages/CGNS/src
-# CGNS_LINKER_FLAGS=-L$(HOME)/packages/CGNS/src/lib -lcgns
-
 # ------- Define Compiler Flags ----------------------------------------
 FF90_GEN_FLAGS = -fPIC
 CC_GEN_FLAGS   = -fPIC

diff --git a/config/defaults/config.LINUX_INTEL_OPENMPI.mk b/config/defaults/config.LINUX_INTEL_OPENMPI.mk
@@ -16,16 +16,12 @@ CC   = mpicc
 # so it is included in ${PETSC_LIB}. Otherwise you will have to
 # specify the HDF5 library.
 
-# ----------- CGNS 3.2.x ------------------
-CGNS_VERSION_FLAG=
+# ----------- CGNS ------------------
+# CGNS_VERSION_FLAG=               # for CGNS 3.2.x
+CGNS_VERSION_FLAG=-DUSECGNSMODULE  # for CGNS 3.3.x
 CGNS_INCLUDE_FLAGS=-I$(CGNS_HOME)/include
 CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns
 
-# # ----------- CGNS 3.3.x ------------------
-# CGNS_VERSION_FLAG=-DUSECGNSMODULE
-# CGNS_INCLUDE_FLAGS=-I$(HOME)/packages/CGNS/src
-# CGNS_LINKER_FLAGS=-L$(HOME)/packages/CGNS/src/lib -lcgns
-
 # ------- Define Compiler Flags ----------------------------------------
 FF90_GEN_FLAGS = -fPIC
 CC_GEN_FLAGS   = -fPIC