From ced5d274f0e78ffb0d5892cf12addea47320a902 Mon Sep 17 00:00:00 2001
From: anphi <anne.philipp@univie.ac.at>
Date: Wed, 28 Nov 2018 17:36:48 +0100
Subject: [PATCH] updated fortran makefiles
---
src/Makefile.CRAY | 9 ++----
src/Makefile.gfortran | 11 ++-----
src/Makefile.ifort | 61 -------------------------------------
src/Makefile.local.gfortran | 10 +++---
src/Makefile.local.ifort | 14 ++++-----
5 files changed, 17 insertions(+), 88 deletions(-)
delete mode 100644 src/Makefile.ifort
diff --git a/src/Makefile.CRAY b/src/Makefile.CRAY
index 6ed57be..09b13b6 100644
--- a/src/Makefile.CRAY
+++ b/src/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)
@@ -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/src/Makefile.gfortran b/src/Makefile.gfortran
index 58923fa..da5ea1c 100644
--- a/src/Makefile.gfortran
+++ b/src/Makefile.gfortran
@@ -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 = -g
DEBUG = -g
LIB = $(GRIB_API_LIB) $(EMOSLIB)
@@ -40,7 +35,7 @@ EXE = CONVERT2
all: ${EXE}
clean:
- rm *.o
+ rm *.o *.mod ${EXE}
phgrreal.o: phgrreal.f
$(F90C) -c -g -O3 -fopenmp phgrreal.f
@@ -51,8 +46,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/src/Makefile.ifort b/src/Makefile.ifort
deleted file mode 100644
index 038a168..0000000
--- a/src/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/src/Makefile.local.gfortran b/src/Makefile.local.gfortran
index e342d96..6041bcb 100644
--- a/src/Makefile.local.gfortran
+++ b/src/Makefile.local.gfortran
@@ -29,7 +29,7 @@ LDFLAGS = $(OPT)
BINDIR = .
-EXE = CONVERT2
+EXE = CONVERT2
.f.o:
@@ -37,10 +37,10 @@ EXE = CONVERT2
.f90.o:
$(F90C) -c $(F90FLAGS) $(DEBUG) $*.f90
-all: ${EXE}
+all: $(EXE)
clean:
- rm *.o
+ rm *.o *.mod ${EXE}
phgrreal.o: phgrreal.f
$(F90C) -c -g -O3 -fopenmp phgrreal.f
@@ -51,8 +51,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/src/Makefile.local.ifort b/src/Makefile.local.ifort
index 206863f..5198780 100644
--- a/src/Makefile.local.ifort
+++ b/src/Makefile.local.ifort
@@ -11,15 +11,15 @@
.s .s~ .sh .sh~ .h .h~ .C .C~ .a
-GRIB_API_INCLUDE_DIR=/usr/local/ifort/grib_api-1.14.3//include
-GRIB_API_LIB=-openmp -L/usr/local/ifort/grib_api-1.14.3/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper #-lopenjpeg
+GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/grib_api-1.12.3_ifort/include
+GRIB_API_LIB=-openmp -L/home/srvx1/tmc/TestEnv/Libraries/grib_api-1.12.3_ifort/lib -Bstatic -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic -lm -ljasper
OPT = -g
DEBUG = -g
LIB = $(GRIB_API_LIB) -lemosR64 -lgfortran
-FC=ifort -132 -traceback -r8
-F90C=ifort -132 -traceback -r8
+FC=/opt/intel/bin/ifort -132 -traceback -r8
+F90C=/opt/intel/bin/ifort -132 -traceback -r8
FFLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR)
F90FLAGS = $(OPT) -I. -I$(GRIB_API_INCLUDE_DIR)
@@ -39,7 +39,7 @@ EXE = CONVERT2
all: ${EXE}
clean:
- rm *.o
+ rm *.o *.mod ${EXE}
phgrreal.o: phgrreal.f
$(F90C) -c -g -O3 -fopenmp phgrreal.f
@@ -50,8 +50,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}
###############################################################################
--
GitLab