head	1.13;
access;
symbols
	charm6_1:1.13
	charm_6_0_1:1.13
	charm6_0_1:1.13
	charm6_0:1.12
	ChaNGa_1-0:1.9
	charm5_9:1.8;
locks; strict;
comment	@# @;


1.13
date	2008.11.28.04.47.53;	author gzheng;	state Exp;
branches;
next	1.12;
commitid	EZ2hHINqgxFANkst;

1.12
date	2007.10.09.21.07.06;	author wilmarth;	state Exp;
branches;
next	1.11;
commitid	5700470bed6e4567;

1.11
date	2007.06.27.02.10.29;	author wilmarth;	state Exp;
branches;
next	1.10;
commitid	6de94681c6f84567;

1.10
date	2007.06.14.18.55.31;	author wilmarth;	state Exp;
branches;
next	1.9;
commitid	5b7946718ef44567;

1.9
date	2006.09.11.21.22.55;	author wilmarth;	state Exp;
branches;
next	1.8;

1.8
date	2004.08.03.02.20.00;	author olawlor;	state Exp;
branches;
next	1.7;

1.7
date	2004.05.18.20.33.19;	author olawlor;	state Exp;
branches;
next	1.6;

1.6
date	2003.08.30.14.42.29;	author olawlor;	state Exp;
branches;
next	1.5;

1.5
date	2003.08.30.08.12.29;	author olawlor;	state Exp;
branches;
next	1.4;

1.4
date	2003.08.06.00.52.34;	author olawlor;	state Exp;
branches;
next	1.3;

1.3
date	2003.08.05.19.47.19;	author olawlor;	state Exp;
branches;
next	1.2;

1.2
date	2003.08.05.16.10.46;	author schak;	state Exp;
branches;
next	1.1;

1.1
date	2003.08.04.19.23.16;	author olawlor;	state Exp;
branches;
next	;


desc
@@


1.13
log
@fixed for problematic mpicxx compiler
@
text
@CDIR=../../../..
CHARMC=$(CDIR)/bin/charmc -I. $(OPTS)
MPICC=$(CDIR)/bin/mpiCC -I. $(OPTS)

# Directory where Magic software headers live:
MGC=.
MGCOBJS=$(MGC)/MgcIntr3DTetrTetr.o  $(MGC)/MgcMath.o  $(MGC)/MgcPlane.o \
	$(MGC)/MgcTetrahedron.o  $(MGC)/MgcVector3.o

HEADERS=paralleltransfer.h tetmesh.h prismMesh.h
# HEADERS=paralleltransfer.h parallelsurfacetransfer.h tetmesh.h prismMesh.h triSurfMesh.h mapbasic.h
HEADDEP=$(HEADERS) 
TOBJS=$(MGCOBJS) GenericElement.o transfer.o tetmesh.o tetmesh_noboite.o 
# TOBJS=$(MGCOBJS) GenericElement.o transfer.o tetmesh.o tetmesh_noboite.o geom_util.o
OBJS=$(TOBJS) tetmesh_fem.o paralleltransfer.o prismMesh.o
#OBJS=$(TOBJS) tetmesh_fem.o paralleltransfer.o prismMesh.o parallelsurfacetransfer.o
LIB=libdatatransfer

LIBDIR=$(CDIR)/lib
DEST=$(LIBDIR)/$(LIB).a

test1=test_GenericElement
test1o=$(test1).C GenericElement.o
test2=test_noboite
test2o=$(test2).C $(TOBJS) charm_standalone.o
test3=test_transfer
test3o=$(test3).C $(TOBJS) charm_standalone.o
test4=test_vol
test4o=$(test4).C cg3d.o \
	test_vol_mgc.o $(MGCOBJS) \
	test_vol_planes.o volume_planes.o
tests=$(test1) $(test2) $(test3) $(test4)

all: $(DEST)

$(DEST): $(OBJS) headers
	$(CHARMC) $(OBJS) -o $@@ $(LIBS)

headers: $(HEADERS)
	cp $(HEADERS) $(CDIR)/include/
	touch headers

$(test1): $(test1o) $(HEADDEP)
	$(CHARMC) $(test1o) -o $(test1) -seq -language c++

$(test2): $(test2o) $(HEADDEP)
	$(CHARMC) $(test2o) -o $(test2) -seq -language c++

$(test3): $(test3o) $(HEADDEP)
	$(CHARMC) $(test3o) -o $(test3) -seq -language c++

$(test4): $(test4o) $(HEADDEP)
	$(CHARMC) $(test4o) -o $(test4) -language ampi

test: $(tests)
	./$(test1) 1 10000
	./$(test2) test_transfer_dir/src.noboite
	./$(test3) test_transfer_dir/src.noboite test_transfer_dir/src.noboite
	./$(test3) test_transfer_dir/dest.noboite test_transfer_dir/dest.noboite
	./$(test3) test_transfer_dir/src.noboite test_transfer_dir/dest.noboite
	./$(test3) test_transfer_dir/dest.noboite test_transfer_dir/src.noboite

