diff --git a/makefile b/makefile index 47f6286dca840f2942b277c6581b5a174c7df27f..2c23944430c286f49c8c6e5616e959b6f36a22fe 100755 --- a/makefile +++ b/makefile @@ -9,27 +9,35 @@ #---------------------------------------------------------------------# # Directories and Fortran compiler #---------------------------------------------------------------------# -HOME =/home/faure -#SRCDIR =$(HOME)/Projets/Mage/Mage6/mage6_7/src +machine := $(shell uname -n) + +ifeq ($(machine),LYP1089) + zbin =$(HOME)/zbin + data =$(HOME) +else + zbin =$(HOME)/travail/zbin + data =$(HOME)/travail +endif SRCDIR =. -tmp =$(HOME)/zbin +bin =$(HOME)/bin +tmp =$(zbin) #VERSION =win32 VERSION =Linux ifeq ($(VERSION),Linux) # Version Linux - EXEDIR =$(HOME)/Mage_Test/exec_dev - BINDIR =$(HOME)/zbin/6.7 - FC = g95 - #FC = gf95 - #FC = gfortran + #EXEDIR =$(data)/Mage_Test/exec_dev + EXEDIR =$(bin)/mage/6.7 + BINDIR =$(zbin)/6.7 + FC = -g95 + #FC = -gfortran-4.2 ligne1 =" CHARACTER(len=9),PARAMETER :: OS = 'Linux-x86'" ligne2 =" character(len=1), parameter :: slash = '/'" else # Version win32 - BINDIR =$(HOME)/zbin/win32 - EXEDIR =$(HOME)/Mage_Test/win32 + BINDIR =$(zbin)/win32 + EXEDIR =$(bin)/mage/win32 FC = wine g95 ligne1 =" CHARACTER(len=9),PARAMETER :: OS = 'Win32'" ligne2 =" character(len=1), parameter :: slash = '\'" @@ -39,14 +47,7 @@ endif #---------------------------------------------------------------------# # Fortran compiler flags #---------------------------------------------------------------------# -ifeq ($(FC),gf95) - FFLAGS = -fno-automatic -O3 -fimplicit-none -fbacktrace -mtune=native -march=native -mieee-fp - #-fbounds-check et -malign-double font planter MAGE. - # options pour le linker - LFLAGS = -static-libgfortran - #module dirs - MFLAGS = -J$(BINDIR)/ -else ifeq ($(FC),gfortran) +ifeq ($(FC),-gfortran-4.2) FFLAGS = -fimplicit-none -fno-automatic -O3 -malign-double # options pour le linker LFLAGS = -static @@ -59,7 +60,7 @@ else # FFLAGS = -O3 -fimplicit-none -fstatic -Werror -Wprecision-loss -march=i686 -msse2 -mfpmath=sse -mieee-fp -malign-double FFLAGS = -O3 -fimplicit-none -Werror -Wprecision-loss -mieee-fp -march=i686 # options pour le linker - LFLAGS = -static + LFLAGS = #-static #module dirs MFLAGS = -fmod=$(BINDIR)/ endif @@ -77,25 +78,25 @@ PROG_NAME = mage6 #---------------------------------------------------------------------# # Data Sets and names of test-cases #---------------------------------------------------------------------# -data1 =$(HOME)/Mage_Test/Donnees/Saar/Donnees +data1 =$(data)/Mage_Test/Donnees/Saar/Donnees etude1 =Saar -data2 =$(HOME)/Mage_Test/Donnees/Torrentiel/Marche/Marche_Ressaut +data2 =$(data)/Mage_Test/Donnees/Torrentiel/Marche/Marche_Ressaut etude2 =marche -data3 =$(HOME)/Mage_Test/Donnees/Torrentiel/Marche/Marche_AR +data3 =$(data)/Mage_Test/Donnees/Torrentiel/Marche/Marche_AR etude3 =marche -data4 =$(HOME)/Mage_Test/Donnees/Hogneau/HGtest1 +data4 =$(data)/Mage_Test/Donnees/Hogneau/HGtest1 etude4 =HGmaster -data5 =$(HOME)/Mage_Test/Donnees/Torrentiel/validation +data5 =$(data)/Mage_Test/Donnees/Torrentiel/validation etude5 =test2 -data6 =$(HOME)/Mage_Test/Donnees/Casier/Validation +data6 =$(data)/Mage_Test/Donnees/Casier/Validation etude6 =Casier -data7 =$(HOME)/Mage_Test/Donnees/Demo_AM0/Validation +data7 =$(data)/Mage_Test/Donnees/Demo_AM0/Validation etude7 =DemoAM -data8 =$(HOME)/Mage_Test/Donnees/Clairmarais +data8 =$(data)/Mage_Test/Donnees/Clairmarais etude8 =A -data9 =$(HOME)/Mage_Test/Donnees/FRouge/Validation +data9 =$(data)/Mage_Test/Donnees/FRouge/Validation etude9 =bhh -data10 =$(HOME)/Mage_Test/Donnees/Ardeche +data10 =$(data)/Mage_Test/Donnees/Ardeche etude10 =ardeche1 #---------------------------------------------------------------------# @@ -156,256 +157,192 @@ ite_obj = $(T_Modules) $(I_Modules) $(E_Modules) $(BINDIR)/$(PROG_NAME)_Parametres.o:$(PROG_NAME)_Parametres.for @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)_Common.o:$(PROG_NAME)_Common.f90 $(BINDIR)/$(PROG_NAME)_Parametres.o @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)_Licence.o:$(PROG_NAME)_Licence.for $(BINDIR)/$(PROG_NAME)_Parametres.o $(BINDIR)/$(PROG_NAME)_Common.o @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)_Utilitaires.o:$(PROG_NAME)_Utilitaires.for $(BINDIR)/$(PROG_NAME)_Parametres.o $(BINDIR)/$(PROG_NAME)_Common.o @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)t1.o:$(PROG_NAME)t1.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)t2.o:$(PROG_NAME)t2.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)t3.o:$(PROG_NAME)t3.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)t4.o:$(PROG_NAME)t4.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)t5.o:$(PROG_NAME)t5.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)i0.o:$(PROG_NAME)i0.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)i1.o:$(PROG_NAME)i1.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)i2.o:$(PROG_NAME)i2.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)i3.o:$(PROG_NAME)i3.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)i4.o:$(PROG_NAME)i4.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME).o:$(PROG_NAME).for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)ee.o:$(PROG_NAME)ee.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e1.o:$(PROG_NAME)e1.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e2.o:$(PROG_NAME)e2.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e3.o:$(PROG_NAME)e3.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e4.o:$(PROG_NAME)e4.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e5.o:$(PROG_NAME)e5.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e6.o:$(PROG_NAME)e6.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e7.o:$(PROG_NAME)e7.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e8.o:$(PROG_NAME)e8.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)e9.o:$(PROG_NAME)e9.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)ea.o:$(PROG_NAME)ea.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)eb.o:$(PROG_NAME)eb.for $(BINMODULES) @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)_Extraire.o:$(PROG_NAME)_Extraire.f90 @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/$(PROG_NAME)_Carto.o:$(PROG_NAME)_Carto.f90 @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/sp_mailleur.o:sp_mailleur.for @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(GFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/DXFortranStd.o:DXFortranStd.f90 @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo $(BINDIR)/mailleurPF.o:mailleurPF.for @echo "########################################" @echo "## compiling $< ..." - @cp -fp $< ./utf8/$< - @recode UTF-8..ISO-8859-15 $< $(FC) $(FFLAGS) $(MFLAGS) -o $@ -c $< @echo "##" @echo @@ -464,6 +401,9 @@ clean: -rm $(EXEDIR)/$(PROG_NAME)_Extraire.exe -rm $(EXEDIR)/$(PROG_NAME)_Carto.exe -rm $(EXEDIR)/mailleurPF.exe + echo $(machine) + echo $(HOME) + #---------------------------------------------------------------------# # restore #---------------------------------------------------------------------# @@ -483,10 +423,18 @@ version: -rm ligne1 -rm ligne2 +#---------------------------------------------------------------------# +# utf-8 +#---------------------------------------------------------------------# +backup: + -cp -fp *.f* ./utf8/ + -recode -v UTF-8..ISO-8859-15 *.f* + #---------------------------------------------------------------------# # build #---------------------------------------------------------------------# -build: version $(EXECUTABLE) $(EXTRAIRE) $(CARTO) $(MAILLEUR) restore +build: version backup $(EXECUTABLE) $(EXTRAIRE) $(CARTO) $(MAILLEUR) restore + #---------------------------------------------------------------------# # rebuild executable