head	1.34;
access;
symbols
	charm6_1:1.34
	charm_6_0_1:1.34
	charm6_0_1:1.34
	charm6_0:1.25
	ChaNGa_1-0:1.23
	threadpool:1.16.0.2;
locks; strict;
comment	@# @;


1.34
date	2008.11.24.22.06.47;	author gzheng;	state Exp;
branches;
next	1.33;
commitid	Xf8rGf2UkwlPFUrt;

1.33
date	2008.11.12.23.48.04;	author phil;	state Exp;
branches;
next	1.32;
commitid	nkeWja8FYePHCnqt;

1.32
date	2008.10.13.22.20.27;	author phil;	state Exp;
branches;
next	1.31;
commitid	dIzxCk2MqxTq6wmt;

1.31
date	2008.05.06.20.29.02;	author wilmarth;	state Exp;
branches;
next	1.30;
commitid	0cqGJMTwZIrSCW1t;

1.30
date	2008.04.30.07.03.13;	author gzheng;	state Exp;
branches;
next	1.29;
commitid	1kOI7jMJfiKim61t;

1.29
date	2008.04.16.06.07.36;	author abecker;	state Exp;
branches;
next	1.28;
commitid	xd5UrhnNYvwpviZs;

1.28
date	2008.04.15.18.24.40;	author wilmarth;	state Exp;
branches;
next	1.27;
commitid	tjjPyZm435FdCeZs;

1.27
date	2008.04.11.05.49.32;	author idooley2;	state Exp;
branches;
next	1.26;
commitid	qD74WtiRrmB1zEYs;

1.26
date	2008.02.04.02.44.36;	author idooley2;	state Exp;
branches;
next	1.25;
commitid	OFsocxCThrO5H1Qs;

1.25
date	2007.11.09.03.49.41;	author idooley2;	state Exp;
branches;
next	1.24;
commitid	5e024733d8a24567;

1.24
date	2007.02.13.17.21.37;	author idooley2;	state Exp;
branches;
next	1.23;
commitid	62ad45d1f39b4567;

1.23
date	2006.12.07.20.42.12;	author schak;	state Exp;
branches;
next	1.22;
commitid	13d845787c944567;

1.22
date	2006.11.09.23.04.12;	author schak;	state Exp;
branches;
next	1.21;
commitid	21c74553b3824567;

1.21
date	2006.10.30.05.12.36;	author schak;	state Exp;
branches;
next	1.20;
commitid	670e454589b14567;

1.20
date	2006.10.24.23.43.13;	author schak;	state Exp;
branches;
next	1.19;
commitid	32ef453ea4fd4567;

1.19
date	2006.10.24.22.32.17;	author schak;	state Exp;
branches;
next	1.18;
commitid	12b5453e945b4567;

1.18
date	2006.10.24.21.45.12;	author schak;	state Exp;
branches;
next	1.17;
commitid	7271453e894c4567;

1.17
date	2006.10.24.20.19.02;	author schak;	state Exp;
branches;
next	1.16;
commitid	5008453e75324567;

1.16
date	2006.10.04.03.54.40;	author idooley2;	state Exp;
branches;
next	1.15;
commitid	2a334523305e4567;

1.15
date	2006.08.03.17.36.14;	author schak;	state Exp;
branches;
next	1.14;

1.14
date	2006.07.26.21.19.53;	author schak;	state Exp;
branches;
next	1.13;

1.13
date	2006.06.08.00.59.14;	author nilesh;	state Exp;
branches;
next	1.12;

1.12
date	2006.03.16.19.47.48;	author nilesh;	state Exp;
branches;
next	1.11;

1.11
date	2006.03.09.23.27.42;	author idooley2;	state Exp;
branches;
next	1.10;

1.10
date	2006.02.08.20.14.05;	author idooley2;	state Exp;
branches;
next	1.9;

