Merge pull request #329 from gforney/master

build script and makefile entry cleanup for cfast and VandVCalcs

CFAST/gnu_win/make_cfast.bat → CFAST/gnu_win_64/make_cfast.bat

@@ -2,6 +2,6 @@
 
 Title Building cfast for 64 bit Windows
 
-make VPATH="../Source" -f ..\makefile gnu_win
+make VPATH="../Source" -f ..\makefile gnu_win_64
 pause
 

CFAST/gnu_win_db/make_cfast.bat → CFAST/gnu_win_64_db/make_cfast.bat

@@ -2,6 +2,6 @@
 
 Title Building cfast for 64 bit Windows
 
-make VPATH="../Source" -f ..\makefile gnu_win_db
+make VPATH="../Source" -f ..\makefile gnu_win_64_db
 pause
 

CFAST/makefile

@@ -1,9 +1,9 @@
 # Makefile for CFAST, Version 7
 
 # To use this makefile, select the appropriate compiler and OS from the list below. For example, to
-# compile the 32 bit version of CFAST under Linux using the Intel compilers type:
+# compile the 64 bit version of CFAST under Linux using the Intel compilers type:
 #
-# make intel_linux_32
+# make intel_linux_64
 
 # A make utility for windows may be downloaded from http://gnuwin32.sourceforge.net/packages/make.htm
 
@@ -70,34 +70,21 @@ setup_win:
 # ------------- Windows -------------------
 
 # gnu windows
-gnu_win : FFLAGS = -O2 -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
-gnu_win : FCOMPL = gfortran
-gnu_win : LFLAGS = 
-gnu_win : obj = cfast7_win_64
-gnu_win : $(objfgnu)
+gnu_win_64 : FFLAGS = -O2 -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
+gnu_win_64 : FCOMPL = gfortran
+gnu_win_64 : LFLAGS = 
+gnu_win_64 : obj = cfast7_win_64
+gnu_win_64 : $(objfgnu)
 	$(FCOMPL) $(FFLAGS) -o $(obj) $(objfgnu)
 
 # gnu windows debug
-gnu_win_db : FFLAGS = -O0 -Og -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
-gnu_win_db : FCOMPL = gfortran
-gnu_win_db : LFLAGS = 
-gnu_win_db : obj = cfast7_win_64_db
-gnu_win_db : $(objfgnu)
+gnu_win_64_db : FFLAGS = -O0 -Og -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
+gnu_win_64_db : FCOMPL = gfortran
+gnu_win_64_db : LFLAGS = 
+gnu_win_64_db : obj = cfast7_win_64_db
+gnu_win_64_db : $(objfgnu)
 	$(FCOMPL) $(FFLAGS) -o $(obj) $(objfgnu)
 
-# 32 bit
-intel_win_32_db : FFLAGS = /Qsave /Qinit:zero /debug:full /Z7 /Od /extend_source:132 /warn:all /warn:nointerfaces /Qtrapuv /fp:strict /fp:except /traceback /check:all /stand:f95 $(GITINFO)
-intel_win_32_db : FCOMPL = ifort
-intel_win_32_db : obj = cfast7_win_32_db
-intel_win_32_db : setup_win $(objwin)
-	$(FCOMPL) -o $(obj) $(FFLAGS)  /F100000000 $(objwin)
-
-intel_win_32 : FFLAGS = /O2 /Qsave /Qinit:zero /fp:strict /fp:except /traceback /stand:f08  $(GITINFO)
-intel_win_32 : FCOMPL = ifort
-intel_win_32 : obj = cfast7_win_32
-intel_win_32 : setup_win $(objwin)
-	$(FCOMPL) -o $(obj) $(FFLAGS)  /F100000000 $(objwin)
-
 # 64 bit
 intel_win_64 : FFLAGS = /O2 /Qsave /Qinit:zero /fp:strict /fp:except /traceback /stand:f08  $(GITINFO)
 intel_win_64 : FCOMPL = ifort
