Removing CGNS support for versions older than 3.3.0 (#41)

Co-authored-by: Sabet Seraj <[email protected]>

Author: eirikurj

Hyp_Common.mk

@@ -48,7 +48,7 @@ MAKE_CLEAN_ARGUMENTS = *~ *.o *.mod *.il *.stb c_*
 #      *                                                                *
 #      ******************************************************************
 
-FF90_ALL_FLAGS   = -I$(HYP_MODDIR) $(CGNS_INCLUDE_FLAGS) $(CGNS_VERSION_FLAG) \
+FF90_ALL_FLAGS   = -I$(HYP_MODDIR) $(CGNS_INCLUDE_FLAGS) \
 		   $(FF90_GEN_FLAGS) $(FF90_OPT_FLAGS) $(PETSC_INCLUDE_FLAGS)
 
 CC_ALL_FLAGS = -I$(HYP_MODDIR) $(CGNS_INCLUDE_FLAGS) \

config/defaults/config.LINUX_GFORTRAN_OPENMPI.mk

@@ -11,15 +11,9 @@ CC   = mpicc
 
 
 # ------- Define CGNS Inlcude and linker flags -------------------------
-# Define the CNGS include directory and linking flags for CGNSlib. We
-# can use 3.2.x OR CGNS 3.3+. You must define which version is being
-# employed as shown below. We are assuming that HDF5 came from PETSc
-# so it is included in ${PETSC_LIB}. Otherwise you will have to
-# specify the HDF5 library.
-
-# ----------- CGNS ------------------
-# CGNS_VERSION_FLAG=               # for CGNS 3.2.x
-CGNS_VERSION_FLAG=-DUSECGNSMODULE  # for CGNS 3.3.x
+# Define the CGNS include directory and linking flags for the CGNS library.
+# We are assuming that HDF5 came from PETSc so it is included in ${PETSC_LIB}.
+# Otherwise you will have to specify the HDF5 library.
 CGNS_INCLUDE_FLAGS=-I$(CGNS_HOME)/include
 CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns
 

config/defaults/config.LINUX_INTEL_OPENMPI.mk

@@ -10,15 +10,9 @@ FF90 = mpif90
 CC   = mpicc
 
 # ------- Define CGNS Inlcude and linker flags -------------------------
-# Define the CNGS include directory and linking flags for CGNSlib. We
-# can use 3.2.x OR CGNS 3.3+. You must define which version is being
-# employed as shown below. We are assuming that HDF5 came from PETSc
-# so it is included in ${PETSC_LIB}. Otherwise you will have to
-# specify the HDF5 library.
-
-# ----------- CGNS ------------------
-# CGNS_VERSION_FLAG=               # for CGNS 3.2.x
-CGNS_VERSION_FLAG=-DUSECGNSMODULE  # for CGNS 3.3.x
+# Define the CGNS include directory and linking flags for the CGNS library.
+# We are assuming that HDF5 came from PETSc so it is included in ${PETSC_LIB}.
+# Otherwise you will have to specify the HDF5 library.
 CGNS_INCLUDE_FLAGS=-I$(CGNS_HOME)/include
 CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns
 

pyhyp/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "2.3.2"
+__version__ = "2.4.0"
 
 from .pyHyp import pyHyp, pyHypMulti

src/modules/cgnsGrid.F90

@@ -1,14 +1,7 @@
 module cgnsGrid
 
   use precision
-#ifdef USECGNSMODULE
   use cgns
   implicit none
-#else
-  implicit none
-  include "cgnslib_f.h"
-  integer(kind=4), private :: dummyInt
-  integer, parameter :: cgsize_t=kind(dummyInt)
-#endif
 
 end module cgnsGrid