From 28a5493336ca758f2938c26868bbd40d21d1580c Mon Sep 17 00:00:00 2001
From: Eirikur Jonsson <36180221+eirikurj@users.noreply.github.com>
Date: Mon, 1 Mar 2021 13:33:18 -0500
Subject: [PATCH] Removing CGNS support for versions older than 3.3.0 (#30)

---
 cgnsutilities/__init__.py                |  2 +-
 config/defaults/config.LINUX_GFORTRAN.mk | 17 ++++++-----------
 config/defaults/config.LINUX_INTEL.mk    | 17 ++++++-----------
 src/cgns_utilities.F90                   |  7 +------
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/cgnsutilities/__init__.py b/cgnsutilities/__init__.py
index 55e4709..3d67cd6 100755
--- a/cgnsutilities/__init__.py
+++ b/cgnsutilities/__init__.py
@@ -1 +1 @@
-__version__ = "2.3.0"
+__version__ = "2.4.0"
diff --git a/config/defaults/config.LINUX_GFORTRAN.mk b/config/defaults/config.LINUX_GFORTRAN.mk
index 381e8b5..29884e7 100644
--- a/config/defaults/config.LINUX_GFORTRAN.mk
+++ b/config/defaults/config.LINUX_GFORTRAN.mk
@@ -1,12 +1,7 @@
-# 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 CGNS Inlcude and linker flags -------------------------
+# 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
 
@@ -14,9 +9,9 @@ CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns
 CC = gcc
 CFLAGS = -O2 -fPIC
 FC = gfortran
-FFLAGS= -O2 -fdefault-real-8 -g -fPIC ${CGNS_VERSION_FLAG}
+FFLAGS= -O2 -fdefault-real-8 -g -fPIC
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
 PYTHON-CONFIG = python3-config # use python-config for python 2
-F2PY = f2py
\ No newline at end of file
+F2PY = f2py
diff --git a/config/defaults/config.LINUX_INTEL.mk b/config/defaults/config.LINUX_INTEL.mk
index 5b4c5c3..76eb402 100644
--- a/config/defaults/config.LINUX_INTEL.mk
+++ b/config/defaults/config.LINUX_INTEL.mk
@@ -1,12 +1,7 @@
-# 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 CGNS Inlcude and linker flags -------------------------
+# 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
 
@@ -14,9 +9,9 @@ CGNS_LINKER_FLAGS=-L$(CGNS_HOME)/lib -lcgns
 CC = gcc
 CFLAGS = -O2 -fPIC
 FC = ifort
-FFLAGS = -O2 -r8 -g -fPIC ${CGNS_VERSION_FLAG}
+FFLAGS = -O2 -r8 -g -fPIC
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
 PYTHON-CONFIG = python3-config # use python-config for python 2
-F2PY = f2py
\ No newline at end of file
+F2PY = f2py
diff --git a/src/cgns_utilities.F90 b/src/cgns_utilities.F90
index 4b94464..6c62c3a 100644
--- a/src/cgns_utilities.F90
+++ b/src/cgns_utilities.F90
@@ -60,13 +60,8 @@ end module dataTypes
 
 module utils
 
-#ifdef USECGNSMODULE
   use cgns
-#else
-  include 'cgnslib_f.h'
-  integer(kind=4), private :: dummyInt
-  integer, parameter :: cgsize_t=kind(dummyInt)
-#endif
+
 contains
 
   subroutine openFile(fileName, mode, cellDim, cg)