head	1.15;
access;
symbols
	charm6_1:1.15
	charm_6_0_1:1.14
	charm6_0_1:1.14
	charm6_0:1.13;
locks; strict;
comment	@# @;


1.15
date	2009.03.06.22.04.39;	author idooley2;	state Exp;
branches;
next	1.14;
commitid	3akeLeK8U2cYn1Ft;

1.14
date	2008.04.13.03.43.39;	author abecker;	state Exp;
branches;
next	1.13;
commitid	VFc86qaEaObNNTYs;

1.13
date	2007.08.28.17.48.45;	author abecker;	state Exp;
branches;
next	1.12;
commitid	52a746d45fdb4567;

1.12
date	2007.04.27.04.39.18;	author abecker;	state Exp;
branches;
next	1.11;
commitid	502d46317e6d4567;

1.11
date	2007.04.27.02.11.07;	author idooley2;	state Exp;
branches;
next	1.10;
commitid	10d846315bb34567;

1.10
date	2007.04.23.02.02.47;	author idooley2;	state Exp;
branches;
next	1.9;
commitid	3775462c13be4567;

1.9
date	2007.03.15.04.03.34;	author abecker;	state Exp;
branches;
next	1.8;
commitid	4c3445f8c58b4567;

1.8
date	2007.03.07.21.48.58;	author idooley2;	state Exp;
branches;
next	1.7;
commitid	7ccd45ef33474567;

1.7
date	2007.03.03.03.21.57;	author idooley2;	state Exp;
branches;
next	1.6;
commitid	416145e8e94c4567;

1.6
date	2007.02.22.03.01.39;	author idooley2;	state Exp;
branches;
next	1.5;
commitid	730845dd07834567;

1.5
date	2007.02.19.21.48.09;	author idooley2;	state Exp;
branches;
next	1.4;
commitid	2d2f45da1b154567;

1.4
date	2007.02.16.19.55.08;	author idooley2;	state Exp;
branches;
next	1.3;
commitid	7fed45d60c0f4567;

1.3
date	2007.02.14.01.46.49;	author idooley2;	state Exp;
branches;
next	1.2;
commitid	4f1845d269d84567;

1.2
date	2007.02.13.16.33.42;	author idooley2;	state Exp;
branches;
next	1.1;
commitid	439445d1e85e4567;

1.1
date	2007.02.13.16.29.58;	author idooley2;	state Exp;
branches;
next	;
commitid	42db45d1e77d4567;


desc
@@


1.15
log
@Modifications to get running on lincoln.
@
text
@CDIR=../../../..
CHARMC=$(CDIR)/bin/charmc $(OPTS)
#CUDADIR = /usr/local/cuda
#CUDASDK = $(HOME)/NVIDIA_CUDA_SDK
#CUDAC = $(CUDADIR)/bin/nvcc 
#CUDAINC = -I$(CUDASDK)/common/inc -I$(CUDADIR)/include


CCFLAGS = -DFP_TYPE_FLOAT -g
#CCFLAGS = -g
#CCFLAGS = -O



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

#Headers generated from .ci files
GENHEADERS= ParFUM_TOPS.def.h ParFUM_TOPS.decl.h 

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

OBJS=ParFUM_TOPS.o ParFUM_TOPS_Iterators.o 

LIB=libmoduleParFUM_TOPS

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

INCS=-I. 

all: $(DEST)


ParFUM_TOPS.decl.h: ParFUM_TOPS.ci
	$(CHARMC) ParFUM_TOPS.ci
ParFUM_TOPS.def.h: ParFUM_TOPS.decl.h


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

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

#ParFUM_TOPS.o: ParFUM_TOPS.C $(HEADDEP) ParFUM_TOPS.h
#	$(CHARMC) -c ParFUM_TOPS.C $(INCS)
ParFUM_TOPS.o: ParFUM_TOPS.cc $(HEADDEP) ParFUM_TOPS.h
	$(CHARMC) -c ParFUM_TOPS.cc $(INCS) $(CCFLAGS)

ParFUM_TOPS_Iterators.o: ParFUM_TOPS_Iterators.cc $(HEADDEP)
	$(CHARMC) -c ParFUM_TOPS_Iterators.cc $(CCFLAGS) $(INCS)

#ParFUM_TOPS_CUDA.o: ParFUM_TOPS_CUDA.cu $(HEADDEP)
#	$(CHARMC) -c ParFUM_TOPS_CUDA.cu $(CCFLAGS) $(INCS)


# clean up
clean:
	rm -rf *.a *.def.h *.decl.h *.o *~ SunWS_cache $(DEST) headers docs doxygen_warn_logfile
@


