max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

working on Dump/Output routines

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5951 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2011-12-28 22:58:01 +00:00
parent 7bbabd61e2
commit b7b845adfd
3 changed files with 104 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IPhreeqc.cpp
View File

@ -591,8 +591,11 @@ int IPhreeqc::RunString(const char* input)
void IPhreeqc::SetDumpFileName(const char *filename)
{
this->DumpFileName = filename;
this->PhreeqcPtr->dump_info.Set_file_name(this->DumpFileName);
if (filename && ::strlen(filename))
{
this->DumpFileName = filename;
this->PhreeqcPtr->dump_info.Set_file_name(this->DumpFileName);
}
}
void IPhreeqc::SetDumpFileOn(bool bValue)
@ -617,7 +620,10 @@ void IPhreeqc::SetLogFileOn(bool bValue)
void IPhreeqc::SetOutputFileName(const char *filename)
{
this->OutputFileName = filename;
if (filename && ::strlen(filename))
{
this->OutputFileName = filename;
}
}
void IPhreeqc::SetOutputStringOn(bool bValue)

30
IPhreeqcF.f
View File

@ -66,6 +66,13 @@
INTEGER(KIND=4) :: GetComponentCountF
GetComponentCount = GetComponentCountF(ID)
END FUNCTION GetComponentCount
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE GetDumpFileName(ID,FNAME)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: FNAME
CALL GetDumpFileNameF(ID,FNAME)
END SUBROUTINE GetDumpFileName
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetDumpFileOn(ID)
IMPLICIT NONE
@ -154,6 +161,13 @@
GetLogFileOn = .TRUE.
ENDIF
END FUNCTION GetLogFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE GetOutputFileName(ID,FNAME)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: FNAME
CALL GetOutputFileNameF(ID,FNAME)
END SUBROUTINE GetOutputFileName
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetOutputFileOn(ID)
IMPLICIT NONE
@ -290,6 +304,14 @@
INTEGER(KIND=4) :: RunStringF
RunString = RunStringF(ID,INPUT)
END FUNCTION RunString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetDumpFileName(ID,FNAME)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: FNAME
INTEGER(KIND=4) :: SetDumpFileName
SetDumpFileName = SetDumpFileNameF(ID,FNAME)
END FUNCTION SetDumpFileName
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetDumpFileOn(ID,DUMP_ON)
IMPLICIT NONE
@ -326,6 +348,14 @@
INTEGER(KIND=4) :: SetLogFileOnF
SetLogFileOn = SetLogFileOnF(ID,LOG_ON)
END FUNCTION SetLogFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetOutputFileName(ID,FNAME)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: FNAME
INTEGER(KIND=4) :: SetOutputFileName
SetOutputFileName = SetOutputFileNameF(ID,FNAME)
END FUNCTION SetOutputFileName
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetOutputFileOn(ID,OUTPUT_ON)
IMPLICIT NONE

65
IPhreeqcLib.cpp
View File

@ -288,6 +288,59 @@ GetOutputFileOn(int id)
return IPQ_BADINSTANCE;
}
const char*
GetOutputString(int id)
{
static const char empty[] = "";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetOutputString();
}
return empty;
}
const char*
GetOutputStringLine(int id, int n)
{
static const char err_msg[] = "GetOutputStringLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetOutputStringLine(n);
}
return err_msg;
}
int
GetOutputStringLineCount(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetOutputStringLineCount();
}
return 0;
}
int
GetOutputStringOn(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
if (IPhreeqcPtr->GetOutputStringOn())
{
return 1;
}
else
{
return 0;
}
}
return IPQ_BADINSTANCE;
}
int
GetSelectedOutputColumnCount(int id)
{
@ -562,6 +615,18 @@ SetOutputFileOn(int id, int value)
return IPQ_BADINSTANCE;
}
IPQ_RESULT
SetOutputStringOn(int id, int value)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
IPhreeqcPtr->SetOutputStringOn(value != 0);
return IPQ_OK;
}
return IPQ_BADINSTANCE;
}
IPQ_RESULT
SetSelectedOutputFileOn(int id, int value)
{