From 1a933f2341ba7795cf41e9560baad813d31355b9 Mon Sep 17 00:00:00 2001
From: Don Morton <Don.Morton@borealscicomp.com>
Date: Thu, 27 Apr 2017 13:50:43 +0000
Subject: [PATCH] Added and tested three Makefiles for FPv9.3.2
---
...ral.ifort.tmpsave => makefile.ctbto.ifort} | 26 +++++++++++++++----
flexpart_code/makefile.general.gfortran | 11 +++-----
flexpart_code/makefile.general.ifort | 17 +++++-------
3 files changed, 32 insertions(+), 22 deletions(-)
rename flexpart_code/{makefile.general.ifort.tmpsave => makefile.ctbto.ifort} (80%)
diff --git a/flexpart_code/makefile.general.ifort.tmpsave b/flexpart_code/makefile.ctbto.ifort
similarity index 80%
rename from flexpart_code/makefile.general.ifort.tmpsave
rename to flexpart_code/makefile.ctbto.ifort
index bdf2a675..ea8e37d9 100644
--- a/flexpart_code/makefile.general.ifort.tmpsave
+++ b/flexpart_code/makefile.ctbto.ifort
@@ -3,11 +3,14 @@ FLEXPART_EXECUTABLE = flexpart_ifort
GRIB2FLEXPART_EXECUTABLE = grib2flexpart_ifort
#############################################
-#DEFS = -DCTBTO
+DEFS = -DCTBTO
#############################################
-INTEL_ROOT = /usr/local/intel/composer_xe_2013.2.146
-GRIB_API_ROOT = /usr/local/src/ifort_grib_api/grib_api-1.12.3
+INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
+GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.12.3
+NC4_ROOT = /dvlscratch/ATM/morton/usrifort/local
+
+
FC = $(INTEL_ROOT)/bin/ifort
@@ -15,10 +18,23 @@ INCPATH = $(GRIB_API_ROOT)/fortran
LIBPATH1 = $(GRIB_API_ROOT)/fortran/.libs
LIBPATH2 = $(GRIB_API_ROOT)/src/.libs
+LIBNC4_INCLUDES = -I${NC4_ROOT}/netcdf-fortran-4.4.3/include
+LIBNC4_FLAGS = -Wl,-rpath=${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
+ -L${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
+ -lnetcdff \
+ -Wl,-rpath=${NC4_ROOT}/netcdf-c-4.4.0/lib \
+ -L${NC4_ROOT}/netcdf-c-4.4.0/lib \
+ -lnetcdf -lnetcdf \
+ -Wl,-rpath=${INTEL_ROOT}/lib/intel64 \
+ -L${INTEL_ROOT}//lib/intel64 \
+ -lifport -lifcore -limf -lsvml -lintlc
+
+
-FFLAGS = -O2 -mcmodel=medium -convert little_endian -I$(INCPATH)
+FFLAGS = -O2 -mcmodel=medium -convert little_endian -I$(INCPATH) \
+ ${LIBNC4_INCLUDES}
-LDFLAGS = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
+LDFLAGS = ${FFLAGS} -L$(LIBPATH1) -L$(LIBPATH2) -lgrib_api_f90 -lgrib_api -lm -ljasper ${LIBNC4_FLAGS}
MODOBJS = \
diff --git a/flexpart_code/makefile.general.gfortran b/flexpart_code/makefile.general.gfortran
index a183dd20..6acf7415 100644
--- a/flexpart_code/makefile.general.gfortran
+++ b/flexpart_code/makefile.general.gfortran
@@ -12,9 +12,7 @@ DEFS =
FC = gfortran
-INCPATH = /usr/local/include
-LIBPATH1 = /usr/local/lib
-LIBPATH2 = /usr/lib/x86_64-linux-gnu
+GRIB_API_ROOT = /dvlscratch/ATM/morton/usr/local/grib_api
# NetCDF4 stuff
NC4_ROOT = /dvlscratch/ATM/morton/usr/local
@@ -27,10 +25,9 @@ NC4_LIB_FLAGS = -Wl,-rpath=${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
-lnetcdf -lnetcdf
-# alaskawx
-#INCPATH = /opt/grib-api/include
-#LIBPATH1 = /opt/grib-api/lib
-#LIBPATH2 = /usr/lib/x86_64-linux-gnu
+INCPATH = ${GRIB_API_ROOT}/include
+LIBPATH1 = ${GRIB_API_ROOT}/lib
+#LIBPATH2 =
FFLAGS = -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) ${NC4_INCLUDE_FLAGS}
diff --git a/flexpart_code/makefile.general.ifort b/flexpart_code/makefile.general.ifort
index d0ea70a8..b7fe070d 100644
--- a/flexpart_code/makefile.general.ifort
+++ b/flexpart_code/makefile.general.ifort
@@ -3,26 +3,23 @@ FLEXPART_EXECUTABLE = flexpart_ifort
GRIB2FLEXPART_EXECUTABLE = grib2flexpart_ifort
#############################################
-#DEFS = -DCTBTO
+# DEFS = -DCTBTO
#############################################
INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
-GRIB_API_ROOT = /dvl/atm/klinkl/software/local
+GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.14.2
NC4_ROOT = /dvlscratch/ATM/morton/usrifort/local
FC = $(INTEL_ROOT)/bin/ifort
-#INCPATH = $(GRIB_API_ROOT)/fortran
-INCPATH = $(GRIB_API_ROOT)/include
-#LIBPATH1 = $(GRIB_API_ROOT)/fortran/.libs
-LIBPATH1 = $(GRIB_API_ROOT)/lib
-#LIBPATH2 = $(GRIB_API_ROOT)/src/.libs
-LIBPATH2 =
+INCPATH = $(GRIB_API_ROOT)/fortran
+LIBPATH1 = $(GRIB_API_ROOT)/fortran/.libs
+LIBPATH2 = $(GRIB_API_ROOT)/src/.libs
LIBNC4_INCLUDES = -I${NC4_ROOT}/netcdf-fortran-4.4.3/include
-LIBNC4_FLAGS = -Wl, -rpath=${NC4_ROOT} /netcdf-fortran-4.4.3/lib \
+LIBNC4_FLAGS = -Wl,-rpath=${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
-L${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
-lnetcdff \
-Wl,-rpath=${NC4_ROOT}/netcdf-c-4.4.0/lib \
@@ -37,7 +34,7 @@ LIBNC4_FLAGS = -Wl, -rpath=${NC4_ROOT} /netcdf-fortran-4.4.3/lib \
FFLAGS = -O2 -mcmodel=medium -convert little_endian -I$(INCPATH) \
${LIBNC4_INCLUDES}
-LDFLAGS = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) ${LIBNC4_FLAGS} -lgrib_api_f90 -lgrib_api -lm -ljasper
+LDFLAGS = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper ${LIBNC4_FLAGS}
MODOBJS = \
--
GitLab