1.14
log
@merged in new facet/cohesive support, with associated update to ptops-explicit
app
@
text
@d9 1
a9 1
CCFLAGS = -DFP_TYPE_DOUBLE -g
@


1.13
log
@Now we only allocate user attributes in driver, to allow us to partition larger meshes
@
text
@d37 2
a38 2
ParFUM_TOPS.def.h: ParFUM_TOPS.ci
	$(CHARMC) ParFUM_TOPS.ci
@


1.12
log
@modifications for version 4
@
text
@d9 1
a9 1
CCFLAGS = -DFP_TYPE_FLOAT -O
@


1.11
log
@Now CUDA parallel version works
@
text
@d9 2
a10 2
#CCFLAGS = -DFP_TYPE_FLOAT -g
CCFLAGS = -g
@


1.10
log
@Version that works with CUDA
@
text
@d2 12
a13 6
CHARMC=$(CDIR)/bin/charmc -cc $(CUDAC) -c++ $(CUDAC) $(OPTS)
CUDADIR = /usr/local/cuda
CUDASDK = $(HOME)/NVIDIA_CUDA_SDK
CUDAC = $(CUDADIR)/bin/nvcc 
CUDAINC = -I$(CUDASDK)/common/inc -I$(CUDADIR)/include
CCFLAGS = -DCUDA -DFP_TYPE_FLOAT -g
d23 1
a23 1
OBJS=ParFUM_TOPS.o ParFUM_TOPS_Iterators.o ParFUM_TOPS_CUDA.o
d30 1
a30 1
INCS=-I. $(CUDAINC)
d58 2
a59 2
ParFUM_TOPS_CUDA.o: ParFUM_TOPS_CUDA.cu $(HEADDEP)
	$(CHARMC) -c ParFUM_TOPS_CUDA.cu $(CCFLAGS) $(INCS)
@


1.9
log
@added types.h to header list
@
text
@d2 6
a7 2
CHARMC=$(CDIR)/bin/charmc $(OPTS)
CUDAC=$(CHARMC)
d24 1
a24 1
INCS=-I.
d44 4
a47 2
ParFUM_TOPS.o: ParFUM_TOPS.C $(HEADDEP) ParFUM_TOPS.h
	$(CHARMC) -c ParFUM_TOPS.C $(INCS)
d49 2
a50 2
ParFUM_TOPS_Iterators.o: ParFUM_TOPS_Iterators.C $(HEADDEP)
	$(CHARMC) -c ParFUM_TOPS_Iterators.C $(INCS)
d52 2
a53 2
ParFUM_TOPS_CUDA.o: ParFUM_TOPS_CUDA.C $(HEADDEP)
	$(CUDAC) -c ParFUM_TOPS_CUDA.C $(INCS)
@


1.8
log
@More changes.
@
text
@d6 1
a6 1
HEADERS= ParFUM_TOPS.h ParFUM_TOPS_CUDA.h $(INTERNALHEADERS)
d36 1
a38 1
	touch headers
@


1.7
log
@This version works for the explicit FEA code provided by Professor Paolino.
@
text
@d3 1
d6 1
a6 1
HEADERS= ParFUM_TOPS.h  $(INTERNALHEADERS)
d13 1
a13 1
OBJS=ParFUM_TOPS.o ParFUM_TOPS_Iterators.o
d43 1
a43 1
ParFUM_TOPS_Iterators.o: ParFUM_TOPS_Iterators.C $(HEADDEP) ParFUM_TOPS.h
d46 3
@


1.6
log
@Added stubs for the rest of the functions needed by explicit FEA example
@
text
@d2 1
a2 1
CHARMC=$(CDIR)/bin/charmc $(OPTS) -g
@


1.5
log
@Minor change.
@
text
@d48 1
a48 1
	rm -rf *.a *.def.h *.decl.h *.o *~ SunWS_cache $(DEST) headers
@


1.4
log
@Fixed some iterators and adding of nodes
@
text
@d48 1
a48 1
	rm -rf *.a *.def.h *.decl.h *.o *~ SunWS_cache $(DEST)
@


1.3
log
@Moving ParFUM_TOPS code into its own directory, and adding it as a language in charmc.
@
text
@d2 1
a2 1
CHARMC=$(CDIR)/bin/charmc $(OPTS)
d12 1
a12 1
OBJS=ParFUM_TOPS.o
d42 3
@


1.2
log
@Adding dependencies for this module
@
text
@d7 3
a17 1
PARFUMMAIN=$(LIBDIR)/libParFUMmain.o
d24 5
@


1.1
log
@Adding a Makefile. May not yet work.
@
text
@a29 1
	cp $(GENHEADERS) $(CDIR)/include/
@

