[cig-commits] r14519 - in mc/2D/ConMan/trunk/src: . grid.src mm.src solver.src

[becker at geodynamics.org]

Author: becker
Date: 2009-03-28 11:58:18 -0700 (Sat, 28 Mar 2009)
New Revision: 14519

Added:
   mc/2D/ConMan/trunk/src/grid.src/Makefile.gfort64
   mc/2D/ConMan/trunk/src/include.gfort64
   mc/2D/ConMan/trunk/src/mm.src/Makefile.gfort64
   mc/2D/ConMan/trunk/src/solver.src/Makefile.gfort64
Modified:
   mc/2D/ConMan/trunk/src/Makefile-gfort
   mc/2D/ConMan/trunk/src/mytime.f
   mc/2D/ConMan/trunk/src/solver.src/Makefile.ifort64
Log:
Added 64bit gfortran flags to allow compilation. (Else, would bomb because of mm)



Modified: mc/2D/ConMan/trunk/src/Makefile-gfort
===================================================================
--- mc/2D/ConMan/trunk/src/Makefile-gfort	2009-03-28 18:50:44 UTC (rev 14518)
+++ mc/2D/ConMan/trunk/src/Makefile-gfort	2009-03-28 18:58:18 UTC (rev 14519)
@@ -23,8 +23,8 @@
 # use -m64 -r8 -i8 for 64-bit architecture (also see changed in mm.src)
 #
 FC=gfortran
-FFLAGS = -O2 -DIMPLICIT -I. -fcray-pointer
-FFLAGS = -O2 -DIMPLICIT -DPICARD -I. -fcray-pointer 
+#FFLAGS = -O2 -DIMPLICIT -I. -fcray-pointer
+#FFLAGS = -O2 -DIMPLICIT -DPICARD -I. -fcray-pointer 
 FFLAGS = -O2 -I. -fcray-pointer 
 
 #

Added: mc/2D/ConMan/trunk/src/grid.src/Makefile.gfort64
===================================================================
--- mc/2D/ConMan/trunk/src/grid.src/Makefile.gfort64	                        (rev 0)
+++ mc/2D/ConMan/trunk/src/grid.src/Makefile.gfort64	2009-03-28 18:58:18 UTC (rev 14519)
@@ -0,0 +1,15 @@
+#
+# makefile for the grid library
+# 
+include ../include.gfort64
+
+
+GRID=genBC.o genfl12.o genfl.o geniBC.o genNBC.o iclear_mov.o move.o smove.o clear.o
+
+#
+../libs/libgrid.a: $(GRID)
+	$(AR) cr ../libs/libgrid.a  $(GRID) 
+
+clean:
+	rm -rf core $(GRID) 
+

Added: mc/2D/ConMan/trunk/src/include.gfort64
===================================================================
--- mc/2D/ConMan/trunk/src/include.gfort64	                        (rev 0)
+++ mc/2D/ConMan/trunk/src/include.gfort64	2009-03-28 18:58:18 UTC (rev 14519)
@@ -0,0 +1,9 @@
+# switch for flags around for picard and implicit versions
+# use -m64 -r8 -i8 for 64-bit architecture (also see changed in mm.src)
+#
+FC=gfortran
+#FFLAGS = -O2 -DIMPLICIT -I. -fcray-pointer
+#FFLAGS = -O2 -DIMPLICIT -DPICARD -I. -fcray-pointer 
+FFLAGS = -O2 -I. -fcray-pointer -fdefault-integer-8 -fdefault-real-8
+CC = gcc
+CFLAGS = -O2 
\ No newline at end of file

Added: mc/2D/ConMan/trunk/src/mm.src/Makefile.gfort64
===================================================================
--- mc/2D/ConMan/trunk/src/mm.src/Makefile.gfort64	                        (rev 0)
+++ mc/2D/ConMan/trunk/src/mm.src/Makefile.gfort64	2009-03-28 18:58:18 UTC (rev 14519)
@@ -0,0 +1,18 @@
+#
+# makefile for the memory manager library
+# 
+
+
+include ../include.gfort64
+
+MEMORY_MANAGER=mmsc.o mm2000.o
+
+../libs/libmm.a: $(MEMORY_MANAGER)
+	$(AR) cr ../libs/libmm.a  $(MEMORY_MANAGER) 
+
+#
+../libs/libmm.a: $(MEMORY_MANAGER)
+
+clean:
+	rm -rf core $(MEMORY_MANAGER) 
+

Modified: mc/2D/ConMan/trunk/src/mytime.f
===================================================================
--- mc/2D/ConMan/trunk/src/mytime.f	2009-03-28 18:50:44 UTC (rev 14518)
+++ mc/2D/ConMan/trunk/src/mytime.f	2009-03-28 18:58:18 UTC (rev 14519)
@@ -1,5 +1,5 @@
       real function mytime ()
-      real tarray(2),  tmp
+      real*4 tarray(2),  tmp
 c Cray version
 c     mytime = second (tmp)
 c Convex version

Added: mc/2D/ConMan/trunk/src/solver.src/Makefile.gfort64
===================================================================
--- mc/2D/ConMan/trunk/src/solver.src/Makefile.gfort64	                        (rev 0)
+++ mc/2D/ConMan/trunk/src/solver.src/Makefile.gfort64	2009-03-28 18:58:18 UTC (rev 14519)
@@ -0,0 +1,15 @@
+#
+# makefile for the solver routines
+# 
+
+include ../include.gfort64
+
+SOLVER=zfactor.o back.o factor.o coldot.o unfact.o unback.o
+
+#
+../libs/libsolver.a: $(SOLVER)
+	$(AR) cr ../libs/libsolver.a  $(SOLVER) 
+
+clean:
+	rm -rf core $(SOLVER) 
+

Modified: mc/2D/ConMan/trunk/src/solver.src/Makefile.ifort64
===================================================================
--- mc/2D/ConMan/trunk/src/solver.src/Makefile.ifort64	2009-03-28 18:50:44 UTC (rev 14518)
+++ mc/2D/ConMan/trunk/src/solver.src/Makefile.ifort64	2009-03-28 18:58:18 UTC (rev 14519)
@@ -2,8 +2,8 @@
 # makefile for the solver routines
 # 
 FC=ifort
-#FFLAGS=-O2 -m64 -r8 -i8
-FFLAGS=-g -m64 -r8 -i8
+FFLAGS=-O2 -m64 -r8 -i8
+#FFLAGS=-g -m64 -r8 -i8
 
 SOLVER=zfactor.o back.o factor.o coldot.o unfact.o unback.o