Commit fb7048427de72ef0554543198b40b1e674b76f7a

Authored by dumoda01
1 parent 09c96ba7
Exists in master and in 1 other branch snow

Nettoyage du fichier Rules.make

Showing 1 changed file with 30 additions and 36 deletions   Show diff stats
src/Rules.make
... ... @@ -12,75 +12,69 @@ endif
12 12  
13 13 # Force this here. Could be done in bashrc.
14 14 #FORTRAN_COMPILER=PGF90
15   -FORTRAN_COMPILER=GFORTRAN
  15 +#FORTRAN_COMPILER=GFORTRAN
  16 +FORTRAN_COMPILER=IFORT
16 17  
17 18 DEFINES=-DNUDGE_VEL
18 19 DEFINES=-D$(FORTRAN_COMPILER)
19 20  
20 21 # What do we include in this compilation
21   -#NetCDF=false
22   -NetCDF=true
23   -SEDIMENT=false
24   -#SEDIMENT=true
25   -SEAGRASS=false
26   -#SEAGRASS=true
27   -#BIO=false
28   -BIO=true
29   -
30   -FEATURES =
31   -FEATURE_LIBS =
32   -EXTRA_LIBS =
33   -INCDIRS =
34   -LDFLAGS =
  22 +NetCDF = true
  23 +SEDIMENT = false
  24 +SEAGRASS = false
  25 +BIO = true
  26 +
  27 +FEATURES =
  28 +FEATURE_LIBS =
  29 +EXTRA_LIBS =
  30 +INCDIRS =
  31 +LDFLAGS =
35 32  
36 33 # If we want NetCDF - where are the include files and the library
37   -#NETCDFINC = /opt/cray/netCDF/3.6.2/netCDF-pgi/include
38   -#NETCDFLIBDIR = /opt/cray/netCDF/3.6.2/netCDF-pgi/lib
  34 +NETCDFINC = /usr/local/include
  35 +NETCDFLIBDIR = /usr/local/lib
39 36  
40 37 ifdef NETCDFINC
41   -INCDIRS += -I$(NETCDFINC)
  38 +INCDIRS += -I$(NETCDFINC)
42 39 endif
43 40 ifdef NETCDFLIBNAME
44   -NETCDFLIB = $(NETCDFLIBNAME)
  41 +NETCDFLIB = $(NETCDFLIBNAME)
45 42 else
46   -NETCDFLIB = -lnetcdf
  43 +NETCDFLIB = -lnetcdf
47 44 endif
48 45 ifdef NETCDFLIBDIR
49   -LDFLAGS += -L$(NETCDFLIBDIR)
  46 +LDFLAGS += -L$(NETCDFLIBDIR)
50 47 endif
51 48  
52   -#
53 49 # phony targets
54   -#
55 50 .PHONY: clean realclean distclean dummy
56 51  
57 52 # Top of this version of GOTM.
58 53 ifndef GOTMDIR
59   -#GOTMDIR := $(HOME)/Progs/gotm/gotm-4.0.0
60   -GOTMDIR := /Users/nersc/Documents/Modeles/gotm_ismer
  54 +GOTMDIR := $(HOME)/gotm_ismer
61 55 endif
62 56  
63   -CPP = /usr/bin/cpp
  57 +CPP = /usr/bin/cpp
64 58  
65 59 # Here you can put defines for the [c|f]pp - some will also be set depending
66 60 # on compilation mode.
67 61 ifeq ($(NetCDF),true)
68   -DEFINES += -DNETCDF_FMT
69   -EXTRA_LIBS += $(NETCDFLIB)
  62 +DEFINES += -DNETCDF_FMT
  63 +EXTRA_LIBS += $(NETCDFLIB)
70 64 endif
71 65 ifeq ($(SEDIMENT),true)
72   -DEFINES += -DSEDIMENT
73   -FEATURES += extras/sediment
  66 +DEFINES += -DSEDIMENT
  67 +FEATURES += extras/sediment
74 68 FEATURE_LIBS += -lsediment$(buildtype)
75 69 endif
76 70 ifeq ($(SEAGRASS),true)
77   -DEFINES += -DSEAGRASS
78   -FEATURES += extras/seagrass
  71 +DEFINES += -DSEAGRASS
  72 +FEATURES += extras/seagrass
79 73 FEATURE_LIBS += -lseagrass$(buildtype)
80 74 endif
81 75 ifeq ($(BIO),true)
82   -DEFINES += -DBIO
83   -FEATURES += extras/bio
  76 +DEFINES += -DBIO
  77 +FEATURES += extras/bio
84 78 FEATURE_LIBS += -lbio$(buildtype)
85 79 endif
86 80  
... ... @@ -91,14 +85,14 @@ BINDIR = $(GOTMDIR)/bin
91 85 endif
92 86  
93 87 ifndef LIBDIR
94   -LIBDIR += $(GOTMDIR)/lib/$(FORTRAN_COMPILER)
  88 +LIBDIR += $(GOTMDIR)/lib/$(FORTRAN_COMPILER)
95 89 endif
96 90  
97 91 ifndef MODDIR
98 92 #MODDIR = $(GOTMDIR)/modules
99 93 MODDIR = $(GOTMDIR)/modules/$(FORTRAN_COMPILER)
100 94 endif
101   -INCDIRS += -I/usr/local/include -I/opt/cray/netCDF/3.6.2/netCDF-pgi/include -I$(GOTMDIR)/include -I$(MODDIR)
  95 +INCDIRS += -I/usr/local/include -I$(GOTMDIR)/include -I$(MODDIR)
102 96  
103 97 # Normaly this should not be changed - unless you want something very specific.
104 98  
... ...