reformatted tests

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4372 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-11 03:57:21 +00:00
parent b8069190e8
commit 9b89923bb8
4 changed files with 34 additions and 29 deletions

View File

@ -68,16 +68,16 @@ main(int argc, const char* argv[])
for (r = 0; r < GetSelectedOutputRowCount(id); ++r)
{
for (c = 0; c < GetSelectedOutputColumnCount(id); ++c)
{
if (GetSelectedOutputValue(id, r, c, &v) != IPQ_OK)
{
return EXIT_FAILURE;
}
VarClear(&v);
}
for (c = 0; c < GetSelectedOutputColumnCount(id); ++c)
{
if (GetSelectedOutputValue(id, r, c, &v) != IPQ_OK)
{
return EXIT_FAILURE;
}
VarClear(&v);
}
}
if (DestroyIPhreeqc(id) != IPQ_OK)
{
OutputError(id);

View File

@ -101,20 +101,20 @@ main(int argc, const char* argv[])
for (int r = 0; r < iphreeqc.GetSelectedOutputRowCount(); ++r)
{
for (int c = 0; c < iphreeqc.GetSelectedOutputColumnCount(); ++c)
{
VAR v;
if (iphreeqc.GetSelectedOutputValue(r, c, &v) != VR_OK)
{
return EXIT_FAILURE;
}
if (VarClear(&v) != VR_OK)
{
return EXIT_FAILURE;
}
}
for (int c = 0; c < iphreeqc.GetSelectedOutputColumnCount(); ++c)
{
VAR v;
if (iphreeqc.GetSelectedOutputValue(r, c, &v) != VR_OK)
{
return EXIT_FAILURE;
}
if (VarClear(&v) != VR_OK)
{
return EXIT_FAILURE;
}
}
}
return EXIT_SUCCESS;
}

View File

@ -93,12 +93,13 @@ C Selected output
ENDIF
DO 20 r=1,GetSelectedOutputRowCount(id)
DO 10 c=1,GetSelectedOutputColumnCount(id)
DO 10 c=1,GetSelectedOutputColumnCount(id)
IF (GetSelectedOutputValue(id,r,c,t,d,s).EQ.IPQ_OK) THEN
F_MAIN = EXIT_FAILURE
RETURN
CALL OutputError(id)
F_MAIN = EXIT_FAILURE
RETURN
ENDIF
10 CONTINUE
10 CONTINUE
20 CONTINUE
IF (DestroyIPhreeqc(id).NE.0) THEN
@ -113,6 +114,10 @@ C Selected output
END FUNCTION F_MAIN
FUNCTION TestGetSet(id,getFunc,setFunc)
IMPLICIT NONE

View File

@ -71,10 +71,10 @@ FUNCTION F_MAIN()
ENDIF
DO r=1,GetSelectedOutputRowCount(id)
DO c=1,GetSelectedOutputColumnCount(id)
DO c=1,GetSelectedOutputColumnCount(id)
IF (GetSelectedOutputValue(id,r,c,t,d,s).EQ.IPQ_OK) THEN
F_MAIN = EXIT_FAILURE
RETURN
F_MAIN = EXIT_FAILURE
RETURN
ENDIF
ENDDO
ENDDO