diff --git a/source/fortran/Makefile.CRAY b/source/fortran/Makefile.CRAY index 6ed57be95245136e040e65c5964a2ef4f93d48f9..cf851930dff3ad62abf6f30f16e3926d43b208b2 100644 --- a/source/fortran/Makefile.CRAY +++ b/source/fortran/Makefile.CRAY @@ -10,11 +10,6 @@ .SUFFIXES: .o .c .c~ .f .f~ .F90 .f90 .f90~ .f95 .f95~ .F .F~ .y .y~ .l .l~ \ .s .s~ .sh .sh~ .h .h~ .C .C~ .a - -#GRIB_API_INCLUDE_DIR=/usr/local/gcc-4.9.3/grib1.12.3//include -#GRIB_API_LIB=-openmp -L/usr/local/gcc-4.9.3/grib1.12.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper -#EMOSLIB=-lemosR64 - OPT = DEBUG = -g LIB = $(GRIB_API_LIBS) $(EMOSLIB) @@ -40,7 +35,7 @@ EXE = CONVERT2 all: ${EXE} clean: - rm *.o + rm *.o *.mod ${EXE} phgrreal.o: phgrreal.f $(F90C) -c -g -O3 phgrreal.f @@ -51,8 +46,8 @@ grphreal.o: grphreal.f ftrafo.o: ftrafo.f $(F90C) -c -g -O3 ftrafo.f -$(BINDIR)/CONVERT2: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o - $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} +$(BINDIR)/${EXE}: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o + $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/${EXE} ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} ############################################################################### diff --git a/source/fortran/Makefile.gfortran b/source/fortran/Makefile.gfortran index 15465c4df74c31301c35045adc36e4c1487609a0..431bc2794d4ba91a7ac2231ebb5a5d42674c7f8c 100644 --- a/source/fortran/Makefile.gfortran +++ b/source/fortran/Makefile.gfortran @@ -12,16 +12,14 @@ OPT = -g DEBUG = -g -LIB = $(GRIB_API_LIB) $(EMOSLIB) -#$(ECCODES_LIB) +LIB = $(ECCODES_LIB) $(EMOSLIB) FC=gfortran -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore -ffixed-line-length-132 -fopenmp -fconvert=big-endian F90C=gfortran -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore -ffixed-line-length-132 -fopenmp -fconvert=big-endian -FFLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) -#-I$(ECCODES_INCLUDE_DIR) -F90FLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) -#-I$(ECCODES_INCLUDE_DIR) +FFLAGS = $(OPT) -I. -I$(ECCODES_INCLUDE_DIR) + +F90FLAGS = $(OPT) -I. -I$(ECCODES_INCLUDE_DIR) LDFLAGS = $(OPT) @@ -38,7 +36,7 @@ EXE = CONVERT2 all: ${EXE} clean: - rm *.o + rm *.o *.mod ${EXE} phgrreal.o: phgrreal.f $(F90C) -c -g -O3 -fopenmp phgrreal.f diff --git a/source/fortran/Makefile.ifort b/source/fortran/Makefile.ifort deleted file mode 100644 index 038a1689708cdf956c1f3a89621d3cad58654414..0000000000000000000000000000000000000000 --- a/source/fortran/Makefile.ifort +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################### -# -# Top level Makefile for ECMWFDATA7.0 software -# -# Last modified: December 1, 2015 -# -############################################################################### - - -.SUFFIXES: .o .c .c~ .f .f~ .F90 .f90 .f90~ .f95 .f95~ .F .F~ .y .y~ .l .l~ \ - .s .s~ .sh .sh~ .h .h~ .C .C~ .a - - -#GRIB_API_INCLUDE_DIR=/usr/local/ifort/grib1.12.3//include -#GRIB_API_LIB=-openmp -L/usr/local/ifort/grib1.12.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper - -OPT = -g -DEBUG = -g -LIB = $(GRIB_API_LIBS) -lemosR64 -lgfortran - -FC=ifort -132 -traceback -r8 -F90C=ifort -132 -traceback -r8 - -FFLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) -F90FLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) - -LDFLAGS = $(OPT) - -BINDIR = . - -EXE = CONVERT2 - - -.f.o: - $(F90C) -c $(F90FLAGS) -132 $(DEBUG) $*.f -.f90.o: - $(F90C) -c $(F90FLAGS) -132 $(DEBUG) $*.f90 - -all: ${EXE} - -clean: - rm *.o - -phgrreal.o: phgrreal.f - $(F90C) -c -g -O3 -fopenmp phgrreal.f - -grphreal.o: grphreal.f - $(F90C) -c -g -O3 -fopenmp grphreal.f - -ftrafo.o: ftrafo.f - $(F90C) -c -g -O3 -fopenmp ftrafo.f - -$(BINDIR)/CONVERT2: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o - $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} - - -############################################################################### -# -# End of the Makefile -# -############################################################################### diff --git a/source/fortran/Makefile.local.gfortran b/source/fortran/Makefile.local.gfortran index f416f5e3faa7fb390a546d513421793d8f7c8e7d..7853267de92e8027d0fa60ef4c25d7b62fdd866b 100644 --- a/source/fortran/Makefile.local.gfortran +++ b/source/fortran/Makefile.local.gfortran @@ -11,7 +11,7 @@ .s .s~ .sh .sh~ .h .h~ .C .C~ .a -GRIB_API_INCLUDE_DIR=/usr/local/gcc-4.9.3/grib_api-1.14.3//include +GRIB_API_INCLUDE_DIR=/usr/local/gcc-4.9.3/grib_api-1.14.3/include GRIB_API_LIB= -L/usr/local/gcc-4.9.3/grib_api-1.14.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper #GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/include @@ -45,7 +45,7 @@ EXE = CONVERT2 all: ${EXE} clean: - rm *.o *.mod CONVERT2 + rm *.o *.mod ${EXE} phgrreal.o: phgrreal.f $(F90C) -c -g -O3 -fopenmp phgrreal.f @@ -56,8 +56,8 @@ grphreal.o: grphreal.f ftrafo.o: ftrafo.f $(F90C) -c -g -O3 -fopenmp ftrafo.f -$(BINDIR)/CONVERT2: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o - $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} +$(BINDIR)/${EXE}: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o + $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/${EXE} ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} ############################################################################### diff --git a/source/fortran/Makefile.local.ifort b/source/fortran/Makefile.local.ifort index 6f58a3532815bb2766f1bcd5fb2677958eaae355..d54e99554af499b36e1b5b5e4bd9d3adc3a0287e 100644 --- a/source/fortran/Makefile.local.ifort +++ b/source/fortran/Makefile.local.ifort @@ -10,16 +10,23 @@ .SUFFIXES: .o .c .c~ .f .f~ .F90 .f90 .f90~ .f95 .f95~ .F .F~ .y .y~ .l .l~ \ .s .s~ .sh .sh~ .h .h~ .C .C~ .a +#GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/grib_api-1.25.0_ifort/include +#GRIB_API_LIB=-L/home/srvx1/tmc/TestEnv/Libraries/grib_api-1.25.0_ifort/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper -qopenmp + +#GRIB_API_INCLUDE_DIR=/usr/local/ifort/grib1.12.3//include +#GRIB_API_LIBS=-openmp -L/usr/local/ifort/grib1.12.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper + + GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/include -GRIB_API_LIB= -L/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/lib -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper +GRIB_API_LIB= -L/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/lib -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper OPT = -g -O3 -mcmodel=medium -unroll -inline -heap-arrays 32 DEBUG = -g LIB = $(GRIB_API_LIB) -lemosR64 -lgfortran -FC=/opt/intel/bin/ifort -132 -traceback -r8 -F90C=/opt/intel/bin/ifort -132 -traceback -r8 +FC=/opt/intel/composerxe/bin/ifort -132 -traceback -r8 +F90C=/opt/intel/composerxe/bin/ifort -132 -traceback -r8 FFLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) F90FLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) @@ -39,7 +46,7 @@ EXE = CONVERT2 all: ${EXE} clean: - rm *.o + rm *.o *.mod ${EXE} phgrreal.o: phgrreal.f $(F90C) -c -g -O3 phgrreal.f @@ -50,8 +57,8 @@ grphreal.o: grphreal.f ftrafo.o: ftrafo.f $(F90C) -c -g -O3 ftrafo.f -$(BINDIR)/CONVERT2: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o - $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} +$(BINDIR)/${EXE}: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o + $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/${EXE} ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} ############################################################################### diff --git a/source/fortran/Makefile.new b/source/fortran/Makefile.new deleted file mode 100644 index 9953d130c88dbb3a07e54867ef5c700c12df799f..0000000000000000000000000000000000000000 --- a/source/fortran/Makefile.new +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################### -# -# Top level Makefile for ECMWFDATA7.0 software -# -# Last modified: December 1, 2015 -# -############################################################################### - - -.SUFFIXES: .o .c .c~ .f .f~ .F90 .f90 .f90~ .f95 .f95~ .F .F~ .y .y~ .l .l~ \ - .s .s~ .sh .sh~ .h .h~ .C .C~ .a - - -GRIB_API_INCLUDE_DIR=/usr/local/ifort/grib1.12.3//include -GRIB_API_LIBS=-openmp -L/usr/local/ifort/grib1.12.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper - -OPT = -g -DEBUG = -g -LIB = $(GRIB_API_LIBS) -lemosR64 - -FC=ifort -132 -traceback -r8 -F90C=ifort -132 -traceback -r8 - -FFLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) -F90FLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR) - -LDFLAGS = $(OPT) - -BINDIR = . - -EXE = CONVERT2 - - -.f.o: - $(F90C) -c $(F90FLAGS) -132 $(DEBUG) $*.f -.f90.o: - $(F90C) -c $(F90FLAGS) -132 $(DEBUG) $*.f90 - -all: ${EXE} - -clean: - rm *.o - -phgrreal.o: phgrreal.f - $(F90C) -c -g -O3 -fopenmp phgrreal.f - -grphreal.o: grphreal.f - $(F90C) -c -g -O3 -fopenmp grphreal.f - -ftrafo.o: ftrafo.f - $(F90C) -c -g -O3 -fopenmp ftrafo.f - -$(BINDIR)/CONVERT2: phgrreal.o grphreal.o ftrafo.o rwGRIB2.o posnam.o preconvert.o - $(F90C) $(DEBUG) $(OPT) -o $(BINDIR)/CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o ${LIB} - - -############################################################################### -# -# End of the Makefile -# -###############################################################################