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

File:

• src/makefile (modified) (6 diffs)

src/makefile

@@ -31 +31 @@
 #      make [-j] mpi-dbg
 #
-#  NETCDF OUTPUT
-#    To add support for output in netCDF format, append `ncf=yes` to the
-#    `make` command
-# 
 ################################################################################
 
@@ -61 +57 @@
         INCPATH2  = ${ROOT_DIR}/include
         LIBPATH1 = ${ROOT_DIR}/lib
-else 
+
+else #ifeq ($(gcc), 5.4)
 # Compiled libraries under user ~flexpart, gfortran v5.4
         ROOT_DIR = /homevip/flexpart/
@@ -71 +68 @@
         INCPATH2  = /usr/include
         LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
+
+#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
 endif
-
-
-### Enable netCDF output?
-ifeq ($(ncf), yes)
-        NCOPT = -DUSE_NCF -lnetcdff     
-else
-        NCOPT = -UUSE_NCF
-endif
-
 
 
@@ -92 +89 @@
 
 ## LIBRARIES
-#LIBS = -lgrib_api_f90 -lgrib_api -lm -ljasper -lnetcdff
-LIBS = -lgrib_api_f90 -lgrib_api -lm -ljasper $(NCOPT)
-
-FFLAGS   = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) $(NCOPT) $(FUSER)  #-Warray-bounds -fcheck=all # -march=native
-
-DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) $(NCOPT) -fbacktrace   -Wall  -fdump-core $(FUSER)  #  -ffpe-trap=invalid,overflow,denormal,underflow,zero  -Warray-bounds -fcheck=all
+LIBS = -lgrib_api_f90 -lgrib_api -lm -ljasper -lnetcdff # -fopenmp
+
+FFLAGS   = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) $(FUSER)  #-Warray-bounds -fcheck=all # -march=native
+
+DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace   -Wall  -fdump-core $(FUSER)  #  -ffpe-trap=invalid,overflow,denormal,underflow,zero  -Warray-bounds -fcheck=all
 
 LDFLAGS  = $(FFLAGS) -L$(LIBPATH1) -Wl,-rpath,$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
@@ -143 +139 @@
         getfields_mpi.o \
         readwind_ecmwf_mpi.o 
-
-OBJECTS_NCF = netcdf_output_mod.o
 
 OBJECTS = \
@@ -202 +196 @@
 dynamic_viscosity.o     get_settling.o  \
 initialize_cbl_vel.o    re_initialize_particle.o \
-cbl.o
-
-ifeq ($(ncf), yes)
-        OBJECTS := $(OBJECTS) $(OBJECTS_NCF)
-endif
+cbl.o                   netcdf_output_mod.o
 
 %.o: %.mod