mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
formatting
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8213 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
ea0d5f0e6d
commit
6686cf481c
@ -14,7 +14,6 @@ IPHREEQC_LA = ../../_build/src/libiphreeqc.la
|
||||
TARGETS = \
|
||||
AccumulateLine \
|
||||
CreateIPhreeqc \
|
||||
GetCurrentSelectedOutputUserNumber \
|
||||
GetComponent \
|
||||
GetDumpString \
|
||||
GetErrorString \
|
||||
@ -26,6 +25,7 @@ TARGETS = \
|
||||
GetVersionString \
|
||||
Multi \
|
||||
SetBasicCallback \
|
||||
SetCurrentSelectedOutputUserNumber \
|
||||
IPhreeqc
|
||||
|
||||
|
||||
@ -54,9 +54,6 @@ CreateIPhreeqc: CreateIPhreeqc.lo $(IPHREEQC_LA)
|
||||
GetComponent: GetComponent.lo $(IPHREEQC_LA)
|
||||
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
|
||||
|
||||
GetCurrentSelectedOutputUserNumber: GetCurrentSelectedOutputUserNumber.lo $(IPHREEQC_LA)
|
||||
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
|
||||
|
||||
GetDumpString: GetDumpString.lo $(IPHREEQC_LA)
|
||||
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
|
||||
|
||||
@ -87,6 +84,8 @@ Multi: Multi.lo $(IPHREEQC_LA)
|
||||
SetBasicCallback: SetBasicCallback.lo $(IPHREEQC_LA)
|
||||
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
|
||||
|
||||
SetCurrentSelectedOutputUserNumber: SetCurrentSelectedOutputUserNumber.lo $(IPHREEQC_LA)
|
||||
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
|
||||
|
||||
IPhreeqc: IPhreeqc.lo $(IPHREEQC_LA)
|
||||
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA)
|
||||
@ -149,7 +148,6 @@ F90SetBasicFortranCallback: F90SetBasicFortranCallback.lo $(IPHREEQC_LA)
|
||||
LO_FILES = \
|
||||
AccumulateLine.lo \
|
||||
CreateIPhreeqc.lo \
|
||||
GetCurrentSelectedOutputUserNumber.lo \
|
||||
DestroyIPhreeqc.lo \
|
||||
GetComponent.lo \
|
||||
GetDumpString.lo \
|
||||
@ -162,6 +160,7 @@ LO_FILES = \
|
||||
GetVersionString.lo \
|
||||
Multi.lo \
|
||||
SetBasicCallback.lo \
|
||||
SetCurrentSelectedOutputUserNumber.lo \
|
||||
IPhreeqc.lo
|
||||
|
||||
|
||||
|
||||
@ -8,28 +8,28 @@ int main(void)
|
||||
char buffer[30];
|
||||
FILE* f;
|
||||
VAR v;
|
||||
|
||||
|
||||
id = CreateIPhreeqc();
|
||||
if (id < 0) {
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
if (LoadDatabase(id, "phreeqc.dat") != 0) {
|
||||
OutputErrorString(id);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
if (RunFile(id, "multi_punch") != 0) {
|
||||
OutputErrorString(id);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
VarInit(&v);
|
||||
|
||||
for (i = 0; i < GetSelectedOutputCount(id); ++i) {
|
||||
n = GetNthSelectedOutputUserNumber(id, i);
|
||||
sprintf(buffer, "sel_out.%d.out", n);
|
||||
|
||||
|
||||
if ((f = fopen(buffer, "w"))) {
|
||||
SetCurrentSelectedOutputUserNumber(id, n);
|
||||
|
||||
@ -38,7 +38,7 @@ int main(void)
|
||||
for (c = 0; c < GetSelectedOutputColumnCount(id); ++c) {
|
||||
|
||||
if (GetSelectedOutputValue(id, r, c, &v) == VR_OK) {
|
||||
|
||||
|
||||
switch (v.type) {
|
||||
case TT_LONG:
|
||||
fprintf(f, "%ld,", v.lVal);
|
||||
@ -65,11 +65,11 @@ int main(void)
|
||||
fclose(f);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (DestroyIPhreeqc(id) != IPQ_OK) {
|
||||
OutputErrorString(id);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user