1.9
date	2006.02.08.20.07.13;	author idooley2;	state Exp;
branches;
next	1.8;

1.8
date	2006.02.08.19.57.37;	author idooley2;	state Exp;
branches;
next	1.7;

1.7
date	2006.02.08.19.00.36;	author idooley2;	state Exp;
branches;
next	1.6;

1.6
date	2005.12.10.03.26.14;	author idooley2;	state Exp;
branches;
next	1.5;

1.5
date	2005.12.09.18.55.12;	author idooley2;	state Exp;
branches;
next	1.4;

1.4
date	2005.12.04.02.34.30;	author nilesh;	state Exp;
branches;
next	1.3;

1.3
date	2005.12.03.17.30.42;	author idooley2;	state Exp;
branches;
next	1.2;

1.2
date	2005.12.03.06.49.32;	author idooley2;	state Exp;
branches;
next	1.1;

1.1
date	2005.12.03.01.56.46;	author idooley2;	state Exp;
branches;
next	;


desc
@@


1.34
log
@use our mpiCC instead of charmc  to compile MPI program (instead of using system mpiCC that mess around mpi.h)
@
text
@
CDIR=../../../..
CHARMC=$(CDIR)/bin/charmc $(OPTS)
MPICC=$(CDIR)/bin/mpiCC $(OPTS)

#Headers internal to ParFUM
INTERNALHEADERS= ParFUM_internals.h ParFUM_locking.h ParFUM_Mesh_Modify.h ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUM_Interpolate.h ParFUM_SA.h import.h adapt_adj.h bulk_adapt_ops.h bulk_adapt.h

#Headers to be copied to include directory so application users can see them
HEADERS= ParFUM.h ParFUMf.h  $(INTERNALHEADERS)

#Headers generated from .ci files
GENHEADERS= ParFUM.def.h ParFUM.decl.h ParFUM_Adapt.decl.h ParFUM_Adapt.def.h ParFUM_SA.def.h ParFUM_SA.decl.h

HEADDEP= $(GENHEADERS) $(HEADERS) $(INTERNALHEADERS)

OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o adapt_adj.o bulk_adapt_ops.o bulk_adapt.o mesh_feature_detect.o MsaHashtable.o

COMPAT=compat_init.o compat_finit.o compat_driver.o compat_fdriver.o 
LIB=libmoduleParFUM

LIBDIR=$(CDIR)/lib
DEST=$(LIBDIR)/$(LIB).a
COMPATLIB=$(LIBDIR)/libParFUM-compat.a
PARFUMMAIN=$(LIBDIR)/libParFUMmain.o

INCS=-I.

.PHONY: all
all: $(DEST) $(COMPATLIB) $(PARFUMMAIN) headers

ParFUM.def.h: ParFUM.decl.h
ParFUM.decl.h: ParFUM.ci
	$(CHARMC) ParFUM.ci
ParFUM_Adapt.def.h: ParFUM_Adapt.decl.h
ParFUM_Adapt.decl.h: mesh_modify.ci
	$(CHARMC) mesh_modify.ci
ParFUM_SA.def.h: ParFUM_SA.decl.h
ParFUM_SA.decl.h: ParFUM_SA.ci
	$(CHARMC) ParFUM_SA.ci

# Build libmoduleParFUM
$(DEST): $(OBJS) $(COMPAT) $(HEADDEP)
	$(CHARMC) $(OBJS) -o $@@
	cp $(LIB).dep $(LIBDIR)/$(LIB).dep

# Build libParFUM-compat
$(COMPATLIB): $(COMPAT)
	$(CHARMC) $(COMPAT) -o $@@

# Build fortran file with definitions for init and driver. 
# This allows us to use a single library with either fortran or c
$(PARFUMMAIN): main.C $(HEADDEP)
	$(MPICC) main.C -o $(PARFUMMAIN)