@@ -113,33 +100,20 @@ intel_win_64_db : setup_win $(objwin)
 
 # ------------- Linux -------------------
 
-# 32 bit
-intel_linux_32 : FFLAGS = -fpp -m32 -O2 -save -zero -fp-model strict $(GITINFO)
-intel_linux_32 : FCOMPL = ifort
-intel_linux_32 : obj = cfast7_linux_32
-intel_linux_32 : $(objf)
-	$(FCOMPL) $(FFLAGS) -o $(obj) $(objf)
-
-intel_linux_32_db : FFLAGS = -m32 -check all -ftrapuv -warn unused -gen-interfaces -warn interfaces -O0 -save -zero -WB -traceback -g -fpe0 -fp-model strict -debug full $(GITINFO)
-intel_linux_32_db : FCOMPL = ifort
-intel_linux_32_db : obj = cfast7_linux_32_db
-intel_linux_32_db : setup $(obj)
-	$(FCOMPL) $(FFLAGS) -o $(obj) $(objf)
-
-# gnu linux
-gnu_linux : FFLAGS = -O2 -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
-gnu_linux : FCOMPL = gfortran
-gnu_linux : LFLAGS = 
-gnu_linux : obj = cfast7_linux_64
-gnu_linux : $(objfgnu)
+# gnu linux_64
+gnu_linux_64 : FFLAGS = -O2 -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
+gnu_linux_64 : FCOMPL = gfortran
+gnu_linux_64 : LFLAGS = 
+gnu_linux_64 : obj = cfast7_linux_64
+gnu_linux_64 : $(objfgnu)
 	$(FCOMPL) $(FFLAGS) -o $(obj) $(objfgnu)
 
 # gnu linux debug
-gnu_linux_db : FFLAGS = -O0 -Og -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
-gnu_linux_db : FCOMPL = gfortran
-gnu_linux_db : LFLAGS = 
-gnu_linux_db : obj = cfast7_linux_64_db
-gnu_linux_db : $(objfgnu)
+gnu_linux_64_db : FFLAGS = -O0 -Og -finit-local-zero -ffpe-trap=invalid,zero,overflow -fbacktrace $(GITINFOGNU)
+gnu_linux_64_db : FCOMPL = gfortran
+gnu_linux_64_db : LFLAGS = 
+gnu_linux_64_db : obj = cfast7_linux_64_db
+gnu_linux_64_db : $(objfgnu)
 	$(FCOMPL) $(FFLAGS) -o $(obj) $(objfgnu)
 
 # 64 bit
@@ -176,19 +150,6 @@ gnu_osx_64_db : obj = cfast7_osx_64_db
 gnu_osx_64_db : $(objfgnu)
 	$(FCOMPL) $(FFLAGS) -o $(obj) $(objfgnu)
 
-# 32 bit
-intel_osx_32 : FFLAGS = -fpp -O2 -save -zero  -m32 -heap-arrays -static-intel $(GITINFO)
-intel_osx_32 : FCOMPL = ifort
-intel_osx_32 : obj = cfast7_osx_32
-intel_osx_32 : $(objf)
-	$(FCOMPL) $(FFLAGS) -mmacosx-version-min=10.4 -o $(obj) $(objf)
-
-intel_osx_32_db : FFLAGS = -check -warn unused -O0 -save -zero -m32 -g -traceback -fpe:0 -fp-model strict -FR -WB $(GITINFO)
-intel_osx_32_db : FCOMPL = ifort
-intel_osx_32_db : obj = cfast7_osx_32_db
-intel_osx_32_db : setup $(obj)
-	$(FCOMPL) $(FFLAGS) -mmacosx-version-min=10.4 -o $(obj) $(objf)
-
 # 64 bit
 intel_osx_64 : FFLAGS = -fpp -O2 -save -zero -m64 -heap-arrays -static-intel -fp-model strict $(GITINFO)
 intel_osx_64 : FCOMPL = ifort