Author: becker
Date: 2009-01-21 14:28:48 -0800 (Wed, 21 Jan 2009)
New Revision: 13912
Added:
mc/2D/ConMan/trunk/src/Makefile-ifort64
Modified:
mc/2D/ConMan/trunk/src/Makefile-ifort
mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort
mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64
mc/2D/ConMan/trunk/src/mm.src/driver
Log:
Divided ifort makefiles into regular and 64 bit cases, fixed Makefiles in mm.src
directory to actually produce a .a file.
32bit compile has not been tested.
Modified: mc/2D/ConMan/trunk/src/Makefile-ifort
===================================================================
--- mc/2D/ConMan/trunk/src/Makefile-ifort 2009-01-21 21:43:10 UTC (rev 13911)
+++ mc/2D/ConMan/trunk/src/Makefile-ifort 2009-01-21 22:28:48 UTC (rev 13912)
@@ -1,5 +1,5 @@
#
-# makefile for the program conman on 64-bit Linux system
+# makefile for the program conman on a 32-bit Linux system
#
COMMON=ConMan.o adjbc.o eg2.o eglib.o elminp.o error.o \
f_vstf.o f_vrres.o fluxke.o fftsubs.o g2assm.o geoid.o\
@@ -15,7 +15,7 @@
PICARD=f_tlhs.o f_trhsimp.o
EXPLICIT=f_tmres.o
-LIBS= libs/libsolver.a libs/libmm.a libs/libgrid.a
+LIBS= libs/libsolver.a libs/libgrid.a libs/libmm.a
PROGRAM=conman
#
@@ -23,40 +23,40 @@
# use -m64 -r8 -i8 for 64-bit architecture (also see changed in mm.src)
#
FC=ifort
-FFLAGS = -O2 -DIMPLICIT -I.
-FFLAGS = -O2 -DIMPLICIT -DPICARD -I. -m64 -r8 -i8
-FFLAGS = -O2 -I. -m64 -r8 -i8
+#FFLAGS = -O2 -DIMPLICIT -I.
+#FFLAGS = -O2 -DIMPLICIT -DPICARD -I. -m64 -r8 -i8
+FFLAGS = -O2 -I.
#
explicit: $(COMMON) $(EXPLICIT) rheol.newt.o timdrv.o
- (cd solver.src ; make -f Makefile.ifort64)
- (cd mm.src ; make -f Makefile.ifort64)
- (cd grid.src ; make -f Makefile.ifort64)
+ (cd solver.src ; make -f Makefile.ifort)
+ (cd mm.src ; make -f Makefile.ifort)
+ (cd grid.src ; make -f Makefile.ifort)
$(FC) -I$(SRC_HOME)/libs -o conman.exp rheol.newt.o timdrv.o $(COMMON) $(EXPLICIT) $(LIBS)
picard: $(COMMON) $(PICARD) rheol.newt.o timdrv.o
- (cd solver.src ; make -f Makefile.ifort64)
- (cd mm.src ; make -f Makefile.ifort64)
- (cd grid.src ; make -f Makefile.ifort64)
+ (cd solver.src ; make -f Makefile.ifort)
+ (cd mm.src ; make -f Makefile.ifort)
+ (cd grid.src ; make -f Makefile.ifort)
$(FC) $(FFLAGS) -I$(SRC_HOME)/libs -o conman.pic rheol.newt.o timdrv.o $(COMMON) $(PICARD) $(LIBS)
picardnn: $(COMMON) $(PICARD) rheol.nn.sdk.o timdrv.nn.o
- (cd solver.src ; make -f Makefile.ifort64)
- (cd mm.src ; make -f Makefile.ifort64)
- (cd grid.src ; make -f Makefile.ifort64)
+ (cd solver.src ; make -f Makefile.ifort)
+ (cd mm.src ; make -f Makefile.ifort)
+ (cd grid.src ; make -f Makefile.ifort)
$(FC) -I$(SRC_HOME)/libs -o conman.nn.pic rheol.nn.sdk.o timdrv.nn.o $(COMMON) $(PICARD) $(LIBS)
implicit: $(COMMON) $(IMPLICIT)
- (cd solver.src ; make -f Makefile.ifort64)
- (cd mm.src ; make -f Makefile.ifort64)
- (cd grid.src ; make -f Makefile.ifort64)
+ (cd solver.src ; make -f Makefile.ifort)
+ (cd mm.src ; make -f Makefile.ifort)
+ (cd grid.src ; make -f Makefile.ifort)
$(FC) -o conman.imp $(COMMON) $(IMPLICIT) $(LIBS)
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 solver.src ; make -f Makefile.ifort clean)
+ (cd mm.src ; make -f Makefile.ifort clean)
+ (cd grid.src ; make -f Makefile.ifort clean)
veryclean:
rm -rf core $(COMMON) $(PICARD) $(EXPLICIT) $(IMPLICIT) conman.???
Added: mc/2D/ConMan/trunk/src/Makefile-ifort64
===================================================================
--- mc/2D/ConMan/trunk/src/Makefile-ifort64 (rev 0)
+++ mc/2D/ConMan/trunk/src/Makefile-ifort64 2009-01-21 22:28:48 UTC (rev 13912)
@@ -0,0 +1,64 @@
+#
+# makefile for the program conman on 64-bit Linux system
+#
+COMMON=ConMan.o adjbc.o eg2.o eglib.o elminp.o error.o \
+ f_vstf.o f_vrres.o fluxke.o fftsubs.o g2assm.o geoid.o\
+ genien.o genmat.o genshg.o genshp.o \
+ input.o intemp.o pickdt.o print.o printd.o process.o \
+ rdflux.o stress.o timer.o tmass.o \
+ vadd.o mydate.o mytime.o projct.o prj4q.o print_reg.o prtstr_reg.o \
+ batchelor.o
+
+SRC_HOME=$HOME/ConMann
+
+IMPLICIT=f_tlhs.o f_trhsimp.o
+PICARD=f_tlhs.o f_trhsimp.o
+EXPLICIT=f_tmres.o
+
+LIBS= libs/libsolver.a libs/libgrid.a libs/libmm.a
+
+PROGRAM=conman
+#
+# switch for flags around for picard and implicit versions
+# 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
+
+
+#
+explicit: $(COMMON) $(EXPLICIT) rheol.newt.o timdrv.o
+ (cd solver.src ; make -f Makefile.ifort64)
+ (cd mm.src ; make -f Makefile.ifort64)
+ (cd grid.src ; make -f Makefile.ifort64)
+ $(FC) -I$(SRC_HOME)/libs -o conman.exp rheol.newt.o timdrv.o $(COMMON) $(EXPLICIT) $(LIBS)
+
+
+picard: $(COMMON) $(PICARD) rheol.newt.o timdrv.o
+ (cd solver.src ; make -f Makefile.ifort64)
+ (cd mm.src ; make -f Makefile.ifort64)
+ (cd grid.src ; make -f Makefile.ifort64)
+ $(FC) $(FFLAGS) -I$(SRC_HOME)/libs -o conman.pic rheol.newt.o timdrv.o $(COMMON) $(PICARD) $(LIBS)
+
+picardnn: $(COMMON) $(PICARD) rheol.nn.sdk.o timdrv.nn.o
+ (cd solver.src ; make -f Makefile.ifort64)
+ (cd mm.src ; make -f Makefile.ifort64)
+ (cd grid.src ; make -f Makefile.ifort64)
+ $(FC) -I$(SRC_HOME)/libs -o conman.nn.pic rheol.nn.sdk.o timdrv.nn.o $(COMMON) $(PICARD) $(LIBS)
+
+implicit: $(COMMON) $(IMPLICIT)
+ (cd solver.src ; make -f Makefile.ifort64)
+ (cd mm.src ; make -f Makefile.ifort64)
+ (cd grid.src ; make -f Makefile.ifort64)
+ $(FC) -o conman.imp $(COMMON) $(IMPLICIT) $(LIBS)
+
+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)
+
+veryclean:
+ rm -rf core $(COMMON) $(PICARD) $(EXPLICIT) $(IMPLICIT) conman.???
Modified: mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort
===================================================================
--- mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort 2009-01-21 21:43:10 UTC (rev 13911)
+++ mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort 2009-01-21 22:28:48 UTC (rev 13912)
@@ -7,7 +7,12 @@
CC=gcc
MEMORY_MANAGER=mmsc.o mm2000.o driver.o
+../libs/libmm.a: $(MEMORY_MANAGER)
+ $(AR) cr ../libs/libmm.a $(MEMORY_MANAGER)
+../libs/libmm.a: $(MEMORY_MANAGER)
+
+
driver: $(MEMORY_MANAGER)
$(FC) $(MEMORY_MANAGER) -o driver
Modified: mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64
===================================================================
--- mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64 2009-01-21 21:43:10 UTC (rev 13911)
+++ mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64 2009-01-21 22:28:48 UTC (rev 13912)
@@ -8,6 +8,12 @@
MEMORY_MANAGER=mmsc.o mm2000.o driver.o
+../libs/libmm.a: $(MEMORY_MANAGER)
+ $(AR) cr ../libs/libmm.a $(MEMORY_MANAGER)
+
+../libs/libmm.a: $(MEMORY_MANAGER)
+
+
driver: $(MEMORY_MANAGER)
$(FC) $(MEMORY_MANAGER) -o driver
Modified: mc/2D/ConMan/trunk/src/mm.src/driver
===================================================================
(Binary files differ)