- wrappture fixes

svn path=/trunk/boinc/; revision=22820
This commit is contained in:
David Anderson 2010-12-06 03:06:31 +00:00
parent 02c380e0dc
commit ebe1256b58
3 changed files with 47 additions and 12 deletions

View File

@ -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

View File

@ -0,0 +1,43 @@
<?xml version="1.0"?>
<run>
<tool>
<about>Press Simulate to view results.</about>
<command>@tool/fermi @driver</command>
</tool>
<input>
<number id="temperature">
<about>
<label>Ambient temperature</label>
<description>Temperature of the environment.</description>
</about>
<units>K</units>
<min>0K</min>
<max>500K</max>
<default>300K</default>
<preset>
<value>300K</value>
<label>300K (room temperature)</label>
</preset>
<preset>
<value>77K</value>
<label>77K (liquid nitrogen)</label>
</preset>
<preset>
<value>4.2K</value>
<label>4.2K (liquid helium)</label>
</preset>
<current>300K</current>
</number>
<number id="Ef">
<about>
<label>Fermi Level</label>
<description>Energy at center of distribution.</description>
</about>
<units>eV</units>
<min>-10eV</min>
<max>10eV</max>
<default>0eV</default>
<current>0eV</current>
</number>
</input>
</run>

View File

@ -11,7 +11,7 @@
// redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
// ======================================================================
//#include "rappture.h"
#include "rappture.h"
#include <stdlib.h>
#include <stdio.h>
@ -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;