Changeset 8083347 in flexpart.git


Ignore:
Timestamp:
Oct 20, 2016, 1:48:57 PM (8 years ago)
Author:
Gerald Klinkl <gerald.klinkl@…>
Branches:
FPv9.3.1, FPv9.3.2, fp9.3.1-20161214-nc4, grib2nc4_repair
Children:
64c820a
Parents:
cb8ddf8
Message:

Remove CTBTO specific paths from general makefiles

Also remove -DCTBTO from DEFS in makefile.general.ifort

Location:
flexpart_code
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • flexpart_code/makefile.general.gfortran

    r403dde7 r8083347  
    1313FC       = gfortran
    1414
    15 # devlan
    16 INCPATH  = /dvl/atm/software/local/include
    17 LIBPATH1 = /dvl/atm/software/usr/lib
     15INCPATH  = /usr/local/include
     16LIBPATH1 = /usr/local/lib
    1817LIBPATH2 = /usr/lib/x86_64-linux-gnu
    1918

  • flexpart_code/makefile.general.ifort

    r57a9cce r8083347  
    11SHELL = /bin/bash
    2 FLEXPART_EXECUTABLE = flexpart_ifort   
     2FLEXPART_EXECUTABLE = flexpart_ifort
    33GRIB2FLEXPART_EXECUTABLE = grib2flexpart_ifort
    44
    55#############################################
    66#DEFS = -DCTBTO
    7 DEFS = -DCTBTO
    87#############################################
    98
    10 # Set up for devlan ifort
    11 INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
    12 GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.12.3
     9INTEL_ROOT = /usr/local/intel/composer_xe_2013.2.146
     10GRIB_API_ROOT = /usr/local/src/ifort_grib_api/grib_api-1.12.3
    1311
    14 FC       = $(INTEL_ROOT)/bin/ifort
     12FC = $(INTEL_ROOT)/bin/ifort
    1513
    1614INCPATH = $(GRIB_API_ROOT)/fortran
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG