[cig-commits] r14521 - in mc/2D/ConMan/trunk/src: . gendeck

[becker at geodynamics.org]

Author: becker
Date: 2009-03-28 12:20:00 -0700 (Sat, 28 Mar 2009)
New Revision: 14521

Modified:
   mc/2D/ConMan/trunk/src/Makefile-ifort64
   mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort64
Log:
Added gendeck compilation to all task for Makefile-ifort64 and Makefile-gfort64.
(Those are the only makefiles that work without user intervention because mm2000.h is only
set up for 64 bit machines.)



Modified: mc/2D/ConMan/trunk/src/Makefile-ifort64
===================================================================
--- mc/2D/ConMan/trunk/src/Makefile-ifort64	2009-03-28 19:04:59 UTC (rev 14520)
+++ mc/2D/ConMan/trunk/src/Makefile-ifort64	2009-03-28 19:20:00 UTC (rev 14521)
@@ -23,12 +23,12 @@
 # use -m64 -r8 -i8 for 64-bit architecture (also see changed in mm.src)
 #
 FC=ifort
-#FFLAGS = -O2 -DIMPLICIT -I.  -m64 -r8 -i8
-#FFLAGS = -O2 -DIMPLICIT -DPICARD -I. -m64 -r8 -i8
 FFLAGS = -O2 -I. -m64 -r8 -i8
 #FFLAGS = -g -I. -m64 -r8 -i8
 
 
+all: explicit gendeck
+
 #
 explicit: $(COMMON) $(EXPLICIT) rheol.newt.o timdrv.o
 	(cd solver.src ; make -f Makefile.ifort64)
@@ -55,11 +55,18 @@
 	(cd grid.src ; make -f Makefile.ifort64)
 	$(FC) -o conman.imp  $(COMMON) $(IMPLICIT) $(LIBS)
 
+gendeck: gendeck/gendeck.o
+	cd gendeck ; make -f Makefile-ifort64
+
+
+
+
 clean:
 	rm -rf core $(COMMON) $(PICARD) $(EXPLICIT) $(IMPLICIT) rheol.newt.o timdrv.o libs/lib*
 	(cd solver.src ; make  -f Makefile.ifort64 clean)
 	(cd mm.src ; make  -f Makefile.ifort64 clean)
 	(cd grid.src ; make  -f Makefile.ifort64 clean)
+	(cd gendeck ; make  -f Makefile-ifort64 clean)
 
 veryclean:
 	rm -rf core $(COMMON) $(PICARD) $(EXPLICIT) $(IMPLICIT) conman.???

Modified: mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort64
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort64	2009-03-28 19:04:59 UTC (rev 14520)
+++ mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort64	2009-03-28 19:20:00 UTC (rev 14521)
@@ -17,8 +17,7 @@
 	yes.f
 
 SOURCES= $(MAIN) $(SUBS)
-FFLAGS = 
-FC = gfortran
+include ../include.gfort64
 
 OBJECTS= $(SOURCES:.f=.o)
 DEBUG= $(PROGRAM:%=debug/%)
@@ -29,6 +28,8 @@
 	-mkdir debug
 
 all: $(PROGRAM)
+
+
 debug: $(DEBUG)
 
 $(DEBUG) := FFLAGS= -g