# Copy header files to include directory
.PHONY: headers
headers: $(HEADDEP)
	cp $(HEADERS) $(CDIR)/include/
	cp $(GENHEADERS) $(CDIR)/include/

#Automatic rules for some reason break because they don't use the dependencies
#.SUFFIXES: .c .o .C
#.c.o: $(HEADDEP) $< 
#	$(CHARMC) -c $<
#.C.o: $(HEADDEP) $<
#	$(CHARMC) -c $<


MsaHashtable.o: MsaHashtable.C $(HEADDEP)
	$(MPICC) -c MsaHashtable.C $(INCS)

mesh_modify.o: mesh_modify.C $(HEADDEP)
	$(MPICC) -c mesh_modify.C $(INCS)

ParFUM_SA.o: ParFUM_SA.C $(HEADDEP)
	$(MPICC) -c ParFUM_SA.C $(INCS)

ParFUM.o: ParFUM.C $(HEADDEP)
	$(MPICC) -c ParFUM.C $(INCS)

mesh.o: mesh.C $(HEADDEP)
	$(MPICC) -c mesh.C $(INCS)

symmetries.o: symmetries.C $(HEADDEP)
	$(MPICC) -c symmetries.C $(INCS)

partition.o: partition.C $(HEADDEP)
	$(MPICC) -c partition.C $(INCS)

map.o: map.C $(HEADDEP)
	$(MPICC) -c map.C $(INCS)

compat.o: compat.C $(HEADDEP)
	$(MPICC) -c compat.C $(INCS)

call_init.o: call_init.c $(HEADDEP)
	$(CHARMC) -c call_init.c $(INCS)

parallel_part.o: parallel_part.C $(HEADDEP) MsaHashtable.h
	$(MPICC) -c parallel_part.C $(INCS)

mesh_adjacency.o: mesh_adjacency.C $(HEADDEP)
	$(MPICC) -c mesh_adjacency.C $(INCS)

mesh_feature_detect.o: mesh_feature_detect.C $(HEADDEP)
	$(MPICC) -c mesh_feature_detect.C $(INCS)

adapt.o: adapt.C $(HEADDEP)
	$(MPICC) -c adapt.C $(INCS)

adapt_if.o: adapt_if.C $(HEADDEP)
	$(MPICC) -c adapt_if.C $(INCS)

adapt_algs.o: adapt_algs.C $(HEADDEP)
	$(MPICC) -c adapt_algs.C $(INCS)

interpolate.o: interpolate.C $(HEADDEP)
	$(MPICC) -c interpolate.C $(INCS)

lock.o: lock.C $(HEADDEP)
	$(MPICC) -c lock.C $(INCS)

util.o: util.C $(HEADDEP)
	$(MPICC) -c util.C $(INCS)

lock_node.o: lock_node.C $(HEADDEP)
	$(MPICC) -c lock_node.C $(INCS)

adapt_lock.o: adapt_lock.C $(HEADDEP)
	$(MPICC) -c adapt_lock.C $(INCS)

collide.o: collide.C $(HEADDEP)
	$(CHARMC) -c collide.C $(INCS)

compat_init.o: compat_init.c $(HEADDEP)
	$(CHARMC) -c compat_init.c $(INCS)

compat_finit.o: compat_finit.c $(HEADDEP)
	$(CHARMC) -c compat_finit.c $(INCS)

compat_driver.o: compat_driver.c $(HEADDEP)
	$(CHARMC) -c compat_driver.c $(INCS)

compat_fdriver.o: compat_fdriver.c $(HEADDEP)
	$(CHARMC) -c compat_fdriver.c $(INCS)

global_numbering.o: global_numbering.C $(HEADDEP)
	$(MPICC) -c global_numbering.C $(INCS)

import.o: import.C $(HEADDEP)
	$(MPICC) -c import.C $(INCS)

adapt_adj.o: adapt_adj.C $(HEADDEP)
	$(MPICC) -c adapt_adj.C $(INCS)

