From 9029c2bcba781cba475c035d5fb81f83c8ec56fa Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Wed, 15 Jul 2020 18:56:06 -0600 Subject: [PATCH] added changes from email dated 2020-07-15 --- IPhreeqc.cpp | 2 +- IPhreeqc_interface.F90 | 4 ++-- IPhreeqc_interface_F.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/IPhreeqc.cpp b/IPhreeqc.cpp index 3b66ce82..adce9f8d 100644 --- a/IPhreeqc.cpp +++ b/IPhreeqc.cpp @@ -971,6 +971,7 @@ void IPhreeqc::SetErrorFileName(const char *filename) void IPhreeqc::SetErrorFileOn(bool bValue) { this->ErrorFileOn = bValue; + this->Set_error_on(bValue); } void IPhreeqc::SetErrorStringOn(bool bValue) @@ -1143,7 +1144,6 @@ void IPhreeqc::check_database(const char* sz_routine) { this->ErrorReporter->Clear(); this->WarningReporter->Clear(); - std::map< int, CSelectedOutput* >::iterator it = this->SelectedOutputMap.begin(); for (; it != this->SelectedOutputMap.end(); ++it) { diff --git a/IPhreeqc_interface.F90 b/IPhreeqc_interface.F90 index c8b30e71..96ac3cf7 100644 --- a/IPhreeqc_interface.F90 +++ b/IPhreeqc_interface.F90 @@ -680,8 +680,8 @@ INTEGER FUNCTION GetSelectedOutputValue(id, row, col, vtype, dvalue, svalue, sle sz_fortran = sz GetSelectedOutputValue = GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, sz) if (present(slength)) then - slength = 0 - if (sz > sz_fortran) then + slength = sz_fortran + if (sz < sz_fortran) then slength = sz endif endif diff --git a/IPhreeqc_interface_F.cpp b/IPhreeqc_interface_F.cpp index a303d15b..8e406e82 100644 --- a/IPhreeqc_interface_F.cpp +++ b/IPhreeqc_interface_F.cpp @@ -4,6 +4,7 @@ #include /* memcpy */ #include /* assert */ #include /* sprintf */ +#include #include "phrqtype.h" #include "IPhreeqc.h"