Changeset 2c967c1 in flexpart.git for src/makefile.laptop

Timestamp:

Oct 14, 2015, 7:37:08 AM (9 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Children:

dd21a0e

Parents:

17bfbe1

Message:

fix conflict after pulling dev version over unsaved changes on laptop conf. Run preliminary tests on Yosemite

File:

• src/makefile.laptop (modified) (1 diff)

src/makefile.laptop

@@ -11 +11 @@
 #FFLAGS   =   -O2 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
 
-#options for Lion
-#libs_dir=/Users/ignacio_in_EBCRPA/flexpart/libs/
+#options for Lion/Mavericks/Yosemite``
 libs_dir=/Users/ignacio/flexpart/libs/
-INCPATH  = $(libs_dir)/grib_api-1.12.3_dir/include
-LIBPATH1 = $(libs_dir)/grib_api-1.12.3_dir/lib
+INCPATH  = $(libs_dir)/grib_api-1.13.1_dir_gfortran_5.1/include
+LIBPATH1 = $(libs_dir)/grib_api-1.13.1_dir_gfortran_5.1/lib
 LIBPATH2 = $(libs_dir)/jasper_dir/lib