Changeset fe32dca in flexpart.git for src/makefile

Timestamp:

Oct 9, 2017, 11:25:07 AM (7 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

027e844

Parents:

47f96e5

Message:

Renamed lnokernel, corrected default setting.

File:

• src/makefile (modified) (2 diffs)

src/makefile

@@ -48 +48 @@
 
 ifeq ($(gcc), 4.9)
-# Compiled libraries under users ~flexpart, gfortran v4.9
+# Compiled libraries under user ~flexpart, gfortran v4.9
         ROOT_DIR = /homevip/flexpart/
-#       ROOT_DIR = /homevip/espen/
 
         F90       = ${ROOT_DIR}/gcc-4.9.1/bin/gfortran
@@ -58 +57 @@
         INCPATH2  = ${ROOT_DIR}/include
         LIBPATH1 = ${ROOT_DIR}/lib
+
+else ifeq ($(gcc), 5.4)
+# Compiled libraries under user ~flexpart, gfortran v5.4
+        ROOT_DIR = /homevip/flexpart/
+
+        F90       = /usr/bin/gfortran
+        MPIF90    = /usr/bin/mpifort
+
+        INCPATH1  = ${ROOT_DIR}/gcc-5.4.0/include       
+        INCPATH2  = /usr/include
+        LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
 
 else