diff --git a/samples/wrappture/Makefile b/samples/wrappture/Makefile index b0684704dd..204d119bf5 100644 --- a/samples/wrappture/Makefile +++ b/samples/wrappture/Makefile @@ -4,7 +4,7 @@ BOINC_DIR = ../.. BOINC_API_DIR = $(BOINC_DIR)/api BOINC_LIB_DIR = $(BOINC_DIR)/lib -RAPPTURE_DIR = ~/rappture/rappture/src/core +RAPPTURE_DIR = /home/boincadm/rappture/rappture/src/core CXXFLAGS = -g \ -I$(BOINC_DIR) \ @@ -13,6 +13,7 @@ CXXFLAGS = -g \ -I$(RAPPTURE_DIR) \ -L$(BOINC_API_DIR) \ -L$(BOINC_LIB_DIR) \ + -L$(RAPPTURE_DIR) \ -L. PROGS = wrappture_example fermi @@ -32,7 +33,7 @@ wrappture.o: wrappture.cpp g++ $(CXXFLAGS) -c -o wrappture.o wrappture.cpp wrappture_example: wrappture.o wrappture_example.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(RAPPTURE_DIR)/librappture.a - g++ $(CXXFLAGS) -o wrappture_example wrappture_example.o wrappture.o libstdc++.a -pthread -lboinc_api -lboinc + g++ $(CXXFLAGS) -o wrappture_example wrappture_example.o wrappture.o $(RAPPTURE_DIR)/librappture.a libstdc++.a -pthread -lboinc_api -lboinc -lexpat -lz fermi: fermi.cpp g++ $(CSSFLAGS) -o fermi fermi.cpp diff --git a/samples/wrappture/driver.xml b/samples/wrappture/driver.xml new file mode 100644 index 0000000000..e7b13cf08f --- /dev/null +++ b/samples/wrappture/driver.xml @@ -0,0 +1,43 @@ + + + + Press Simulate to view results. + @tool/fermi @driver + + + + + + Temperature of the environment. + + K + 0K + 500K + 300K + + 300K + + + + 77K + + + + 4.2K + + + 300K + + + + + Energy at center of distribution. + + eV + -10eV + 10eV + 0eV + 0eV + + + diff --git a/samples/wrappture/wrappture_example.cpp b/samples/wrappture/wrappture_example.cpp index f4263b71cb..ec94a98857 100644 --- a/samples/wrappture/wrappture_example.cpp +++ b/samples/wrappture/wrappture_example.cpp @@ -11,7 +11,7 @@ // redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. // ====================================================================== -//#include "rappture.h" +#include "rappture.h" #include #include @@ -26,15 +26,6 @@ #include "filesys.h" #include "wrappture.h" -#define RPLIB_OVERWRITE 0 -#define RPLIB_APPEND 0 -struct RpLibrary{}; -RpLibrary* rpLibrary(char*){return new RpLibrary;} -void rpGetString(RpLibrary*, const char*, const char**){} -double rpConvertDbl(const char*, const char*, int*){return 0;} -void rpPutString (RpLibrary*, const char*, const char*, int){} -void rpResult(RpLibrary*){} - int main(int argc, char * argv[]) { RpLibrary* lib = NULL;