bulk_adapt_ops.o: bulk_adapt_ops.C $(HEADDEP)
	$(MPICC) -c bulk_adapt_ops.C $(INCS)

bulk_adapt.o: bulk_adapt.C $(HEADDEP)
	$(MPICC) -c bulk_adapt.C $(INCS)

docs: ParFUM.doxy ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUMf.h ParFUM.h ParFUM_internals.h ParFUM_Interpolate.h ParFUM_locking.h ParFUM_Mesh_Modify.h adapt_algs.C adapt.C adapt_if.C adapt_lock.C collide.C compat.C interpolate.C lock.C lock_node.C main.C map.C mesh_adjacency.C mesh.C mesh_modify.C MsaHashtable.C parallel_part.C ParFUM.C partition.C symmetries.C util.C call_init.c compat_driver.c compat_fdriver.c compat_finit.c compat_init.c ParFUM_SA.C global_numbering.C import.C import.h
	doxygen ParFUM.doxy

# clean up
.PHONY: clean
clean:
	rm -rf *.a *.def.h *.decl.h *.o *~ SunWS_cache $(DEST) $(COMPATLIB) $(GENHEADERS)
@


1.33
log
@Fix dependencies of test object MsaHashtable.o in ParFUM's Makefile
@
text
@d4 1
d54 1
a54 1
	$(CHARMC) main.C -o $(PARFUMMAIN)
d71 1
a71 1
	$(CHARMC) -c MsaHashtable.C $(INCS)
d74 1
a74 1
	$(CHARMC) -c mesh_modify.C $(INCS)
d77 1
a77 1
	$(CHARMC) -c ParFUM_SA.C $(INCS)
d80 1
a80 1
	$(CHARMC) -c ParFUM.C $(INCS)
d83 1
a83 1
	$(CHARMC) -c mesh.C $(INCS)
d86 1
a86 1
	$(CHARMC) -c symmetries.C $(INCS)
d89 1
a89 1
	$(CHARMC) -c partition.C $(INCS)
d92 1
a92 1
	$(CHARMC) -c map.C $(INCS)
d95 1
a95 1
	$(CHARMC) -c compat.C $(INCS)
d101 1
a101 1
	$(CHARMC) -c parallel_part.C $(INCS)
d104 1
a104 1
	$(CHARMC) -c mesh_adjacency.C $(INCS)
d107 1
a107 1
	$(CHARMC) -c mesh_feature_detect.C $(INCS)
d110 1
a110 1
	$(CHARMC) -c adapt.C $(INCS)
d113 1
a113 1
	$(CHARMC) -c adapt_if.C $(INCS)
d116 1
a116 1
	$(CHARMC) -c adapt_algs.C $(INCS)
d119 1
a119 1
	$(CHARMC) -c interpolate.C $(INCS)
d122 1
a122 1
	$(CHARMC) -c lock.C $(INCS)
d125 1
a125 1
	$(CHARMC) -c util.C $(INCS)
d128 1
a128 1
	$(CHARMC) -c lock_node.C $(INCS)
d131 1
a131 1
	$(CHARMC) -c adapt_lock.C $(INCS)
d149 1
a149 1
	$(CHARMC) -c global_numbering.C $(INCS)
d152 1
a152 1
	$(CHARMC) -c import.C $(INCS)
d155 1
a155 1
	$(CHARMC) -c adapt_adj.C $(INCS)
d158 1
a158 1
	$(CHARMC) -c bulk_adapt_ops.C $(INCS)
d161 1
a161 1
	$(CHARMC) -c bulk_adapt.C $(INCS)
@


1.32
log
@Revise ParFUM and MSA to match new interface. Everything builds again.
@
text
@d69 1
a69 1
MsaHashtable.o: MsaHashtable.C ParFUM.h ParFUM_internals.h MsaHashtable.h
@


1.31
log
@
Noises off in parallel_part.  First bulk_adapt refinement algorithm (almost) ready.
@
text
@d16 1
a16 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o adapt_adj.o bulk_adapt_ops.o bulk_adapt.o mesh_feature_detect.o
d69 3
d99 1
a99 1
parallel_part.o: parallel_part.C $(HEADDEP)
d162 1
a162 1
docs: ParFUM.doxy ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUMf.h ParFUM.h ParFUM_internals.h ParFUM_Interpolate.h ParFUM_locking.h ParFUM_Mesh_Modify.h adapt_algs.C adapt.C adapt_if.C adapt_lock.C collide.C compat.C interpolate.C lock.C lock_node.C main.C map.C mesh_adjacency.C mesh.C mesh_modify.C parallel_part.C ParFUM.C partition.C symmetries.C util.C call_init.c compat_driver.c compat_fdriver.c compat_finit.c compat_init.c ParFUM_SA.C global_numbering.C import.C import.h
@


1.30
log
@change it so that it does not make parfum libs every time typing make, this is needed for autobuild when libs have to be built on frontend node instead of on compute nodes.
@
text
@d6 1
a6 1
INTERNALHEADERS= ParFUM_internals.h ParFUM_locking.h ParFUM_Mesh_Modify.h ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUM_Interpolate.h ParFUM_SA.h import.h adapt_adj.h bulk_adapt_ops.h
d16 1
a16 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o adapt_adj.o bulk_adapt_ops.o mesh_feature_detect.o
d156 3
@


1.29
log
@added phony targets to fix headers hack and make sure libraries are always rebuilt when necessary
@
text
@d29 1
a29 1
all: $(DEST) $(COMPATLIB) $(PARFUMMAIN)
d42 1
a42 1
$(DEST): $(OBJS) $(COMPAT) headers $(HEADDEP)
@


1.28
log
@*** empty log message ***
@
text
@d28 1
d56 1
a59 2
	touch headers

d160 1
@


1.27
log
@Modifications to support multiple element types for new TOPS layer.
@
text
@d3 1
a3 1
CHARMC=$(CDIR)/bin/charmc $(OPTS) -g
@


1.26
log
@Minor changes to makefile(parallel make will work better) and to one of the IndexAttributes
@
text
@d3 1
a3 1
CHARMC=$(CDIR)/bin/charmc $(OPTS)
@


1.25
log
@Added support for feature detection for 2-d triangular meshes, along with some auxiliary helper functions that deal with adjacencies.
@
text
@d1 1
d30 1
d33 1
a33 4
ParFUM.def.h: ParFUM.ci
	$(CHARMC) ParFUM.ci
ParFUM_Adapt.def.h: mesh_modify.ci
	$(CHARMC) mesh_modify.ci
d36 1
a36 2
ParFUM_SA.def.h: ParFUM_SA.ci
	$(CHARMC) ParFUM_SA.ci
@


1.24
log
@Moving away TOPS files.
@
text
@d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o adapt_adj.o bulk_adapt_ops.o
d104 3
@


1.23
log
@Bulk Adapt added to build
@
text
@d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o ParFUM_TOPS.o adapt_adj.o bulk_adapt_ops.o
a79 3
ParFUM_TOPS.o: ParFUM_TOPS.C $(HEADDEP) ParFUM_TOPS.h
	$(CHARMC) -c ParFUM_TOPS.C $(INCS)

d145 1
a145 1
	
@


1.22
log
@Checked in adapt_adj code and changes to get it work
@
text
@d5 1
a5 1
INTERNALHEADERS= ParFUM_internals.h ParFUM_locking.h ParFUM_Mesh_Modify.h ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUM_Interpolate.h ParFUM_SA.h import.h adapt_adj.h
d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o ParFUM_TOPS.o adapt_adj.o
d155 2
@


