Commit d6a17191 authored by hrchilds's avatar hrchilds

Make paraDIS compile on hoth.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7195 18c085ea-50e0-402c-830e-de6fd14e8384
parent e9668d1a
#
# Makefile for RC_c_lib
#
#
ifndef SYS_TYPE
export SYS_TYPE = $(shell uname)
endif
export MF-INCLUDE = $(shell cd ..; pwd)/mf-include
CWD = $(shell pwd)
export INSTALL_DIR ?= $(CWD)/$(SYS_TYPE)
$(warning INSTALL_DIR is $(INSTALL_DIR))
include $(MF-INCLUDE)/mf-include.$(SYS_TYPE)
SFILES=args.c debugutil.c signals.c fileutils.c inventor.c
#LDFLAGS=
#CXX = insure
#CC = insure
#CXX = insure
#export CC = purify gcc-3.2.3
#export CXX = purify g++-3.2.3
ARCHIVE=${INSTALL_DIR}/lib/librcc.a
TARGET=$(ARCHIVE)
LIBOBJS= ${SYS_TYPE}/debugutil.o ${SYS_TYPE}/args.o ${SYS_TYPE}/signals.o ${SYS_TYPE}/fileutils.o ${SYS_TYPE}/inventor.o
EXEOBJ=
EXE=
$(warning starting paradislib makefile)
all: library $(INSTALL_DIR)/lib/gprof-helper.so
debuglib:
export DEBUG=-g; make library
library: $(ARCHIVE)
$(ARCHIVE): $(LIBOBJS)
mkdir -p $(INSTALL_DIR)/lib $(INSTALL_DIR)/include
ar -r $(ARCHIVE) $(LIBOBJS)
ranlib $(ARCHIVE)
cp -p *h $(INSTALL_DIR)/include
$(INSTALL_DIR)/lib/gprof-helper.so: gprof-helper.c
$(CC) -shared -nostdlib -fPIC $^ -o $@ -lpthread -ldl
clean:
rm -rf $(SYS_TYPE)/*
uninstall:
rm -f $(TARGET)
install: $(INSTALL_DIR)/lib/librcc.a
MAKEDIR= [ -d $(1) ] || mkdir -p $(1)
clean-install:
make clean
make uninstall
make install
# DO NOT DELETE
#
# Makefile for RC_cpp_lib
#
#
#
#
default: all
ifndef SYS_TYPE
export SYS_TYPE = $(shell uname)
endif
INSTALL_DIR ?= $(SYS_TYPE)
MF-INCLUDE = $(shell cd ..; pwd)/mf-include
include $(MF-INCLUDE)/mf-include.$(SYS_TYPE)
#LDFLAGS=
#CXX = insure
#CC = insure
#CXX = insure
TESTNAME = test_program
#LIBEFENCE = /g/g0/rcook/lib/redhat_7a_ia32/libefence.a
#CC = purify gcc-3.2.3
#CXX = purify g++-3.2.3
DBG_FLAG ?= -O2
DEBUG=$(DBG_FLAG)
#DEBUG=$(OPT_FLAG)
#USER_CFLAGS= -g
USER_CXXFLAGS=$(INCLUDES) -DNO_SETBUF
SFILES = RCDebugStream.C Prefs.C RangeList.C test.C timer.C pathutil.C
# separate idx lib target, so it doesn't get deleted during make clean...
ARCHIVE= $(SYS_TYPE)/lib/librccpp.a
TESTPROG=$(SYS_TYPE)/bin/testprogram
LIBOBJS=$(SYS_TYPE)/Prefs.o $(SYS_TYPE)/RCDebugStream.o $(SYS_TYPE)/RangeList.o $(SYS_TYPE)/timer.o
all: $(TESTPROG) $(ARCHIVE)
install: $(INSTALL_DIR)/lib/librccpp.a
$(INSTALL_DIR)/lib/librccpp.a: $(ARCHIVE)
mkdir -p $(INSTALL_DIR)/lib
cp $(ARCHIVE) $@
MAKEDIR= [ -d $(1) ] || mkdir -p $(1)
$(ARCHIVE): $(LIBOBJS)
mkdir -p $$(dirname $(ARCHIVE)) $(INSTALL_DIR)/include
ar rsc $@ $(LIBOBJS)
ranlib $@
@echo $@ created
cp -p *h $(INSTALL_DIR)/include
testprog: $(TESTPROG)
$(TESTPROG): $(SYS_TYPE)/test.o $(ARCHIVE)
mkdir -p $$(dirname $(TESTPROG))
$(CXX) -o $(TESTPROG) $(LIBEFENCE) $(LDLIBS) $(ARCHIVE) $^
@echo $@ created
clean: undepend
rm -rf $(SYS_TYPE)/*.o $(SYS_TYPE)/*.a
uninstall:
rm -f $(READERDIR)/$(LIBNAME) $(READERDIR)/$(TESTLIBNAME)
clean-install: clean install
$(SYS_TYPE)/boost_1_33_1/boost/version.hpp:
$(call MKDIR_SYSTYPE)
cd $(SYS_TYPE); \
tar -xvf ../boost_1_33_1.tar
$(SYS_TYPE)/boost_1_35_0/boost/version.hpp:
$(call MKDIR_SYSTYPE)
cd $(SYS_TYPE); \
tar -xvzf ../boost_1_35_0.tar.gz;
libboost: $(SYS_TYPE)/boost_1_35_0/boost/version.hpp
# DO NOT DELETE
#include "stringutil.h"
#if defined(_WIN32)
#else
#include <unistd.h>
#endif
//===============================================================
/*!
......
......@@ -160,7 +160,7 @@ void TestStrings(void) {
ADDTEST("test1 test2 test3", "(test1, test2, test3)");
ADDTEST(" ", "()");
vector<string>::iterator pos = tests.begin(), endpos = tests.end();
uint32_t testnum = 0;
unsigned int testnum = 0;
while (testnum < tests.size()) {
RunTest(testnum, tests, expectedResults);
++testnum;
......
# $Id: Makefile,v 1.12 2009/04/30 00:55:15 rcook Exp $
# $File$
# paraDIS makefile
#
# Makefile for paraDIS library
#
DEBUG ?= -g
INSTALL_DIR ?= $(HOME)/$(SYS_TYPE)
ifndef SYS_TYPE
export SYS_TYPE = $(shell uname)
endif
CWD = $(shell pwd)
MF-INCLUDE ?= $(CWD)/mf-include
include $(MF-INCLUDE)/mf-include.$(SYS_TYPE)
SFILES = paradis.C paradis_c_interface.C paradisStreaming.C paradisTest.C analyzeParaDIS.C
INCLUDES = -I$(CWD)/RC_c_lib -I$(CWD)/RC_cpp_lib
LDFLAGS+=-lstdc++
#ELECTRIC_FENCE = libefence.a -lpthread
#CXX = purify g++-3.2.3
#CC = purify gcc-3.2.3
#USER_CFLAGS= -g
USER_CXXFLAGS+=$(INCLUDES) -DNO_SETBUF
PARADISLIB = $(CWD)/$(SYS_TYPE)/lib/libparadis.a
RCCLIB=$(INSTALL_DIR)/lib/librcc.a
RCCPPLIB=$(INSTALL_DIR)/lib/librccpp.a
TARGETS = $(CWD)/$(SYS_TYPE)/bin/paradisTest $(CWD)/$(SYS_TYPE)/bin/paradisStreamingTest $(CWD)/$(SYS_TYPE)/bin/analyzeParaDIS
all: $(TARGETS)
debug:
DEBUG=-g $(MAKE) all
install: all
mkdir -p $(INSTALL_DIR)/bin && cp $(TARGETS) $(INSTALL_DIR)/bin
libparadis: $(PARADISLIB)
$(SYS_TYPE)/paradis.o: paradis.C
$(CXX) $(CXXFLAGS) -c -o $@ $<
@echo DONE WITH $@
$(SYS_TYPE)/paradisStreaming.o: paradisStreaming.C
$(CXX) $(CXXFLAGS) -c -o $@ $<
@echo DONE WITH $@
$(SYS_TYPE)/paradis_c_interface.o: paradis_c_interface.C
$(CXX) $(CXXFLAGS) -c -o $@ $<
@echo DONE WITH $@
$(PARADISLIB): $(RCCLIB) $(RCCPPLIB) $(SYS_TYPE)/paradis_c_interface.o $(SYS_TYPE)/paradis.o $(SYS_TYPE)/paradisStreaming.o
[ -d $(SYS_TYPE)/lib/rclibobjs ] || mkdir -p $(SYS_TYPE)/lib/rclibobjs
cd $(SYS_TYPE)/lib/rclibobjs && ar -x $(RCCPPLIB) && ar -x $(RCCLIB)
# ar -rc $@ $(SYS_TYPE)/paradis_c_interface.o $(SYS_TYPE)/paradis.o $(RCCLIB) $(RCCPPLIB)
ar -rc $@ $(SYS_TYPE)/paradisStreaming.o $(SYS_TYPE)/paradis_c_interface.o $(SYS_TYPE)/paradis.o $(SYS_TYPE)/lib/rclibobjs/*.o
@echo DONE WITH $@
$(CWD)/$(SYS_TYPE)/bin/paradisTest: $(SYS_TYPE)/paradisTest.o $(PARADISLIB) $(RCCLIB)
[ -d $(SYS_TYPE)/bin ] || mkdir -p $(SYS_TYPE)/bin
$(LD) -o $@ $(LDFLAGS) $^ $(ELECTRIC_FENCE)
$(CWD)/$(SYS_TYPE)/bin/analyzeParaDIS: $(SYS_TYPE)/analyzeParaDIS.o $(PARADISLIB) $(RCCLIB)
[ -d $(SYS_TYPE)/bin ] || mkdir -p $(SYS_TYPE)/bin
$(LD) -o $@ $(LDFLAGS) $^ $(ELECTRIC_FENCE)
$(CWD)/$(SYS_TYPE)/bin/paradisStreamingTest: $(SYS_TYPE)/paradisStreamingTest.o $(PARADISLIB) $(RCCLIB)
[ -d $(SYS_TYPE)/bin ] || mkdir -p $(SYS_TYPE)/bin
$(LD) -o $@ $(LDFLAGS) $^ $(ELECTRIC_FENCE)
.DUMMY:
$(RCCLIB): .DUMMY
cd RC_c_lib; $(MAKE) depend; $(MAKE) install
$(RCCPPLIB): .DUMMY
cd RC_cpp_lib; $(MAKE) depend; $(MAKE) install
clean: undepend
rm -rf $(PROGNAME) makeworms *.o $(SYS_TYPE)/* *~ $(SYS_TYPE)/lib/*o $(SYS_TYPE)/lib/*a
realclean: clean
cd RC_cpp_lib; $(MAKE) undepend; $(MAKE) clean;
cd RC_c_lib; $(MAKE) undepend; $(MAKE) clean;
undepend:
makedepend -Y $(SFILES)
for dir in `pwd`/RC_c_lib `pwd`/RC_cpp_lib ; do cd $$dir; $(MAKE) undepend; done
# DO NOT DELETE
paradis.o: paradis.h
paradis_c_interface.o: paradis.h paradis_c_interface.h
paradisStreaming.o: paradisStreaming.h paradis.h
paradisTest.o: paradis.h RC_c_lib/debugutil.h RC_c_lib/args.h
analyzeParaDIS.o: paradis.h RC_c_lib/args.h
#
# Makefile for RC_c_lib
#
#
ifndef SYS_TYPE
export SYS_TYPE = $(shell uname)
endif
export MF-INCLUDE = $(shell cd ..; pwd)/mf-include
CWD = $(shell pwd)
export INSTALL_DIR ?= $(CWD)/$(SYS_TYPE)
$(warning INSTALL_DIR is $(INSTALL_DIR))
include $(MF-INCLUDE)/mf-include.$(SYS_TYPE)
SFILES=args.c debugutil.c signals.c fileutils.c inventor.c
#LDFLAGS=
#CXX = insure
#CC = insure
#CXX = insure
#export CC = purify gcc-3.2.3
#export CXX = purify g++-3.2.3
ARCHIVE=${INSTALL_DIR}/lib/librcc.a
TARGET=$(ARCHIVE)
LIBOBJS= ${SYS_TYPE}/debugutil.o ${SYS_TYPE}/args.o ${SYS_TYPE}/signals.o ${SYS_TYPE}/fileutils.o ${SYS_TYPE}/inventor.o
EXEOBJ=
EXE=
$(warning starting paradislib makefile)
all: library $(INSTALL_DIR)/lib/gprof-helper.so
debuglib:
export DEBUG=-g; make library
library: $(ARCHIVE)
$(ARCHIVE): $(LIBOBJS)
mkdir -p $(INSTALL_DIR)/lib $(INSTALL_DIR)/include
ar -r $(ARCHIVE) $(LIBOBJS)
ranlib $(ARCHIVE)
cp -p *h $(INSTALL_DIR)/include
$(INSTALL_DIR)/lib/gprof-helper.so: gprof-helper.c
$(CC) -shared -nostdlib -fPIC $^ -o $@ -lpthread -ldl
clean:
rm -rf $(SYS_TYPE)/*
uninstall:
rm -f $(TARGET)
install: $(INSTALL_DIR)/lib/librcc.a
MAKEDIR= [ -d $(1) ] || mkdir -p $(1)
clean-install:
make clean
make uninstall
make install
# DO NOT DELETE
#
# Makefile for RC_cpp_lib
#
#
#
#
default: all
ifndef SYS_TYPE
export SYS_TYPE = $(shell uname)
endif
INSTALL_DIR ?= $(SYS_TYPE)
MF-INCLUDE = $(shell cd ..; pwd)/mf-include
include $(MF-INCLUDE)/mf-include.$(SYS_TYPE)
#LDFLAGS=
#CXX = insure
#CC = insure
#CXX = insure
TESTNAME = test_program
#LIBEFENCE = /g/g0/rcook/lib/redhat_7a_ia32/libefence.a
#CC = purify gcc-3.2.3
#CXX = purify g++-3.2.3
DBG_FLAG ?= -O2
DEBUG=$(DBG_FLAG)
#DEBUG=$(OPT_FLAG)
#USER_CFLAGS= -g
USER_CXXFLAGS=$(INCLUDES) -DNO_SETBUF
SFILES = RCDebugStream.C Prefs.C RangeList.C test.C timer.C pathutil.C
# separate idx lib target, so it doesn't get deleted during make clean...
ARCHIVE= $(SYS_TYPE)/lib/librccpp.a
TESTPROG=$(SYS_TYPE)/bin/testprogram
LIBOBJS=$(SYS_TYPE)/Prefs.o $(SYS_TYPE)/RCDebugStream.o $(SYS_TYPE)/RangeList.o $(SYS_TYPE)/timer.o
all: $(TESTPROG) $(ARCHIVE)
install: $(INSTALL_DIR)/lib/librccpp.a
$(INSTALL_DIR)/lib/librccpp.a: $(ARCHIVE)
mkdir -p $(INSTALL_DIR)/lib
cp $(ARCHIVE) $@
MAKEDIR= [ -d $(1) ] || mkdir -p $(1)
$(ARCHIVE): $(LIBOBJS)
mkdir -p $$(dirname $(ARCHIVE)) $(INSTALL_DIR)/include
ar rsc $@ $(LIBOBJS)
ranlib $@
@echo $@ created
cp -p *h $(INSTALL_DIR)/include
testprog: $(TESTPROG)
$(TESTPROG): $(SYS_TYPE)/test.o $(ARCHIVE)
mkdir -p $$(dirname $(TESTPROG))
$(CXX) -o $(TESTPROG) $(LIBEFENCE) $(LDLIBS) $(ARCHIVE) $^
@echo $@ created
clean: undepend
rm -rf $(SYS_TYPE)/*.o $(SYS_TYPE)/*.a
uninstall:
rm -f $(READERDIR)/$(LIBNAME) $(READERDIR)/$(TESTLIBNAME)
clean-install: clean install
$(SYS_TYPE)/boost_1_33_1/boost/version.hpp:
$(call MKDIR_SYSTYPE)
cd $(SYS_TYPE); \
tar -xvf ../boost_1_33_1.tar
$(SYS_TYPE)/boost_1_35_0/boost/version.hpp:
$(call MKDIR_SYSTYPE)
cd $(SYS_TYPE); \
tar -xvzf ../boost_1_35_0.tar.gz;
libboost: $(SYS_TYPE)/boost_1_35_0/boost/version.hpp
# DO NOT DELETE
......@@ -160,7 +160,7 @@ void TestStrings(void) {
ADDTEST("test1 test2 test3", "(test1, test2, test3)");
ADDTEST(" ", "()");
vector<string>::iterator pos = tests.begin(), endpos = tests.end();
uint32_t testnum = 0;
unsigned int testnum = 0;
while (testnum < tests.size()) {
RunTest(testnum, tests, expectedResults);
++testnum;
......
......@@ -437,7 +437,7 @@ avtparaDIS_tecplotFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
void avtparaDIS_tecplotFileFormat::AddHexToMesh(vtkUnstructuredGrid *linemesh, vector<int> &hex) {
vtkIdType nodeIndices[2];
vtkIdType *ip = nodeIndices; // for printing
uint32_t segnum = 0;
unsigned int segnum = 0;
if (mFileType == "QUADRILATERAL") {
int index = 4, otherIndex;
while (index--) {
......
......@@ -112,7 +112,7 @@ class avtparaDIS_tecplotFileFormat : public avtSTSDFileFormat
string mFileType;
vector<string> mVariableNames;
uint32_t mNumElems, mNumPoints, mNumVars;
unsigned int mNumElems, mNumPoints, mNumVars;
bool mRotateTecplotPoints;
rclib::Point<float> mOldOrientation, mNewOrientation;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment