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

length argument needed for callback.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9435 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-03-30 18:38:56 +00:00
parent b66d8cf775
commit 81d91ff357
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPhreeqc.cpp
View File

@ -879,7 +879,7 @@ void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, cha
this->PhreeqcPtr->register_fortran_basic_callback(fcn); this->PhreeqcPtr->register_fortran_basic_callback(fcn);
} }
#else #else
void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str)) void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, int l))
{ {
this->PhreeqcPtr->register_fortran_basic_callback(fcn); this->PhreeqcPtr->register_fortran_basic_callback(fcn);
} }

2
IPhreeqc.h
View File

@ -1666,7 +1666,7 @@ Headings
#ifdef IPHREEQC_NO_FORTRAN_MODULE #ifdef IPHREEQC_NO_FORTRAN_MODULE
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l)); IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l));
#else #else
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str)); IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, int l));
#endif #endif

2
IPhreeqc.hpp
View File

@ -713,7 +713,7 @@ public:
#ifdef IPHREEQC_NO_FORTRAN_MODULE #ifdef IPHREEQC_NO_FORTRAN_MODULE
void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, size_t l)); void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, size_t l));
#else #else
void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str)); void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, int l));
#endif #endif
/** /**

2
IPhreeqcLib.cpp
View File

@ -795,7 +795,7 @@ SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str,
} }
#else #else
IPQ_RESULT IPQ_RESULT
SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str)) SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, int l))
{ {
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)

6
IPhreeqc_interface.F90
View File

@ -853,22 +853,24 @@ INTEGER FUNCTION SetBasicFortranCallback(id, fcn)
IMPLICIT NONE IMPLICIT NONE
INTEGER(KIND=C_INT), INTENT(in) :: id INTEGER(KIND=C_INT), INTENT(in) :: id
INTERFACE INTERFACE
REAL(KIND=C_DOUBLE) FUNCTION fcn(x1, x2, str) BIND(C) REAL(KIND=C_DOUBLE) FUNCTION fcn(x1, x2, str, l) BIND(C)
USE ISO_C_BINDING USE ISO_C_BINDING
IMPLICIT none IMPLICIT none
REAL(KIND=C_DOUBLE), INTENT(in) :: x1, x2 REAL(KIND=C_DOUBLE), INTENT(in) :: x1, x2
CHARACTER(KIND=C_CHAR), INTENT(in) :: str(*) CHARACTER(KIND=C_CHAR), INTENT(in) :: str(*)
INTEGER(KIND=C_INT), INTENT(in) :: l
END FUNCTION fcn END FUNCTION fcn
END INTERFACE END INTERFACE
END FUNCTION SetBasicFortranCallbackF END FUNCTION SetBasicFortranCallbackF
END INTERFACE END INTERFACE
INTEGER, INTENT(in) :: id INTEGER, INTENT(in) :: id
INTERFACE INTERFACE
REAL(KIND=C_DOUBLE) FUNCTION fcn(x1, x2, str) BIND(C) REAL(KIND=C_DOUBLE) FUNCTION fcn(x1, x2, str, l) BIND(C)
USE ISO_C_BINDING USE ISO_C_BINDING
IMPLICIT none IMPLICIT none
REAL(KIND=C_DOUBLE), INTENT(in) :: x1, x2 REAL(KIND=C_DOUBLE), INTENT(in) :: x1, x2
CHARACTER(KIND=C_CHAR), INTENT(in) :: str(*) CHARACTER(KIND=C_CHAR), INTENT(in) :: str(*)
INTEGER(KIND=C_INT), INTENT(in) :: l
END FUNCTION fcn END FUNCTION fcn
END INTERFACE END INTERFACE
SetBasicFortranCallback = SetBasicFortranCallbackF(id, fcn) SetBasicFortranCallback = SetBasicFortranCallbackF(id, fcn)

2
IPhreeqc_interface_F.cpp
View File

@ -410,7 +410,7 @@ SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *st
} }
#else #else
IPQ_RESULT IPQ_RESULT
SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str)) SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{ {
return ::SetBasicFortranCallback(*id, fcn); return ::SetBasicFortranCallback(*id, fcn);
} }

2
IPhreeqc_interface_F.h
View File

@ -136,7 +136,7 @@ extern "C" {
#ifdef IPHREEQC_NO_FORTRAN_MODULE #ifdef IPHREEQC_NO_FORTRAN_MODULE
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l)); IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l));
#else #else
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str)); IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, int l));
#endif #endif
IPQ_DLL_EXPORT IPQ_RESULT SetCurrentSelectedOutputUserNumberF(int *id, int *n); IPQ_DLL_EXPORT IPQ_RESULT SetCurrentSelectedOutputUserNumberF(int *id, int *n);
IPQ_DLL_EXPORT IPQ_RESULT SetDumpFileNameF(int *id, char* fname); IPQ_DLL_EXPORT IPQ_RESULT SetDumpFileNameF(int *id, char* fname);