diff --git a/IPhreeqcF.f b/IPhreeqcF.f index 42d5aed0..ca89e676 100644 --- a/IPhreeqcF.f +++ b/IPhreeqcF.f @@ -344,11 +344,3 @@ INTEGER(KIND=4) :: SetSelOutFileOnF SetSelectedOutputFileOn = SetSelOutFileOnF(ID,SELECTED_ON) END FUNCTION SetSelectedOutputFileOn -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - FUNCTION UnLoadDatabase(ID) - IMPLICIT NONE - INTEGER(KIND=4) :: ID - INTEGER(KIND=4) :: UnLoadDatabase - INTEGER(KIND=4) :: UnLoadDatabaseF - UnLoadDatabase = UnLoadDatabaseF(ID) - END FUNCTION UnLoadDatabase diff --git a/IPhreeqcLib.cpp b/IPhreeqcLib.cpp index d892bdd6..2c565332 100644 --- a/IPhreeqcLib.cpp +++ b/IPhreeqcLib.cpp @@ -543,18 +543,6 @@ SetSelectedOutputFileOn(int id, int value) return IPQ_BADINSTANCE; } -IPQ_RESULT -UnLoadDatabase(int id) -{ - IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); - if (IPhreeqcPtr) - { - IPhreeqcPtr->UnLoadDatabase(); - return IPQ_OK; - } - return IPQ_BADINSTANCE; -} - // helper functions // diff --git a/fwrap.cpp b/fwrap.cpp index e11dee24..a8cfc581 100644 --- a/fwrap.cpp +++ b/fwrap.cpp @@ -391,13 +391,6 @@ SetSelOutFileOnF(int *id, int* sel_on) return ::SetSelectedOutputFileOn(*id, *sel_on); } -int -UnLoadDatabaseF(int *id) -{ - return ::UnLoadDatabase(*id); -} - - #if defined(_WIN32) && !defined(_M_AMD64) #if defined(__cplusplus) @@ -558,10 +551,6 @@ IPQ_DLL_EXPORT void __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selected_on) { SetSelOutFileOnF(id, selected_on); } -IPQ_DLL_EXPORT int __stdcall UNLOADDATABASE(int *id) -{ - return UnLoadDatabaseF(id); -} #if defined(__cplusplus) } #endif diff --git a/fwrap.h b/fwrap.h index 7ece9cd7..61ec9b8f 100644 --- a/fwrap.h +++ b/fwrap.h @@ -45,7 +45,6 @@ #define SetLogFileOnF FC_FUNC (setlogfileonf, SETLOGFILEONF) #define SetOutputFileOnF FC_FUNC (setoutputfileonf, SETOUTPUTFILEONF) #define SetSelOutFileOnF FC_FUNC (setseloutfileonf, SETSELOUTFILEONF) -#define UnLoadDatabaseF FC_FUNC (unloaddatabasef, UNLOADDATABASEF) #endif /* FC_FUNC */ #if defined(__cplusplus) @@ -89,7 +88,6 @@ extern "C" { IPQ_RESULT SetLogFileOnF(int *id, int* log_on); IPQ_RESULT SetOutputFileOnF(int *id, int* output_on); IPQ_RESULT SetSelOutFileOnF(int *id, int* selected_output_on); - int UnLoadDatabaseF(int *id); #if defined(__cplusplus) } diff --git a/fwrap2.cpp b/fwrap2.cpp index 13ac5036..b2ad4e02 100644 --- a/fwrap2.cpp +++ b/fwrap2.cpp @@ -160,10 +160,6 @@ IPQ_DLL_EXPORT void SETSELECTEDOUTPUTFILEON(int *id, int *selected_on) { SetSelOutFileOnF(id, selected_on); } -IPQ_DLL_EXPORT int UNLOADDATABASE(int *id) -{ - return UnLoadDatabaseF(id); -} #if defined(__cplusplus) } diff --git a/fwrap3.cpp b/fwrap3.cpp index 450cd33a..1805976e 100644 --- a/fwrap3.cpp +++ b/fwrap3.cpp @@ -161,10 +161,6 @@ IPQ_DLL_EXPORT void setselectedoutputfileon_(int *id, int *selected_on) { SetSelOutFileOnF(id, selected_on); } -IPQ_DLL_EXPORT int unloaddatabase_(int *id) -{ - return UnLoadDatabaseF(id); -} #if defined(__cplusplus) }