finished GetSeletectedOutputValue2

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6734 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-07-06 23:31:38 +00:00
parent c8efb96f8d
commit 9952bb955f
2 changed files with 16 additions and 12 deletions

View File

@ -7,47 +7,47 @@ const int SVALUE_LENGTH = 100;
int main(void)
{
int id, i, j, vtype;
double dvalue
double dvalue;
char svalue[SVALUE_LENGTH];
id = CreateIPhreeqc();
if (id < 0) {
return EXIT_FAILURE;
}
if (LoadDatabase(id, "phreeqc.dat") != 0) {
OutputErrorString(id);
return EXIT_FAILURE;
}
if (RunFile(id, "ex2") != 0) {
OutputErrorString(id);
return EXIT_FAILURE;
}
printf("selected-output:\n");
for (i = 0; i < GetSelectedOutputRowCount(id); ++i) {
for (j = 0; j < GetSelectedOutputColumnCount(id); ++j) {
if (GetSelectedOutputValue2(id, i, j, vtype, dvalue, svalue, SVALUE_LENGTH) == VR_OK) {
switch (v.type) {
if (GetSelectedOutputValue2(id, i, j, &vtype, &dvalue, svalue, SVALUE_LENGTH) == VR_OK) {
switch (vtype) {
case TT_LONG:
printf("%ld ", v.lVal);
printf("%ld ", (long)dvalue);
break;
case TT_DOUBLE:
printf("%g ", v.dVal);
printf("%g ", dvalue);
break;
case TT_STRING:
printf("%s ", v.sVal);
printf("%s ", svalue);
break;
}
}
}
printf("\n");
}
if (DestroyIPhreeqc(id)) {
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}

View File

@ -21,6 +21,7 @@ TARGETS = \
GetOutputString \
GetSelectedOutputString \
GetSelectedOutputValue \
GetSelectedOutputValue2 \
IPhreeqc
@ -65,6 +66,9 @@ GetSelectedOutputString: GetSelectedOutputString.lo $(IPHREEQC_LA)
GetSelectedOutputValue: GetSelectedOutputValue.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
GetSelectedOutputValue2: GetSelectedOutputValue2.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
IPhreeqc: IPhreeqc.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)