Changeset 4c0504c in flexpart.git


Ignore:
Timestamp:
Jun 27, 2017, 3:12:39 PM (7 years ago)
Author:
Gerald Klinkl <gerald.klinkl@…>
Branches:
FPv9.3.2, grib2nc4_repair
Children:
8624a75
Parents:
e4c6b7c
Message:

Remove CTBTO specific paths from general makefiles

Location:
flexpart_code
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • flexpart_code/makefile.general.gfortran

    r1a933f2 r4c0504c  
    55#############################################
    66#### Uncomment this to activate performance timing
    7 #DEFS = -DPERFTIMER -DCTBTO
    87#DEFS = -DPERFTIMER
    9 # DEFS = -DCTBTO
    10 DEFS =
    118#############################################
    129
    1310FC       = gfortran
     11PREFIX ?= /usr/local
    1412
    15 GRIB_API_ROOT = /dvlscratch/ATM/morton/usr/local/grib_api
     13INCPATH = $(PREFIX)/include
     14LIBPATH1 = -L$(PREFIX)/lib
    1615
    17 # NetCDF4 stuff
    18 NC4_ROOT = /dvlscratch/ATM/morton/usr/local
    19 NC4_INCLUDE_FLAGS = -I${NC4_ROOT}/netcdf-fortran-4.4.3/include
    20 NC4_LIB_FLAGS = -Wl,-rpath=${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
    21                 -L${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
    22                 -lnetcdff \
    23                 -Wl,-rpath=${NC4_ROOT}/netcdf-c-4.4.0/lib \
    24                 -L${NC4_ROOT}/netcdf-c-4.4.0/lib \
    25                 -lnetcdf -lnetcdf
     16## INTEL_ROOT=/path/to/intel/compiler/root
     17## FC = $(INTEL_ROOT)/bin/ifort
     18## LIBPATH2 = -Wl,-rpath=${INTEL_ROOT}/lib/intel64 -L${INTEL_ROOT}/lib/intel64
    2619
     20## FFLAGS   =   -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
     21## default is 4 for frecord-marker
     22FFLAGS   =   -O2 -mcmodel=medium -fconvert=little-endian -I$(INCPATH)
    2723
    28 INCPATH  = ${GRIB_API_ROOT}/include
    29 LIBPATH1 = ${GRIB_API_ROOT}/lib
    30 #LIBPATH2 =
    31 
    32 FFLAGS   =   -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) ${NC4_INCLUDE_FLAGS}
    33 
    34 LDFLAGS  = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper ${NC4_LIB_FLAGS}
     24LDFLAGS = $(FFLAGS) $(LIBPATH2) $(LIBPATH1) -lgrib_api_f90 -lgrib_api -ljasper -lnetcdff -lnetcdf -lnetcdf -lhdf5_hl -lhdf5 -ldl -lm -lcurl
    3525
    3626
  • flexpart_code/makefile.general.ifort

    r1a933f2 r4c0504c  
    44
    55#############################################
    6 # DEFS = -DCTBTO
     6#### Uncomment this to activate performance timing
     7#DEFS = -DPERFTIMER
    78#############################################
    89
    9 INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
    10 GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.14.2
    11 NC4_ROOT = /dvlscratch/ATM/morton/usrifort/local
     10FC ?= ifort
     11PREFIX ?= /usr/local
    1212
     13INCPATH = $(PREFIX)/include
     14LIBPATH1 = -L$(PREFIX)/lib
    1315
     16## INTEL_ROOT=/path/to/intel/compiler/root
     17## FC = $(INTEL_ROOT)/bin/ifort
     18## LIBPATH2 = -Wl,-rpath=${INTEL_ROOT}/lib/intel64 -L${INTEL_ROOT}/lib/intel64
    1419
    15 FC = $(INTEL_ROOT)/bin/ifort
     20FFLAGS   =   -O2 -mcmodel=medium -convert little_endian -I$(INCPATH)
    1621
    17 INCPATH = $(GRIB_API_ROOT)/fortran
    18 LIBPATH1 = $(GRIB_API_ROOT)/fortran/.libs
    19 LIBPATH2 = $(GRIB_API_ROOT)/src/.libs
    20 
    21 LIBNC4_INCLUDES = -I${NC4_ROOT}/netcdf-fortran-4.4.3/include
    22 LIBNC4_FLAGS = -Wl,-rpath=${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
    23                     -L${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
    24                     -lnetcdff \
    25                     -Wl,-rpath=${NC4_ROOT}/netcdf-c-4.4.0/lib \
    26                     -L${NC4_ROOT}/netcdf-c-4.4.0/lib \
    27                     -lnetcdf -lnetcdf  \
    28                     -Wl,-rpath=${INTEL_ROOT}/lib/intel64 \
    29                     -L${INTEL_ROOT}//lib/intel64 \
    30                     -lifport -lifcore -limf -lsvml -lintlc
    31 
    32 
    33 
    34 FFLAGS   =   -O2 -mcmodel=medium -convert little_endian -I$(INCPATH) \
    35              ${LIBNC4_INCLUDES}
    36 
    37 LDFLAGS  = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper ${LIBNC4_FLAGS}
     22LDFLAGS = $(FFLAGS) $(LIBPATH2) $(LIBPATH1) -lgrib_api_f90 -lgrib_api -ljasper -lnetcdff -lnetcdf -lnetcdf -lhdf5_hl -lhdf5 -ldl -lm -lcurl
    3823
    3924
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG