Remove CTBTO specific paths from general makefiles

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

flexpart_code/makefile.general.gfortran

@@ -12,9 +12,8 @@ DEFS =
 
 FC       = gfortran
 
-# devlan
-INCPATH  = /dvl/atm/software/local/include
-LIBPATH1 = /dvl/atm/software/usr/lib
+INCPATH  = /usr/local/include
+LIBPATH1 = /usr/local/lib
 LIBPATH2 = /usr/lib/x86_64-linux-gnu
 
 

flexpart_code/makefile.general.ifort

 SHELL = /bin/bash
-FLEXPART_EXECUTABLE = flexpart_ifort   
+FLEXPART_EXECUTABLE = flexpart_ifort
 GRIB2FLEXPART_EXECUTABLE = grib2flexpart_ifort
 
 #############################################
 #DEFS = -DCTBTO
-DEFS = -DCTBTO
 #############################################
 
-# Set up for devlan ifort
-INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
-GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.12.3
+INTEL_ROOT = /usr/local/intel/composer_xe_2013.2.146
+GRIB_API_ROOT = /usr/local/src/ifort_grib_api/grib_api-1.12.3
 
-FC       = $(INTEL_ROOT)/bin/ifort
+FC = $(INTEL_ROOT)/bin/ifort
 
 INCPATH = $(GRIB_API_ROOT)/fortran
 LIBPATH1 = $(GRIB_API_ROOT)/fortran/.libs