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

Merge commit '9029c2bcba781cba475c035d5fb81f83c8ec56fa'

Browse Source
This commit is contained in:
Darth Vader 2020-07-16 01:05:35 +00:00
commit 5d70f691d7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPhreeqc.cpp
View File

@ -971,6 +971,7 @@ void IPhreeqc::SetErrorFileName(const char *filename)
void IPhreeqc::SetErrorFileOn(bool bValue) void IPhreeqc::SetErrorFileOn(bool bValue)
{ {
this->ErrorFileOn = bValue; this->ErrorFileOn = bValue;
this->Set_error_on(bValue);
} }
void IPhreeqc::SetErrorStringOn(bool bValue) void IPhreeqc::SetErrorStringOn(bool bValue)
@ -1143,7 +1144,6 @@ void IPhreeqc::check_database(const char* sz_routine)
{ {
this->ErrorReporter->Clear(); this->ErrorReporter->Clear();
this->WarningReporter->Clear(); this->WarningReporter->Clear();
std::map< int, CSelectedOutput* >::iterator it = this->SelectedOutputMap.begin(); std::map< int, CSelectedOutput* >::iterator it = this->SelectedOutputMap.begin();
for (; it != this->SelectedOutputMap.end(); ++it) for (; it != this->SelectedOutputMap.end(); ++it)
{ {

4
IPhreeqc_interface.F90
View File

@ -680,8 +680,8 @@ INTEGER FUNCTION GetSelectedOutputValue(id, row, col, vtype, dvalue, svalue, sle
sz_fortran = sz sz_fortran = sz
GetSelectedOutputValue = GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, sz) GetSelectedOutputValue = GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, sz)
if (present(slength)) then if (present(slength)) then
slength = 0 slength = sz_fortran
if (sz > sz_fortran) then if (sz < sz_fortran) then
slength = sz slength = sz
endif endif
endif endif

1
IPhreeqc_interface_F.cpp
View File

@ -4,6 +4,7 @@
#include <memory.h> /* memcpy */ #include <memory.h> /* memcpy */
#include <assert.h> /* assert */ #include <assert.h> /* assert */
#include <stdio.h> /* sprintf */ #include <stdio.h> /* sprintf */
#include <cstring>
#include "phrqtype.h" #include "phrqtype.h"
#include "IPhreeqc.h" #include "IPhreeqc.h"