1.21
log
@Added adpat_adj.h to the dependency of adapt_adj.o
@
text
@d5 1
a5 1
INTERNALHEADERS= ParFUM_internals.h ParFUM_locking.h ParFUM_Mesh_Modify.h ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUM_Interpolate.h ParFUM_SA.h import.h
d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o ParFUM_TOPS.o
d152 1
a152 1
adapt_adj.o: adapt_adj.C $(HEADDEP) adapt_adj.h
@


1.20
log
@Added the method to guess the shape of the element in a particular element type
@
text
@d152 1
a152 1
adapt_adj.o: adapt_adj.C $(HEADDEP)
@


1.19
log
@Turned off compilation of import.C by mistake instead of adapt_adj.C
@
text
@d152 2
a153 2
#adapt_adj.o: adapt_adj.C $(HEADDEP)
#	$(CHARMC) -c adapt_adj.C $(INCS)
@


1.18
log
@Added code to do lookups for adapt adjacencies
@
text
@d149 2
a150 2
# import.o: import.C $(HEADDEP)
#	$(CHARMC) -c import.C $(INCS)
d152 2
a153 2
adapt_adj.o: adapt_adj.C $(HEADDEP)
	$(CHARMC) -c adapt_adj.C $(INCS)
@


1.17
log
@check
@
text
@d149 6
a154 2
import.o: import.C $(HEADDEP)
	$(CHARMC) -c import.C $(INCS)
@


1.16
log
@An initial start to an implementation of TOPS on ParFUM. This is far from complete.
@
text
@d152 1
a152 1
docs: ParFUM.doxy ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUMf.h ParFUM.h ParFUM_internals.h ParFUM_Interpolate.h ParFUM_locking.h ParFUM_Mesh_Modify.h adapt_algs.C adapt.C adapt_if.C adapt_lock.C collide.C compat.C interpolate.C lock.C lock_node.C main.C map.C mesh_adjacency.C mesh.C mesh_modify.C parallel_part.C ParFUM.C partition.C symmetries.C util.C call_init.c compat_driver.c compat_fdriver.c compat_finit.c compat_init.c ParFUM_SA.C
@


1.15
log
@added import.C and .h to the makefile
@
text
@d8 1
a8 1
HEADERS= ParFUM.h ParFUMf.h $(INTERNALHEADERS)
d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o import.o
d25 2
d72 1
a72 1
	$(CHARMC) -c mesh_modify.C
d75 1
a75 1
	$(CHARMC) -c ParFUM_SA.C
d78 4
a81 1
	$(CHARMC) -c ParFUM.C
d84 1
a84 1
	$(CHARMC) -c mesh.C
d87 1
a87 1
	$(CHARMC) -c symmetries.C
d90 1
a90 1
	$(CHARMC) -c partition.C
d93 1
a93 1
	$(CHARMC) -c map.C
d96 1
a96 1
	$(CHARMC) -c compat.C
d99 1
a99 1
	$(CHARMC) -c call_init.c
d102 1
a102 1
	$(CHARMC) -c parallel_part.C
d105 1
a105 1
	$(CHARMC) -c mesh_adjacency.C
d108 1
a108 1
	$(CHARMC) -c adapt.C
d111 1
a111 1
	$(CHARMC) -c adapt_if.C
d114 1
a114 1
	$(CHARMC) -c adapt_algs.C
d117 1
a117 1
	$(CHARMC) -c interpolate.C
d120 1
a120 1
	$(CHARMC) -c lock.C
d123 1
a123 1
	$(CHARMC) -c util.C
d126 1
a126 1
	$(CHARMC) -c lock_node.C
d129 1
a129 1
	$(CHARMC) -c adapt_lock.C
d132 1
a132 1
	$(CHARMC) -c collide.C
d135 1
a135 1
	$(CHARMC) -c compat_init.c
d138 1
a138 1
	$(CHARMC) -c compat_finit.c
d141 1
a141 1
	$(CHARMC) -c compat_driver.c
