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

[becker at geodynamics.org]

Author: becker
Date: 2010-06-05 12:42:09 -0700 (Sat, 05 Jun 2010)
New Revision: 16904

Modified:
   mc/2D/ConMan/trunk/src/Makefile-ifort64
   mc/2D/ConMan/trunk/src/gendeck/deck.defaults.h
   mc/2D/ConMan/trunk/src/gendeck/gendeck.f
   mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64
Log:
GenDeck needed an implicit declaration for the intel compiler to compile
things right.



Modified: mc/2D/ConMan/trunk/src/Makefile-ifort64
===================================================================
--- mc/2D/ConMan/trunk/src/Makefile-ifort64	2010-06-05 04:12:33 UTC (rev 16903)
+++ mc/2D/ConMan/trunk/src/Makefile-ifort64	2010-06-05 19:42:09 UTC (rev 16904)
@@ -9,7 +9,7 @@
         vadd.o mydate.o mytime.o projct.o prj4q.o print_reg.o prtstr_reg.o \
         batchelor.o 
 
-SRC_HOME=$HOME/ConMann
+SRC_HOME=.
 
 IMPLICIT=f_tlhs.o f_trhsimp.o
 PICARD=f_tlhs.o f_trhsimp.o
@@ -34,7 +34,7 @@
 	(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)
+	$(FC) -static -I$(SRC_HOME)/libs -o conman.exp  rheol.newt.o timdrv.o $(COMMON) $(EXPLICIT) $(LIBS)
 
 
 picard: $(COMMON) $(PICARD) rheol.newt.o timdrv.o

Modified: mc/2D/ConMan/trunk/src/gendeck/deck.defaults.h
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/deck.defaults.h	2010-06-05 04:12:33 UTC (rev 16903)
+++ mc/2D/ConMan/trunk/src/gendeck/deck.defaults.h	2010-06-05 19:42:09 UTC (rev 16904)
@@ -23,7 +23,7 @@
 c   
 c
 ccccccccc1ccccccccc2ccccccccc3ccccccccc4ccccccccc5ccccccccc6ccccccccc7cc
-c
+
       parameter (maxmat = 10)
       parameter (maxsuf = 100)
 c
@@ -35,6 +35,8 @@
       parameter (iann = 5)
       parameter (ichn = 6)
       parameter (idef = 7)
+
+
 c
       dimension  visc(maxmat),    alam(maxmat),   diff(maxmat),
      &          diffb(maxmat),      ra(maxmat),    rab(maxmat),

Modified: mc/2D/ConMan/trunk/src/gendeck/gendeck.f
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/gendeck.f	2010-06-05 04:12:33 UTC (rev 16903)
+++ mc/2D/ConMan/trunk/src/gendeck/gendeck.f	2010-06-05 19:42:09 UTC (rev 16904)
@@ -67,8 +67,14 @@
 ccccccccc1ccccccccc2ccccccccc3ccccccccc4ccccccccc5ccccccccc6ccccccccc7cc
       program gendeck
 c
+c
+c   ifort didn't think that xmin,xmax,zmin,zmax and such were real
+c
+      implicit real(a-h, o-z), integer(i-n)
+
       real*8 pi
 c
+
       character*56 ititle
 c  title excluding date and time
 

Modified: mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64
===================================================================
--- mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64	2010-06-05 04:12:33 UTC (rev 16903)
+++ mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort64	2010-06-05 19:42:09 UTC (rev 16904)
@@ -2,10 +2,11 @@
 # makefile for the memory manager library
 # 
 FC=ifort
-#FFLAGS=-O2 -m64 -r8 -i8
-FFLAGS=-g -m64 -r8 -i8
+FFLAGS=-O2 -m64 -r8 -i8
+#FFLAGS=-g -m64 -r8 -i8
 CFLAGS= 
-CC=gcc -m64  -DMMSC_INT_TYPE=int64_t
+#CC=gcc -m64  -DMMSC_INT_TYPE=int64_t
+CC=icc -m64 
 
 MEMORY_MANAGER=mmsc.o mm2000.o driver.o