Commit ccc9ec26 authored by Ignacio Pisso's avatar Ignacio Pisso
Browse files

Modify makefile to compile in njord by default (nordre is now phased out)

parent 01e60525
...@@ -57,7 +57,7 @@ ifeq ($(gcc), 4.9) ...@@ -57,7 +57,7 @@ ifeq ($(gcc), 4.9)
INCPATH2 = ${ROOT_DIR}/include INCPATH2 = ${ROOT_DIR}/include
LIBPATH1 = ${ROOT_DIR}/lib LIBPATH1 = ${ROOT_DIR}/lib
else ifeq ($(gcc), 5.4) else #ifeq ($(gcc), 5.4)
# Compiled libraries under user ~flexpart, gfortran v5.4 # Compiled libraries under user ~flexpart, gfortran v5.4
ROOT_DIR = /homevip/flexpart/ ROOT_DIR = /homevip/flexpart/
...@@ -68,14 +68,14 @@ else ifeq ($(gcc), 5.4) ...@@ -68,14 +68,14 @@ else ifeq ($(gcc), 5.4)
INCPATH2 = /usr/include INCPATH2 = /usr/include
LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
else #else
# Default: System libraries at NILU, gfortran v4.6 # Default: System libraries at NILU, gfortran v4.6
F90 = /usr/bin/gfortran # F90 = /usr/bin/gfortran
MPIF90 = /usr/bin/mpif90.openmpi # MPIF90 = /usr/bin/mpif90.openmpi
INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include # INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
INCPATH2 = /usr/include # INCPATH2 = /usr/include
LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib # LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
endif endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment