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 Output routines

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5957 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2011-12-29 00:59:15 +00:00
parent 9d0e428781
commit 75745adf7a
5 changed files with 124 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/IPhreeqcF.f
View File

@ -180,6 +180,38 @@
GetOutputFileOn = .TRUE.
ENDIF
END FUNCTION GetOutputFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! GetOutputString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetOutputStringLine(ID,N,LINE)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: N
CHARACTER(LEN=*) :: LINE
INTEGER(KIND=4) :: GetOutputStringLine
INTEGER(KIND=4) :: GetOutputStringLineF
GetOutputStringLine = GetOutputStringLineF(ID,N,LINE)
END FUNCTION GetOutputStringLine
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetOutputStringLineCount(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: GetOutputStringLineCount
INTEGER(KIND=4) :: GetOutputStringLineCountF
GetOutputStringLineCount = GetOutputStringLineCountF(ID)
END FUNCTION GetOutputStringLineCount
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetOutputStringOn(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: GetOutputStringOn
INTEGER(KIND=4) :: GetOutputStringOnF
IF (GetOutputStringOnF(ID).EQ.0) THEN
GetOutputStringOn = .FALSE.
ELSE
GetOutputStringOn = .TRUE.
ENDIF
END FUNCTION GetOutputStringOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetSelectedOutputColumnCount(ID)
IMPLICIT NONE
@ -367,6 +399,15 @@
INTEGER(KIND=4) :: SetOutputFileOnF
SetOutputFileOn = SetOutputFileOnF(ID,OUTPUT_ON)
END FUNCTION SetOutputFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetOutputStringOn(ID,OUTPUT_STRING_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: OUTPUT_STRING_ON
INTEGER(KIND=4) :: SetOutputStringOn
INTEGER(KIND=4) :: SetOutputStringOnF
SetOutputStringOn = SetOutputStringOnF(ID,OUTPUT_STRING_ON)
END FUNCTION SetOutputStringOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetSelectedOutputFileOn(ID,SELECTED_ON)
IMPLICIT NONE

41
src/fwrap.cpp
View File

@ -188,6 +188,24 @@ GetOutputFileNameF(int *id, char* fname, unsigned int fname_length)
padfstring(fname, ::GetOutputFileName(*id), fname_length);
}
int
GetOutputStringLineCountF(int *id)
{
return ::GetOutputStringLineCount(*id);
}
void
GetOutputStringLineF(int *id, int* n, char* line, unsigned int line_length)
{
padfstring(line, ::GetOutputStringLine(*id, (*n) - 1), line_length);
}
int
GetOutputStringOnF(int *id)
{
return ::GetOutputStringOn(*id);
}
int
GetOutputFileOnF(int *id)
{
@ -431,6 +449,12 @@ SetOutputFileOnF(int *id, int* output_on)
return ::SetOutputFileOn(*id, *output_on);
}
IPQ_RESULT
SetOutputStringOnF(int *id, int* output_string_on)
{
return ::SetOutputStringOn(*id, *output_string_on);
}
IPQ_RESULT
SetSelOutFileOnF(int *id, int* sel_on)
{
@ -524,6 +548,19 @@ IPQ_DLL_EXPORT int __stdcall GETOUTPUTFILEON(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void __stdcall GETOUTPUTSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTSTRINGLINECOUNT(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTSTRINGON(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
@ -609,6 +646,10 @@ IPQ_DLL_EXPORT int __stdcall SETOUTPUTFILEON(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall SETOUTPUTSTRINGON(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
{
return SetSelOutFileOnF(id, selected_on);

8
src/fwrap.h
View File

@ -27,6 +27,9 @@
#define GetLogFileOnF FC_FUNC (getlogfileonf, GETLOGFILEONF)
#define GetOutputFileNameF FC_FUNC (getoutputfilenamef, GETOUTPUTFILENAMEF)
#define GetOutputFileOnF FC_FUNC (getoutputfileonf, GETOUTPUTFILEONF)
#define GetOutputStringLineF FC_FUNC (getoutputstringlinef, GETOUTPUTSTRINGLINEF)
#define GetOutputStringLineCountF FC_FUNC (getoutputstringlinecountf, GETOUTPUTSTRINGLINECOUNTF)
#define GetOutputStringOnF FC_FUNC (getoutputstringonf, GETOUTPUTSTRINGONF)
#define GetSelectedOutputColumnCountF FC_FUNC (getselectedoutputcolumncountf, GETSELECTEDOUTPUTCOLUMNCOUNTF)
#define GetSelectedOutputFileOnF FC_FUNC (getselectedoutputfileonf, GETSELECTEDOUTPUTFILEONF)
#define GetSelectedOutputRowCountF FC_FUNC (getselectedoutputrowcountf, GETSELECTEDOUTPUTROWCOUNTF)
@ -49,6 +52,7 @@
#define SetOutputFileNameF FC_FUNC (setoutputfilenamef, SETOUTPUTFILENAMEF)
#define SetOutputFileOnF FC_FUNC (setoutputfileonf, SETOUTPUTFILEONF)
#define SetSelOutFileOnF FC_FUNC (setseloutfileonf, SETSELOUTFILEONF)
#define SetOutputStringOnF FC_FUNC (setoutputstringonf, SETOUTPUTSTRINGONF)
#endif /* FC_FUNC */
#if defined(__cplusplus)
@ -74,6 +78,9 @@ extern "C" {
int GetLogFileOnF(int *id);
void GetOutputFileNameF(int *id, char* filename, unsigned int filename_length);
int GetOutputFileOnF(int *id);
int GetOutputStringLineCountF(int *id);
void GetOutputStringLineF(int *id, int* n, char* line, unsigned int line_length);
int GetOutputStringOnF(int *id);
int GetSelectedOutputColumnCountF(int *id);
int GetSelectedOutputFileOnF(int *id);
int GetSelectedOutputRowCountF(int *id);
@ -95,6 +102,7 @@ extern "C" {
IPQ_RESULT SetLogFileOnF(int *id, int* log_on);
IPQ_RESULT SetOutputFileNameF(int *id, char* fname, unsigned int fname_length);
IPQ_RESULT SetOutputFileOnF(int *id, int* output_on);
IPQ_RESULT SetOutputStringOnF(int *id, int* output_string_on);
IPQ_RESULT SetSelOutFileOnF(int *id, int* selected_output_on);
#if defined(__cplusplus)

17
src/fwrap2.cpp
View File

@ -88,6 +88,19 @@ IPQ_DLL_EXPORT int GETOUTPUTFILEON(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void GETOUTPUTSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETOUTPUTSTRINGLINECOUNT(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETOUTPUTSTRINGON(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
@ -172,6 +185,10 @@ IPQ_DLL_EXPORT int SETOUTPUTFILEON(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int SETOUTPUTSTRINGON(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
{
return SetSelOutFileOnF(id, selected_on);

17
src/fwrap3.cpp
View File

@ -88,6 +88,19 @@ IPQ_DLL_EXPORT int getoutputfileon_(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void getoutputstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getoutputstringlinecount_(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int getoutputstringon_(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int getselectedoutputcolumncount_(int *id)
{
return GetSelectedOutputColumnCountF(id);
@ -173,6 +186,10 @@ IPQ_DLL_EXPORT int setoutputfileon_(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int setoutputstringon_(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int setselectedoutputfileon_(int *id, int *selected_on)
{
return SetSelOutFileOnF(id, selected_on);