Changeset a9cf4b1 in flexpart.git for src/makefile

Timestamp:

Apr 5, 2018, 12:30:54 PM (6 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:

3f149cc

Parents:

8fcfd08

Message:

Made enabling netCDF output during compilation optional

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
+# 
 ################################################################################
 
@@ -57 +61 @@
         INCPATH2  = ${ROOT_DIR}/include
         LIBPATH1 = ${ROOT_DIR}/lib
-
-else #ifeq ($(gcc), 5.4)
+else 
 # Compiled libraries under user ~flexpart, gfortran v5.4
         ROOT_DIR = /homevip/flexpart/
@@ -68 +71 @@
         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
+
 
 
@@ -89 +92 @@
 
 ## LIBRARIES
-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
+#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
 
 LDFLAGS  = $(FFLAGS) -L$(LIBPATH1) -Wl,-rpath,$(LIBPATH1) $(LIBS) #-L$(LIBPATH2)
@@ -139 +143 @@
         getfields_mpi.o \
         readwind_ecmwf_mpi.o 
+
+OBJECTS_NCF = netcdf_output_mod.o
 
 OBJECTS = \
@@ -196 +202 @@
 dynamic_viscosity.o     get_settling.o  \
 initialize_cbl_vel.o    re_initialize_particle.o \
-cbl.o                   netcdf_output_mod.o
+cbl.o
+
+ifeq ($(ncf), yes)
+        OBJECTS := $(OBJECTS) $(OBJECTS_NCF)
+endif
 
 %.o: %.mod