[cig-commits] r14429 - mc/2D/ConMan/trunk/src/gendeck
becker at geodynamics.org
becker at geodynamics.org
Tue Mar 24 12:38:43 PDT 2009
Author: becker
Date: 2009-03-24 12:38:43 -0700 (Tue, 24 Mar 2009)
New Revision: 14429
Added:
mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort
mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort
mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort64
Removed:
mc/2D/ConMan/trunk/src/gendeck/GenDeck.mk
Modified:
mc/2D/ConMan/trunk/src/gendeck/gendeck.f
mc/2D/ConMan/trunk/src/gendeck/run_gendeck
Log:
Modified naming convention of Makefiles for consistency with main ConMan
Deleted: mc/2D/ConMan/trunk/src/gendeck/GenDeck.mk
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/GenDeck.mk 2009-03-24 19:21:13 UTC (rev 14428)
+++ mc/2D/ConMan/trunk/src/gendeck/GenDeck.mk 2009-03-24 19:38:43 UTC (rev 14429)
@@ -1,55 +0,0 @@
-#
-# Makefile for program to generate ConMan input decks.
-#
-
-PROGRAM= GenDeck
-DESTDIR= $(CONBIN)
-MAIN= gendeck.f
-SUBS= \
- corner.f \
- exist.f \
- getint.f \
- gtreal.f \
- kblnk.f \
- nblen.f \
- skpsec.f \
- velbcf.f \
- yes.f
-
-SOURCES= $(MAIN) $(SUBS)
-
-#FFLAGS= -O -extend_source
-FFLAGS= -extend_source
-#FC= $(F77)
-FC = ifort
-#FFLAGS =
-
-OBJECTS= $(SOURCES:.f=.o)
-DEBUG= $(PROGRAM:%=debug/%)
-VARIANTS.o= $(OBJECTS)
-
-.KEEP_STATE:
-.INIT:
- -mkdir debug
-
-all: $(PROGRAM)
-debug: $(DEBUG)
-
-$(DEBUG) := FFLAGS= -g
-$(DEBUG) := VARIANTS.o= $(OBJECTS:%=debug/%)
-
-$(PROGRAM) $(DEBUG): $(VARIANTS.o)
- $(LINK.f) -o $@ $(VARIANTS.o)
-
-debug/%.o: %.f
- $(COMPILE.f) -o $@ $<
-
-install: $(PROGRAM)
- mv -f $(PROGRAM) $(DESTDIR)
- rm -r debug
-
-test: $(PROGRAM)
- mv -f $(PROGRAM) $(DESTDIR)/$(PROGRAM).test
-
-clean:
- rm -r $(PROGRAM) $(OBJECTS) debug
Added: mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort (rev 0)
+++ mc/2D/ConMan/trunk/src/gendeck/Makefile-gfort 2009-03-24 19:38:43 UTC (rev 14429)
@@ -0,0 +1,51 @@
+#
+# Makefile for program to generate ConMan input decks.
+#
+
+PROGRAM= GenDeck
+DESTDIR= $(CONBIN)
+MAIN= gendeck.f
+SUBS= \
+ corner.f \
+ exist.f \
+ getint.f \
+ gtreal.f \
+ kblnk.f \
+ nblen.f \
+ skpsec.f \
+ velbcf.f \
+ yes.f
+
+SOURCES= $(MAIN) $(SUBS)
+FFLAGS =
+FC = gfortran
+
+OBJECTS= $(SOURCES:.f=.o)
+DEBUG= $(PROGRAM:%=debug/%)
+VARIANTS.o= $(OBJECTS)
+
+.KEEP_STATE:
+.INIT:
+ -mkdir debug
+
+all: $(PROGRAM)
+debug: $(DEBUG)
+
+$(DEBUG) := FFLAGS= -g
+$(DEBUG) := VARIANTS.o= $(OBJECTS:%=debug/%)
+
+$(PROGRAM) $(DEBUG): $(VARIANTS.o)
+ $(LINK.f) -o $@ $(VARIANTS.o)
+
+debug/%.o: %.f
+ $(COMPILE.f) -o $@ $<
+
+install: $(PROGRAM)
+ mv -f $(PROGRAM) $(DESTDIR)
+ rm -r debug
+
+test: $(PROGRAM)
+ mv -f $(PROGRAM) $(DESTDIR)/$(PROGRAM).test
+
+clean:
+ rm -r $(PROGRAM) $(OBJECTS) debug
Added: mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort (rev 0)
+++ mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort 2009-03-24 19:38:43 UTC (rev 14429)
@@ -0,0 +1,52 @@
+#
+# Makefile for program to generate ConMan input decks.
+#
+
+PROGRAM= GenDeck
+DESTDIR= $(CONBIN)
+MAIN= gendeck.f
+SUBS= \
+ corner.f \
+ exist.f \
+ getint.f \
+ gtreal.f \
+ kblnk.f \
+ nblen.f \
+ skpsec.f \
+ velbcf.f \
+ yes.f
+
+SOURCES= $(MAIN) $(SUBS)
+
+FFLAGS= -extend_source -O
+FC = ifort
+
+OBJECTS= $(SOURCES:.f=.o)
+DEBUG= $(PROGRAM:%=debug/%)
+VARIANTS.o= $(OBJECTS)
+
+.KEEP_STATE:
+.INIT:
+ -mkdir debug
+
+all: $(PROGRAM)
+debug: $(DEBUG)
+
+$(DEBUG) := FFLAGS= -g
+$(DEBUG) := VARIANTS.o= $(OBJECTS:%=debug/%)
+
+$(PROGRAM) $(DEBUG): $(VARIANTS.o)
+ $(LINK.f) -o $@ $(VARIANTS.o)
+
+debug/%.o: %.f
+ $(COMPILE.f) -o $@ $<
+
+install: $(PROGRAM)
+ mv -f $(PROGRAM) $(DESTDIR)
+ rm -r debug
+
+test: $(PROGRAM)
+ mv -f $(PROGRAM) $(DESTDIR)/$(PROGRAM).test
+
+clean:
+ rm -r $(PROGRAM) $(OBJECTS) debug
Added: mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort64
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort64 (rev 0)
+++ mc/2D/ConMan/trunk/src/gendeck/Makefile-ifort64 2009-03-24 19:38:43 UTC (rev 14429)
@@ -0,0 +1,52 @@
+#
+# Makefile for program to generate ConMan input decks.
+#
+
+PROGRAM= GenDeck
+DESTDIR= $(CONBIN)
+MAIN= gendeck.f
+SUBS= \
+ corner.f \
+ exist.f \
+ getint.f \
+ gtreal.f \
+ kblnk.f \
+ nblen.f \
+ skpsec.f \
+ velbcf.f \
+ yes.f
+
+SOURCES= $(MAIN) $(SUBS)
+
+FFLAGS= -extend_source -O
+FC = ifort
+
+OBJECTS= $(SOURCES:.f=.o)
+DEBUG= $(PROGRAM:%=debug/%)
+VARIANTS.o= $(OBJECTS)
+
+.KEEP_STATE:
+.INIT:
+ -mkdir debug
+
+all: $(PROGRAM)
+debug: $(DEBUG)
+
+$(DEBUG) := FFLAGS= -g
+$(DEBUG) := VARIANTS.o= $(OBJECTS:%=debug/%)
+
+$(PROGRAM) $(DEBUG): $(VARIANTS.o)
+ $(LINK.f) -o $@ $(VARIANTS.o)
+
+debug/%.o: %.f
+ $(COMPILE.f) -o $@ $<
+
+install: $(PROGRAM)
+ mv -f $(PROGRAM) $(DESTDIR)
+ rm -r debug
+
+test: $(PROGRAM)
+ mv -f $(PROGRAM) $(DESTDIR)/$(PROGRAM).test
+
+clean:
+ rm -r $(PROGRAM) $(OBJECTS) debug
Modified: mc/2D/ConMan/trunk/src/gendeck/gendeck.f
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/gendeck.f 2009-03-24 19:21:13 UTC (rev 14428)
+++ mc/2D/ConMan/trunk/src/gendeck/gendeck.f 2009-03-24 19:38:43 UTC (rev 14429)
@@ -1297,6 +1297,7 @@
else
end if
c
+ write(gunit,*)
close (gunit)
close (grefu)
if (lmovie) then
Modified: mc/2D/ConMan/trunk/src/gendeck/run_gendeck
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/run_gendeck 2009-03-24 19:21:13 UTC (rev 14428)
+++ mc/2D/ConMan/trunk/src/gendeck/run_gendeck 2009-03-24 19:38:43 UTC (rev 14429)
@@ -9,8 +9,8 @@
aspect=${5-1} # aspect ratio, determines x width
heating=${6-0} # internal heating
activationE=${7-0} # activation energy
+gdbin=${8-~becker/progs/src/cig/ConMan/src/gendeck/} # gendeck binary location
-
nelx=`echo $nelz $aspect | gawk '{x=int($1*$2);if(x%2!=0)x--;print(x)}'` # number of elements in x
version=1 # 1: standard ConMan
@@ -102,4 +102,5 @@
$ttop
EOF
-./GenDeck < gendeck.in
+$gdbin/GenDeck < gendeck.in
+
More information about the CIG-COMMITS
mailing list