From 4662baee2f6d6857ee51330fa9d1768242e8b2f5 Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R" <charlton@usgs.gov>
Date: Sat, 26 Aug 2023 18:15:23 -0600
Subject: [PATCH] Updated to pass unit tests on linux Added two additional
 selected_output tests:   TestSelectedOutputFileMultipleRuns  
 TestGetSelectedOutputRowCountMultipleRuns

---
 IPhreeqc.cpp | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/IPhreeqc.cpp b/IPhreeqc.cpp
index 4212aee8..11f57a0a 100644
--- a/IPhreeqc.cpp
+++ b/IPhreeqc.cpp
@@ -1103,17 +1103,8 @@ void IPhreeqc::UnLoadDatabase(void)
 		delete (*itt).second;
 	}
 	this->SelectedOutputMap.clear();
-
-	std::map< int, std::string >::iterator mit = this->SelectedOutputStringMap.begin();
-	for (; mit != this->SelectedOutputStringMap.begin(); ++mit)
-	{
-		(*mit).second.clear();
-	}
-	std::map< int, std::vector< std::string > >::iterator it = this->SelectedOutputLinesMap.begin();
-	for (; it != this->SelectedOutputLinesMap.begin(); ++it)
-	{
-		(*it).second.clear();
-	}
+	this->SelectedOutputStringMap.clear();
+	this->SelectedOutputLinesMap.clear();
 
 
 	// clear dump string
@@ -1164,6 +1155,8 @@ void IPhreeqc::check_database(const char* sz_routine)
 		delete (*it).second;
 	}
 	this->SelectedOutputMap.clear();
+	this->SelectedOutputStringMap.clear();
+	this->SelectedOutputLinesMap.clear();
 
 	// release
 	this->LogString.clear();
@@ -1171,18 +1164,6 @@ void IPhreeqc::check_database(const char* sz_routine)
 	this->OutputString.clear();
 	this->OutputLines.clear();
 
-	// clear selected_output string storage
-	// GetSelectedOutputStringLine and GetSelectedOutputString
-	std::map< int, std::string >::iterator mit = SelectedOutputStringMap.begin();
-	for (; mit != SelectedOutputStringMap.end(); ++mit)
-	{
-		(*mit).second.clear();
-	}
-	std::map< int, std::vector< std::string > >::iterator lit = this->SelectedOutputLinesMap.begin();
-	for (; lit != this->SelectedOutputLinesMap.end(); ++lit)
-	{
-		(*lit).second.clear();
-	}
 
 	if (!this->DatabaseLoaded)
 	{