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

Added AddWarning AddError C/Fortran methods

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4439 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-20 18:49:08 +00:00
parent cf6d8d2eaf
commit f8f24e1c78
6 changed files with 90 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IPhreeqcF.f
View File

@ -8,7 +8,23 @@
AccumulateLine = AccumulateLineF(ID,LINE) AccumulateLine = AccumulateLineF(ID,LINE)
END FUNCTION AccumulateLine END FUNCTION AccumulateLine
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! AddError FUNCTION AddError(ID,ERROR_MSG)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: ERROR_MSG
INTEGER(KIND=4) :: AddError
INTEGER(KIND=4) :: AddErrorF
AddError = AddErrorF(ID,LINE)
END FUNCTION AddError
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION AddWarning(ID,WARN_MSG)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: WARN_MSG
INTEGER(KIND=4) :: AddWarning
INTEGER(KIND=4) :: AddWarningF
AddWarning = AddWarningF(ID,WARN_MSG)
END FUNCTION AddWarning
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION ClearAccumulatedLines(ID) FUNCTION ClearAccumulatedLines(ID)
IMPLICIT NONE IMPLICIT NONE

11
IPhreeqcLib.cpp
View File

@ -47,7 +47,16 @@ AddError(int id, const char* error_msg)
return IPQ_BADINSTANCE; return IPQ_BADINSTANCE;
} }
// TODO AddWarning int
AddWarning(int id, const char* warn_msg)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return (int)IPhreeqcPtr->AddWarning(warn_msg);
}
return IPQ_BADINSTANCE;
}
IPQ_RESULT IPQ_RESULT
ClearAccumulatedLines(int id) ClearAccumulatedLines(int id)

47
fwrap.cpp
View File

@ -54,9 +54,41 @@ AccumulateLineF(int *id, char *line, unsigned int line_length)
return n; return n;
} }
/* int
AddErrorF AddErrorF(int *id, char *error_msg, unsigned int len)
*/ {
int n;
char* cmsg;
cmsg = f2cstring(error_msg, len);
if (!cmsg)
{
::AddError(*id, "AddError: Out of memory.\n");
return IPQ_OUTOFMEMORY;
}
n = ::AddError(*id, cmsg);
free(cmsg);
return n;
}
int
AddWarningF(int *id, char *warn_msg, unsigned int len)
{
int n;
char* cmsg;
cmsg = f2cstring(warn_msg, len);
if (!cmsg)
{
::AddError(*id, "AddWarning: Out of memory.\n");
return IPQ_OUTOFMEMORY;
}
n = ::AddWarning(*id, cmsg);
free(cmsg);
return n;
}
IPQ_RESULT IPQ_RESULT
ClearAccumulatedLinesF(int *id) ClearAccumulatedLinesF(int *id)
@ -379,7 +411,14 @@ IPQ_DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int l
{ {
return AccumulateLineF(id, line, len); return AccumulateLineF(id, line, len);
} }
// AddError IPQ_DLL_EXPORT int __stdcall ADDERROR(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int __stdcall ADDWARNING(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int __stdcall CLEARACCUMULATEDLINES(int *id) IPQ_DLL_EXPORT int __stdcall CLEARACCUMULATEDLINES(int *id)
{ {
return ClearAccumulatedLinesF(id); return ClearAccumulatedLinesF(id);

4
fwrap.h
View File

@ -9,6 +9,8 @@
#if defined(FC_FUNC) #if defined(FC_FUNC)
#define AccumulateLineF FC_FUNC (accumulatelinef, ACCUMULATELINEF) #define AccumulateLineF FC_FUNC (accumulatelinef, ACCUMULATELINEF)
#define AddErrorF FC_FUNC (adderrorf, ADDERRORF)
#define AddWarningF FC_FUNC (addwarningf, ADDWARNINGF)
#define ClearAccumulatedLinesF FC_FUNC (clearaccumulatedlinesf, CLEARACCUMULATEDLINESF) #define ClearAccumulatedLinesF FC_FUNC (clearaccumulatedlinesf, CLEARACCUMULATEDLINESF)
#define CreateIPhreeqcF FC_FUNC (createiphreeqcf, CREATEIPHREEQCF) #define CreateIPhreeqcF FC_FUNC (createiphreeqcf, CREATEIPHREEQCF)
#define DestroyIPhreeqcF FC_FUNC (destroyiphreeqcf, DESTROYIPHREEQCF) #define DestroyIPhreeqcF FC_FUNC (destroyiphreeqcf, DESTROYIPHREEQCF)
@ -51,6 +53,8 @@ extern "C" {
#endif #endif
IPQ_RESULT AccumulateLineF(int *id, char *line, unsigned int line_length); IPQ_RESULT AccumulateLineF(int *id, char *line, unsigned int line_length);
int AddErrorF(int *id, char *error_msg, unsigned int len);
int AddWarningF(int *id, char *warn_msg, unsigned int len);
IPQ_RESULT ClearAccumulatedLinesF(int *id); IPQ_RESULT ClearAccumulatedLinesF(int *id);
int CreateIPhreeqcF(void); int CreateIPhreeqcF(void);
int DestroyIPhreeqcF(int *id); int DestroyIPhreeqcF(int *id);

9
fwrap2.cpp
View File

@ -15,7 +15,14 @@ IPQ_DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
{ {
return AccumulateLineF(id, line, len); return AccumulateLineF(id, line, len);
} }
// AddError IPQ_DLL_EXPORT int ADDERROR(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int ADDWARNING(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int CLEARACCUMULATEDLINES(int *id) IPQ_DLL_EXPORT int CLEARACCUMULATEDLINES(int *id)
{ {
return ClearAccumulatedLinesF(id); return ClearAccumulatedLinesF(id);

9
fwrap3.cpp
View File

@ -14,7 +14,14 @@ IPQ_DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
{ {
return AccumulateLineF(id, line, len); return AccumulateLineF(id, line, len);
} }
// AddError IPQ_DLL_EXPORT int adderror(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int addwarning(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int clearaccumulatedlines_(int *id) IPQ_DLL_EXPORT int clearaccumulatedlines_(int *id)
{ {
return ClearAccumulatedLinesF(id); return ClearAccumulatedLinesF(id);