Fix segfault for compiling copygb with this version of iplib (#13)

mkavulich · web-flow · commit c01e9ad412d1 · 2020-03-05T14:38:55.000-07:00
The fix was to compile iplib with 4-byte reals; this fixes inconsistency relating to "d" notation in source code. Macros files also had to be updated due to a rename to avoid case-insensitivity problem on MacOSX.
diff --git a/macros.make.cheyenne.gnu b/macros.make.cheyenne.gnu
@@ -37,8 +37,8 @@ GFSIO_FFLAGS  = $(OMPFLAGS) -O3 -c -ffree-form -ffree-line-length-none -fconvert
 GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
-IP_FFLAGS     = $(OMPFLAGS) -O3 -fdefault-real-8 -fPIC
-IP_FPPFLAGS   = -cpp -DLSIZE=d
+IP_FFLAGS     = $(OMPFLAGS) -O3 -c -ffree-form
+IP_FPPFLAGS   = -cpp -DLSIZE=4
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.cheyenne.intel b/macros.make.cheyenne.intel
@@ -37,8 +37,8 @@ GFSIO_FFLAGS  = $(OMPFLAGS) -O3 -c -free -fp-model source -ftz -assume byterecl
 GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
-IP_FFLAGS     = $(OMPFLAGS) -r8 -O3 -fp-model strict -ip -I. -convert little_endian -assume byterecl
-IP_FPPFLAGS   = -fpp -DLSIZE=d -save-temps
+IP_FFLAGS     = $(OMPFLAGS) -free -fp-model source -ftz -assume byterecl -convert big_endian -heap-arrays -O3 -c
+IP_FPPFLAGS   = -fpp -DLSIZE=4 -save-temps
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.cheyenne.pgi b/macros.make.cheyenne.pgi
@@ -37,8 +37,8 @@ GFSIO_FFLAGS  = $(OMPFLAGS) -O3 -c -Mfree -Kieee -pc 64 -byteswapio -DLINUX
 GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
-IP_FFLAGS     = $(OMPFLAGS) -traceback -O3 -Mipa=fast -Kieee -r8 -i4 -fPIC
-IP_FPPFLAGS   = -DLSIZE=d
+IP_FFLAGS     = $(OMPFLAGS) -traceback -O3 -c -Mfree -Kieee
+IP_FPPFLAGS   = -DLSIZE=4
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.gaea.intel b/macros.make.gaea.intel
@@ -29,7 +29,7 @@ GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
 IP_FFLAGS     = $(OMPFLAGS) -r8 -O3 -fp-model strict -ip -I. -convert little_endian -assume byterecl
-IP_FPPFLAGS   = -fpp -DLSIZE=d -save-temps
+IP_FPPFLAGS   = -fpp -DLSIZE=4 -save-temps
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.hera.intel b/macros.make.hera.intel
@@ -36,8 +36,8 @@ GFSIO_FFLAGS  = $(OMPFLAGS) -O3 -c -free -fp-model source -ftz -assume byterecl
 GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
-IP_FFLAGS     = $(OMPFLAGS) -r8 -O3 -fp-model strict -ip -I. -convert little_endian -assume byterecl
-IP_FPPFLAGS   = -fpp -DLSIZE=d -save-temps
+IP_FFLAGS     = $(OMPFLAGS) -free  -fp-model source -ftz -assume byterecl -convert big_endian -heap-arrays -O3  -c
+IP_FPPFLAGS   = -fpp -DLSIZE=4 -save-temps
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.jet.intel b/macros.make.jet.intel
@@ -29,7 +29,7 @@ GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
 IP_FFLAGS     = $(OMPFLAGS) -r8 -O3 -fp-model strict -ip -I. -convert little_endian -assume byterecl
-IP_FPPFLAGS   = -fpp -DLSIZE=d -save-temps
+IP_FPPFLAGS   = -fpp -DLSIZE=4 -save-temps
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.linux.gnu b/macros.make.linux.gnu
@@ -25,20 +25,20 @@ BACIO_FFLAGS  = $(OMPFLAGS) -O3 -fbacktrace -fPIC
 BACIO_CFLAGS  = $(OMPFLAGS) -O3 -DUNDERSCORE -DLINUX -fPIC
 
 # Flags for g2 library
-G2_FFLAGS  = $(OMPFLAGS) -c -O3 -fconvert=big-endian -fno-second-underscore -frecord-marker=4 -fno-range-check
+G2_FFLAGS  = $(OMPFLAGS) -c -O3 -fconvert=big-endian -fno-second-underscore -frecord-marker=4 -fno-range-check -fbacktrace
 G2_CFLAGS  = $(OMPFLAGS) -O3 -g -I${JASPER_INC} -I${PNG_INC} -DLINUX
 
 # Flags for g2tmpl library
-G2TMPL_FFLAGS  = $(OMPFLAGS) -O3 -ffree-form
+G2TMPL_FFLAGS  = $(OMPFLAGS) -O3 -ffree-form -fbacktrace
 G2TMPL_CFLAGS  = $(OMPFLAGS) -O3 -g -DUNDERSCORE
 
 # Flags for gfsio library
-GFSIO_FFLAGS  = $(OMPFLAGS) -O3 -c -ffree-form -ffree-line-length-none -fconvert=big-endian -fno-second-underscore -frecord-marker=4 -fno-range-check
+GFSIO_FFLAGS  = $(OMPFLAGS) -O3 -c -ffree-form -ffree-line-length-none -fconvert=big-endian -fno-second-underscore -frecord-marker=4 -fno-range-check -fbacktrace
 GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
-IP_FFLAGS     = $(OMPFLAGS) -O3 -fdefault-real-8 -fPIC
-IP_FPPFLAGS   = -cpp -DLSIZE=d
+IP_FFLAGS     = $(OMPFLAGS) -ffree-form -ffree-line-length-none -fconvert=big-endian -fno-second-underscore -frecord-marker=4 -fno-range-check -O3 -c
+IP_FPPFLAGS   = -cpp -DLSIZE=4
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.linux.intel b/macros.make.linux.intel
@@ -36,8 +36,8 @@ GFSIO_FFLAGS  = $(OMPFLAGS) -traceback -g -xHOST -convert big_endian -assume byt
 GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
-IP_FFLAGS     = $(OMPFLAGS) -r8 -O3 -fp-model strict -ip -I. -convert little_endian -assume byterecl
-IP_FPPFLAGS   = -fpp -DLSIZE=d -save-temps
+IP_FFLAGS     = $(OMPFLAGS) -free -fp-model source -ftz -assume byterecl -convert big_endian -heap-arrays -O3 -c
+IP_FPPFLAGS   = -fpp -DLSIZE=4 -save-temps
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/macros.make.macosx.gnu b/macros.make.macosx.gnu
@@ -37,8 +37,8 @@ GFSIO_FFLAGS  = $(OMPFLAGS) -O3 -c -ffree-form -ffree-line-length-none -fconvert
 GFSIO_ARFLAGS = -rv
 
 # Flags for ip library
-IP_FFLAGS     = $(OMPFLAGS) -O3 -fdefault-real-8 -fPIC
-IP_FPPFLAGS   = -cpp -DLSIZE=d
+IP_FFLAGS     = $(OMPFLAGS) -ffree-form -ffree-line-length-none -fconvert=big-endian -fno-second-underscore -frecord-marker=4 -fno-range-check -O3 -c
+IP_FPPFLAGS   = -cpp -DLSIZE=4
 IP_ARFLAGS    = -ruv
 
 # Flags for landsfcutil library
diff --git a/src/ip/v3.0.0/sorc/Makefile b/src/ip/v3.0.0/sorc/Makefile
@@ -19,7 +19,7 @@ installdir     = $(prefix)/$(distdir)
 
 # Compiler substitution variables
 FC       = $(FCserial)
-FCFLAGS  = $(IP_FFLAGS) -c
+FCFLAGS  = $(IP_FFLAGS)
 FPPFLAGS  = $(IP_FPPFLAGS)
 AR       = ar
 ARFLAGS  = crvs
@@ -74,8 +74,8 @@ include make.dependencies
 
 # Suffix rules
 .SUFFIXES:
-.SUFFIXES: .F90 .f90 .o
-.F90.o:
+.SUFFIXES: .F .f90 .o
+.F.o:
 	$(FC) $(EXTRA_FCFLAGS) $(FCFLAGS) $(FPPFLAGS) $<
 
 .f90.o:
diff --git a/src/ip/v3.0.0/sorc/gdswzd_c.F b/src/ip/v3.0.0/sorc/gdswzd_c.F
diff --git a/src/ip/v3.0.0/sorc/make.dependencies b/src/ip/v3.0.0/sorc/make.dependencies
@@ -1,4 +1,4 @@
- gdswzd_c.o : gdswzd_mod.o gdswzd_c.F90 
+ gdswzd_c.o : gdswzd_mod.o gdswzd_c.F 
  gausslat.o : gausslat.f90
  gdswzd00_mod.o : gdswzd00_mod.f90
  gdswzd01_mod.o : gdswzd01_mod.f90
diff --git a/src/ip/v3.0.0/sorc/make.filelist b/src/ip/v3.0.0/sorc/make.filelist
@@ -1,5 +1,5 @@
 # The list of files that need preprocessing
-FPP_FILES = gdswzd_c.F90
+FPP_FILES = gdswzd_c.F
 
 # The list of regular source files
 FSRC_FILES = \
@@ -42,4 +42,4 @@ SRC_FILES = $(FSRC_FILES) \
 
 # The list of object files
 OBJ_FILES = ${FSRC_FILES:.f90=.o} \
-            ${FPP_FILES:.F90=.o}
+            ${FPP_FILES:.F=.o}
