Changeset 77 for branches/iLoveclim/SOURCES/Makefile

Timestamp:

07/05/16 11:20:52 (8 years ago)

Author:

dumas

Message:

Merge branche iLOVECLIM sur rev 76

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/Makefile (modified) (2 diffs)

branches/iLoveclim/SOURCES/Makefile

@@ +1 @@
+
 # Makefile pour construire les executables grisli en fonction de la machin
 # Pour compiler : make -f Makefile-template Grice2sea
@@ -10 +11 @@
 
 # Choice for compiler (ifort = 1, gfortran = 0)
-ifort ?= 0
+ifort ?= 1
 
 # Choice for librairies (mkl_c = 1 = MKL,  = 0 = BLAS)
 #Â NOTA: mkl_c = 1 with ifort = 0 ignores the MKL and uses BLAS anyhow
-mkl_c ?= 0
+mkl_c ?= 1
 
-ifeq ($(ifort),1)
+#ifeq ($(ifort),1)
   include Fichiers-parametres/Makefile.tof-lsce3130.inc
-else
-  include Fichiers-parametres/Makefile.dmr-lsce3027.inc
-endif
+#else
+#  include Fichiers-parametres/Makefile.dmr-lsce3027.inc
+#endif
 
 #     Compilation (le corps du Makefile)
 #-------------------------------------------
 
-ifeq ($(ifort),1)
+#ifeq ($(ifort),1)
   include Makefile.grisli.inc
-else
-  include Makefile.grisli-gfortran.inc
-endif
+#else
+#  include Makefile.grisli-gfortran.inc
+#endif