From 1de062f43d08e7b68fad5181f5b1dd622d555dfd Mon Sep 17 00:00:00 2001
From: iagbole <bolemann@iag.uni-stuttgart.de>
Date: Fri, 11 Dec 2015 19:38:48 +0100
Subject: [PATCH] Fixed CGNS/HDF5 download paths. Hack for bug in cgnslib_f.h.
 HOPR is now FIT FOR GIT.

---
 .gitignore     |  6 ++++++
 Makefile.defs  |  8 +++-----
 share/Makefile | 17 ++++++++---------
 3 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e93e529
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+share/GNU/
+share/INTEL/
+share/hdf5-1.8.14.tar.bz2
+share/v3.2.1.tar.gz
+src/deplist.mk
+src/srcfiles_pp.mk
diff --git a/Makefile.defs b/Makefile.defs
index c7d3ba9..8bf3431 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -112,11 +112,9 @@ TECBIN_LIBS = -ltecio -lstdc++
 #---------------------------------------------------------------------------------------------------------------------------------#
 # CGNS
 #---------------------------------------------------------------------------------------------------------------------------------#
-#ifeq ($(findstring OLD,$(CGNS_INPUT)),OLD)
-CGNS_VERSION    =3.2.1
-CGNS_SUBVERSION =2
-CGNS_DIR    =../share/$(SHARECOMP)/cgnslib_$(CGNS_VERSION)/src
-CGNS_LIBDIR =../share/$(SHARECOMP)/cgnslib_$(CGNS_VERSION)/src/lib
+CGNS_VERSION=3.2.1
+CGNS_DIR    =../share/$(SHARECOMP)/CGNS-$(CGNS_VERSION)/src
+CGNS_LIBDIR =../share/$(SHARECOMP)/CGNS-$(CGNS_VERSION)/src/lib
 CGNS_LIB    =-L$(CGNS_LIBDIR)
 CGNS_INC    =-I$(CGNS_DIR)
 CGNS_LIBS   =-lcgns
diff --git a/share/Makefile b/share/Makefile
index 02ff33c..948963a 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -16,7 +16,7 @@ hdf5: dir
 		echo "= M A K E   H D F 5                                           =";\
 		echo "===============================================================";\
 		if [ ! -f hdf5-$(HDF5_VERSION).tar.bz2 ] ; then \
-		  wget -N http://www.hdfgroup.org/ftp/HDF5/prev-releases/hdf5-$(HDF5_VERSION)/src/hdf5-$(HDF5_VERSION).tar.bz2 ; \
+		  wget -N http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-$(HDF5_VERSION)/src/hdf5-$(HDF5_VERSION).tar.bz2 ; \
 		fi ; \
 		if [ ! -d $(SHARECOMP)/hdf5-$(HDF5_VERSION) ] ; then \
 			cd $(SHARECOMP)/ && tar -xvjf ../hdf5-$(HDF5_VERSION).tar.bz2 1>/dev/null && cd .. ; \
@@ -29,16 +29,16 @@ hdf5: dir
 cgns: dir
 	@# CGNS library (if 64bit needed: set --enable-64bit in configure command and CGNS_INT=64 in Makefile.defs
 	@ if [ -n "$(CGNS_VERSION)" ] && [ ! -f $(CGNS_LIBDIR)/libcgns.a ] ; then \
-#	@ if [ -n "$(CGNS_VERSION)" ] && [ ! -f $(SHARECOMP)/cgnslib_$(CGNS_VERSION)/src/lib/libcgns.a ] ; then \
 		echo "===============================================================";\
 		echo "= M A K E   C G N S                                           =";\
 		echo "===============================================================";\
-		if [ ! -f cgnslib_$(CGNS_VERSION)-$(CGNS_SUBVERSION).tar.gz ] ; then \
-			wget -N http://mesh.dl.sourceforge.net/project/cgns/cgnslib_$(CGNS_VERSION)/Release%20$(CGNS_SUBVERSION)/cgnslib_$(CGNS_VERSION)-$(CGNS_SUBVERSION).tar.gz ; \
+		if [ ! -f v$(CGNS_VERSION).tar.gz ] ; then \
+			wget -N https://github.com/CGNS/CGNS/archive/v$(CGNS_VERSION).tar.gz ; \
 		fi ; \
-		if [ ! -d $(SHARECOMP)/cgnslib_$(CGNS_VERSION) ] ; then \
-			cd $(SHARECOMP) && tar -xvzf ../cgnslib_$(CGNS_VERSION)-$(CGNS_SUBVERSION).tar.gz 1>/dev/null && cd .. ; \
+		if [ ! -d $(SHARECOMP)/CGNS-$(CGNS_VERSION) ] ; then \
+			cd $(SHARECOMP) && tar -xvzf ../v$(CGNS_VERSION).tar.gz 1>/dev/null && cd .. ; \
 		fi ; \
+    sed -i 's/^c/!/g' $(CGNS_DIR)/src/cgnslib_f.h ;\
  		cd $(CGNS_DIR) && FC='$(FC)' ./configure --enable-lfs  $(CGNSF2C) && $(MAKE) ; \
 		echo "===============================================================";\
 		echo "= C G N S   D O N E                                           =";\
@@ -71,9 +71,8 @@ cleanhdf5:
 	fi
 cleancgns:
 	@# CGNS library
-	@ if [ -d $(SHARECOMP)/cgnslib_$(CGNS_VERSION) ] ; then \
-#		cd $(SHARECOMP)/cgnslib_$(CGNS_VERSION)/src && $(MAKE) allclean ; \
-		cd $(CGNS_DIR) && $(MAKE) allclean ; \
+	@ if [ -d $(SHARECOMP)/CGNS-$(CGNS_VERSION) ] ; then \
+		cd $(SHARECOMP)/CGNS-$(CGNS_VERSION)/src && $(MAKE) allclean ; \
 	fi
 cleannr:
 	@# Numerical Recipes