d144 1
a144 1
	$(CHARMC) -c compat_fdriver.c
d147 1
a147 1
	$(CHARMC) -c global_numbering.C
d150 1
a150 1
	$(CHARMC) -c import.C
@


1.14
log
@added file for globally renumbering nodes
@
text
@d5 1
a5 1
INTERNALHEADERS= ParFUM_internals.h ParFUM_locking.h ParFUM_Mesh_Modify.h ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUM_Interpolate.h ParFUM_SA.h
d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o global_numbering.o
d144 2
@


1.13
log
@there are two important changes, one is the addition of the new shadow array
and the other is that we have now made a parfum module and the other modules
Parfum_adapt and Parfum_SA are included in this, earlier we had a mess, fem, parfum...
People should do a make clean; make
@
text
@d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o ParFUM_SA.o
d141 4
@


1.12
log
@a doxygen file and support for make docs.. the cocmments though still have to be converted to
doxygen format.. i'll also be adding much more comments
@
text
@d5 1
a5 1
INTERNALHEADERS= ParFUM_internals.h ParFUM_locking.h ParFUM_Mesh_Modify.h ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUM_Interpolate.h
d11 1
a11 1
GENHEADERS= ParFUM.def.h ParFUM.decl.h fem.decl.h fem.def.h
d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o adapt_if.o interpolate.o lock.o util.o lock_node.o adapt_lock.o             
d27 1
a27 1
fem.decl.h: ParFUM.ci
d29 1
a29 1
fem.def.h: ParFUM.ci
d31 1
a31 1
ParFUM.def.h: mesh_modify.ci
d33 1
a33 1
ParFUM.decl.h: mesh_modify.ci
d35 4
a38 1

d72 3
d141 1
a141 1
docs: ParFUM.doxy ParFUM_Adapt_Algs.h ParFUM_Adapt.h ParFUMf.h ParFUM.h ParFUM_internals.h ParFUM_Interpolate.h ParFUM_locking.h ParFUM_Mesh_Modify.h adapt_algs.C adapt.C adapt_if.C adapt_lock.C collide.C compat.C interpolate.C lock.C lock_node.C main.C map.C mesh_adjacency.C mesh.C mesh_modify.C parallel_part.C ParFUM.C partition.C symmetries.C util.C call_init.c compat_driver.c compat_fdriver.c compat_finit.c compat_init.c
@


1.11
log
@Splitting out some of the internal headers into separate files.
@
text
@d135 2
a136 1

@


1.10
log
@Removed cktimer.h
@
text
@d4 3
d8 1
a8 4
HEADERS= ParFUM.h ParFUMf.h ParFUM_internals.h

#Headers internal to ParFUM
INTERNALHEADERS= ParFUM_internals.h
d11 1
a11 1
GENHEADERS= ParFUM.def.h	ParFUM.decl.h fem.decl.h fem.def.h
@


1.9
log
@Cleaning up and merging header files.
@
text
@d5 1
a5 1
HEADERS= ParFUM.h ParFUMf.h ParFUM_internals.h cktimer.h
a54 1
	cp cktimer.h $(CDIR)/include/
@


1.8
log
@Some modifications back-ported from fem. Modified the dependencies so that ParFUM is separate from fem.
@
text
@d8 1
a8 1
INTERNALHEADERS= ParFUM_internals.h vector2d.h
a54 1
	cp vector2d.h $(CDIR)/include/
@


1.7
log
@Merged most header files into ParFUM.h and ParFUM_internals.h
@
text
@d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o interpolate.o lock.o util.o lock_node.o adapt_lock.o             
d101 3
@


1.6
log
@Moved collide.h which conflicts with ../collide/collide.h
@
text
@d5 1
a5 1
HEADERS= ParFUM.h ParFUMf.h
d8 1
a8 1
INTERNALHEADERS= mesh.h impl.h parallel_part.h map.h mesh_modify.h  ParFUM_adapt.h adapt_algs.h interpolate.h lock.h util.h lock_node.h adapt_lock.h ParFUM_adapt_if.h ParFUM_collide.h
a26 1