clean:
	rm -rf *.a *.def.h *.decl.h *.o $(MGC)/*.o \
		SunWS_cache $(DEST) $(tests) headers

# Trick make into compiling .C's into .o's.
.SUFFIXES: .C .cpp

.C.o:
	$(MPICC) -c $<

.cpp.o:
	$(CHARMC) -c $< 
@


1.12
log
@Added primMesh.
@
text
@d3 1
d71 1
a71 1
	$(CHARMC) -c $<
@


1.11
log
@Temporarily not building surface transfer codes.
@
text
@d9 1
a9 1
HEADERS=paralleltransfer.h tetmesh.h 
d14 1
a14 1
OBJS=$(TOBJS) tetmesh_fem.o paralleltransfer.o
@


1.10
log
@Added a mesh translate function to tetmesh.  Added code (incomplete) for surface transfer.
@
text
@d9 2
a10 1
HEADERS=paralleltransfer.h parallelsurfacetransfer.h tetmesh.h prismMesh.h triSurfMesh.h mapbasic.h
d12 4
a15 2
TOBJS=$(MGCOBJS) GenericElement.o transfer.o tetmesh.o tetmesh_noboite.o geom_util.o
OBJS=$(TOBJS) tetmesh_fem.o paralleltransfer.o prismMesh.o parallelsurfacetransfer.o
@


1.9
log
@Adding prism mesh data structure to be used for surface transfer.
@
text
@d9 1
a9 1
HEADERS=paralleltransfer.h tetmesh.h prismMesh.h
d11 2
a12 2
TOBJS=$(MGCOBJS) GenericElement.o transfer.o tetmesh.o tetmesh_noboite.o
OBJS=$(TOBJS) tetmesh_fem.o paralleltransfer.o prismMesh.o
@


1.8
log
@Simplified and accellerated Mgc volume computation routines,
and added check against volume_planes.h routines.
@
text
@d9 1
a9 1
HEADERS=paralleltransfer.h tetmesh.h
d12 1
a12 1
OBJS=$(TOBJS) tetmesh_fem.o paralleltransfer.o
@


1.7
log
@Added in Mike Campbell's code for pointwise interpolation of nodal
attributes.  Also fixed several bugs in paralleltransfer.C.
@
text
@d24 5
a28 1
tests=$(test1) $(test2) $(test3)
d48 3
@


1.6
log
@Moved Mgc routine from mgc/ to this directory--
the Origin2000 compiler can't figure out how to
do template instantation with source files in
a subdirectory.
@
text
@d2 1
a2 1
CHARMC=$(CDIR)/bin/charmc $(OPTS)
d11 1
a11 1
TOBJS=$(MGCOBJS) transfer.o tetmesh.o tetmesh_noboite.o
d18 2
a19 2
test1=test_cg3d
test1o=$(test1).C $(TOBJS) charm_standalone.o
@


1.5
log
@Fix for Compaq make-- remove gmake-specific .o rule.
(Error: Multiple rules lines for `%.o')
@
text
@d5 1
a5 1
MGC=mgc
d60 1
a60 1
	$(CHARMC) -c $< -o $@@
d63 1
a63 1
	$(CHARMC) -c $< -o $@@
@


1.4
log
@Minor tweaks to make paralleltransfer a real library, callable
from other programs:
  - Better interface in header file (point data, xfer_t data type)
  - Makefile spits out .a instead of executable
  - Turn off debugging in headers
@
text
@d56 1
a56 8
# Trick gmake into compiling .C's into .o's.
%.o: %.C
	$(CHARMC) -c $< -o $@@

%.o: %.cpp
	$(CHARMC) -c $< -o $@@

# Trick other makes into compiling .C's into .o's.
@


1.3
log
@Removed calls to cg3d completely; now rely
completely on Mgc intersection routines.
@
text
@d9 1
a9 2
HEADERS=
# datatransfer.h
d12 5
a16 4
OBJS=$(TOBJS) tetmesh_fem.o paralleltransfer.o pgm.o
DEST=pgm
LIBS=-module collide -module fem -language ampi
#$(CDIR)/lib/libmoduledatatransfer.a
d26 1
a26 1
all: $(DEST) test
d28 2
a29 2
$(DEST): $(OBJS) $(COMPAT)
	$(CHARMC) $(OBJS) $(COMPAT) -o $@@ $(LIBS)
d46 1
a46 1
	./$(test2) test_noboite_dir/simple.noboite
@


1.2
log
@added code to use mgc
@
text
@d4 5
d11 2
a12 3
HEADDEP=$(HEADERS) cg3d.h
MGCOBJS=mgc/MgcIntr3DTetrTetr.o  mgc/MgcMath.o  mgc/MgcPlane.o  mgc/MgcTetrahedron.o  mgc/MgcVector3.o
TOBJS=$(MGCOBJS) cg3d.o transfer.o tetmesh.o tetmesh_noboite.o
d53 2
a54 1
	rm -rf *.a *.def.h *.decl.h *.o SunWS_cache $(DEST) $(tests) headers
d58 4
a61 1
	$(CHARMC) -c $<
d64 1
a64 1
.SUFFIXES: .C
d67 4
a70 1
	$(CHARMC) -c $<
@


1.1
log
@Initial checkin for data transfer library.
It's not an actual full-fledged "library" yet
(in particular, it's not yet callable from outside),
but it's getting close, and virtually all the files
(except "pgm.C") should be present in the library too.
@
text
@d7 2
a8 1
TOBJS=cg3d.o transfer.o tetmesh.o tetmesh_noboite.o
@

