Changes in src/makefile [ccc9ec2:fe32dca] in flexpart.git

File:

• src/makefile (modified) (2 diffs)

src/makefile

@@ -58 +58 @@
         LIBPATH1 = ${ROOT_DIR}/lib
 
-else #ifeq ($(gcc), 5.4)
+else ifeq ($(gcc), 5.4)
 # Compiled libraries under user ~flexpart, gfortran v5.4
         ROOT_DIR = /homevip/flexpart/
@@ -69 +69 @@
         LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
 
-#else
+else
 # Default: System libraries at NILU, gfortran v4.6
-#       F90       = /usr/bin/gfortran
-#       MPIF90    = /usr/bin/mpif90.openmpi
-
-#       INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
-#       INCPATH2 = /usr/include
-#       LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
+        F90       = /usr/bin/gfortran
+        MPIF90    = /usr/bin/mpif90.openmpi
+
+        INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
+        INCPATH2 = /usr/include
+        LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
 endif