@


1.5
log
@Removed collision detection from ParFUM until I can figure out the makefile dependencies.
@
text
@d8 1
a8 1
INTERNALHEADERS= mesh.h impl.h parallel_part.h map.h mesh_modify.h  ParFUM_adapt.h collide.h adapt_algs.h interpolate.h lock.h util.h lock_node.h adapt_lock.h ParFUM_adapt_if.h
@


1.4
log
@fixed the makefile and made a proper parfum module, still have to fix the translator perhaps to support
-language parfum, otherwise init never gets called from an application.
@
text
@d15 1
a15 1
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o call_init.o parallel_part.o mesh_modify.o mesh_adjacency.o adapt.o adapt_algs.o interpolate.o lock.o util.o lock_node.o adapt_lock.o collide.o             
@


1.3
log
@Added explicit rules for each .C file. The implicit rules were ignoring dependencies, and thus sometimes causing problems.
@
text
@d11 1
a11 1
GENHEADERS= FEMMeshModify.def.h	FEMMeshModify.decl.h fem.decl.h fem.def.h
d32 1
a32 1
FEMMeshModify.def.h: mesh_modify.ci
d34 1
a34 1
FEMMeshModify.decl.h: mesh_modify.ci
d55 1
d90 2
a91 2
call_init.o: call_init.C $(HEADDEP)
	$(CHARMC) -c call_init.C
d123 2
a124 2
compat_init.o: compat_init.C $(HEADDEP)
	$(CHARMC) -c compat_init.C
d126 2
a127 2
compat_finit.o: compat_finit.C $(HEADDEP)
	$(CHARMC) -c compat_finit.C
d129 2
a130 2
compat_driver.o: compat_driver.C $(HEADDEP)
	$(CHARMC) -c compat_driver.C
d132 2
a133 2
compat_fdriver.o: compat_fdriver.C $(HEADDEP)
	$(CHARMC) -c compat_fdriver.C
@


1.2
log
@Minor Changes to makefile & headers
@
text
@d4 1
d7 2
a8 4
INTERNALHEADERS= mesh.h impl.h parallel_part.h map.h    \
		mesh_modify.h  ParFUM_adapt.h collide.h    \
		adapt_algs.h interpolate.h lock.h util.h   \
		lock_node.h adapt_lock.h ParFUM_adapt_if.h
d10 2
a11 2
GENHEADERS= FEMMeshModify.def.h	FEMMeshModify.decl.h   \
		fem.decl.h fem.def.h
d15 1
a15 5
OBJS=ParFUM.o mesh.o symmetries.o partition.o map.o compat.o \
	 call_init.o parallel_part.o mesh_modify.o                \
	 mesh_adjacency.o adapt.o adapt_algs.o        \
	 interpolate.o lock.o util.o lock_node.o      \
	 adapt_lock.o collide.o                               
a22 2

#Should this be here?:
a24 11
#Automatic rules:
.SUFFIXES: .c .o .C .decl.h .ci .def.h
.ci.decl.h: $< $(HEADDEP)
	$(CHARMC) $<
.ci.def.h: $< $(HEADDEP)
	$(CHARMC) $<
.c.o: $< $(HEADDEP)
	$(CHARMC) -c $<
.C.o: $< $(HEADDEP)
	$(CHARMC) -c $<

a27 1
#Manual rules since some dependencies are a little screwy. These should be fixed
a31 1

d47 2
d59 77
@


1.1
log
@ParFUM has been forked off of the FEM tree where it had been living.
@
text
@d79 1
a79 1
	rm -rf *.a *.def.h *.decl.h *.o SunWS_cache $(DEST) $(COMPATLIB)
@

