Nettoyage du fichier Rules.make

src/Rules.make

@@ -12,75 +12,69 @@ endif
 
 # Force this here. Could be done in bashrc.
 #FORTRAN_COMPILER=PGF90
-FORTRAN_COMPILER=GFORTRAN
+#FORTRAN_COMPILER=GFORTRAN
+FORTRAN_COMPILER=IFORT
 
 DEFINES=-DNUDGE_VEL
 DEFINES=-D$(FORTRAN_COMPILER)
 
 # What do we include in this compilation
-#NetCDF=false
-NetCDF=true
-SEDIMENT=false
-#SEDIMENT=true
-SEAGRASS=false
-#SEAGRASS=true
-#BIO=false
-BIO=true
-
-FEATURES	=
-FEATURE_LIBS	=
-EXTRA_LIBS	=
-INCDIRS		=
-LDFLAGS		=
+NetCDF   = true
+SEDIMENT = false
+SEAGRASS = false
+BIO      = true
+
+FEATURES     =
+FEATURE_LIBS =
+EXTRA_LIBS   =
+INCDIRS	     =
+LDFLAGS	     =
 
 # If we want NetCDF - where are the include files and the library
-#NETCDFINC    = /opt/cray/netCDF/3.6.2/netCDF-pgi/include 
-#NETCDFLIBDIR = /opt/cray/netCDF/3.6.2/netCDF-pgi/lib
+NETCDFINC    = /usr/local/include 
+NETCDFLIBDIR = /usr/local/lib
 
 ifdef NETCDFINC
-INCDIRS		+= -I$(NETCDFINC)
+INCDIRS     += -I$(NETCDFINC)
 endif
 ifdef NETCDFLIBNAME
-NETCDFLIB	= $(NETCDFLIBNAME)
+NETCDFLIB    = $(NETCDFLIBNAME)
 else
-NETCDFLIB	= -lnetcdf
+NETCDFLIB    = -lnetcdf
 endif
 ifdef NETCDFLIBDIR
-LDFLAGS		+= -L$(NETCDFLIBDIR)
+LDFLAGS     += -L$(NETCDFLIBDIR)
 endif
 
-#
 # phony targets
-#
 .PHONY: clean realclean distclean dummy
 
 # Top of this version of GOTM.
 ifndef GOTMDIR
-#GOTMDIR  := $(HOME)/Progs/gotm/gotm-4.0.0
-GOTMDIR  := /Users/nersc/Documents/Modeles/gotm_ismer
+GOTMDIR := $(HOME)/gotm_ismer
 endif
 
-CPP	= /usr/bin/cpp
+CPP	 = /usr/bin/cpp
 
 # Here you can put defines for the [c|f]pp - some will also be set depending
 # on compilation mode.
 ifeq ($(NetCDF),true)
-DEFINES += -DNETCDF_FMT
-EXTRA_LIBS += $(NETCDFLIB)
+DEFINES      += -DNETCDF_FMT
+EXTRA_LIBS   += $(NETCDFLIB)
 endif
 ifeq ($(SEDIMENT),true)
-DEFINES += -DSEDIMENT
-FEATURES += extras/sediment
+DEFINES      += -DSEDIMENT
+FEATURES     +=  extras/sediment
 FEATURE_LIBS += -lsediment$(buildtype)
 endif
 ifeq ($(SEAGRASS),true)
-DEFINES += -DSEAGRASS
-FEATURES += extras/seagrass
+DEFINES      += -DSEAGRASS
+FEATURES     +=  extras/seagrass
 FEATURE_LIBS += -lseagrass$(buildtype)
 endif
 ifeq ($(BIO),true)
-DEFINES += -DBIO
-FEATURES += extras/bio
+DEFINES      += -DBIO
+FEATURES     +=  extras/bio
 FEATURE_LIBS += -lbio$(buildtype)
 endif
 
@@ -91,14 +85,14 @@ BINDIR	= $(GOTMDIR)/bin
 endif
 
 ifndef LIBDIR
-LIBDIR	+= $(GOTMDIR)/lib/$(FORTRAN_COMPILER)
+LIBDIR += $(GOTMDIR)/lib/$(FORTRAN_COMPILER)
 endif
 
 ifndef MODDIR
 #MODDIR	= $(GOTMDIR)/modules
 MODDIR	= $(GOTMDIR)/modules/$(FORTRAN_COMPILER)
 endif
-INCDIRS	+= -I/usr/local/include -I/opt/cray/netCDF/3.6.2/netCDF-pgi/include -I$(GOTMDIR)/include -I$(MODDIR)
+INCDIRS	+= -I/usr/local/include -I$(GOTMDIR)/include -I$(MODDIR)
 
 # Normaly this should not be changed - unless you want something very specific.