Set c++14

Updated googletest to 1.16.0
Added stimela.dat to tests and build-databases.R

CMakeLists.txt

@@ -259,6 +259,9 @@ if (NOT IPHREEQC_ENABLE_MODULE)
   )
 endif()
 
+# c++14
+target_compile_features(IPhreeqc PUBLIC cxx_std_14)
+
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
   target_compile_options(IPhreeqc PRIVATE /wd4251 /wd4275 /wd4793)
 endif()
@@ -421,7 +424,7 @@ if (STANDALONE_BUILD)
 
     FetchContent_Declare(
       googletest
-      URL https://github.com/google/googletest/archive/release-1.12.1.tar.gz
+      URL https://github.com/google/googletest/releases/download/v1.16.0/googletest-1.16.0.tar.gz
       )
 
     mark_as_advanced(

R/build-databases.R

@@ -25,6 +25,7 @@ phreeqc_rates.dat                     <- scan("phreeqc_rates.ascii",
 PHREEQC_ThermoddemV1.10_15Dec2020.dat <- scan("PHREEQC_ThermoddemV1.10_15Dec2020.ascii", what="", sep="\n")
 pitzer.dat                            <- scan("pitzer.ascii",                            what="", sep="\n")
 sit.dat                               <- scan("sit.ascii",                               what="", sep="\n")
+stimela.dat                           <- scan("stimela.ascii",                           what="", sep="\n")
 Tipping_Hurley.dat                    <- scan("Tipping_Hurley.ascii",                    what="", sep="\n")
 phreeqc.dat                           <- scan("phreeqc.ascii",                           what="", sep="\n")
 wateq4f.dat                           <- scan("wateq4f.ascii",                           what="", sep="\n")

R/phreeqc.R.in

@@ -1631,6 +1631,19 @@ NULL
 
 
 
+##' @name stimela.dat
+##' @title The stimela.dat database.
+##' @description stimela.dat is a database for use in drinking-water and waste-water
+##' treatment from Peter de Moel and Omnisys. The database has been reformatted
+##' for use by \code{\link{phrLoadDatabaseString}}.
+##' @docType data
+##' @family Databases
+##' @usage stimela.dat  # phrLoadDatabaseString(stimela.dat)
+##' @keywords dataset
+NULL
+
+
+
 ##' @name Tipping_Hurley.dat
 ##' @title The Tipping_Hurley.dat database
 ##' @description Tipping_Hurley.dat is a database for organic-ligand

gtest/CMakeLists.txt

@@ -128,6 +128,12 @@ configure_file(
   COPYONLY
   )
 
+configure_file(
+  ../database/stimela.dat
+  stimela.dat
+  COPYONLY
+  )
+
 configure_file(
   ../database/ColdChem.dat
   ColdChem.dat

gtest/TestIPhreeqc.cpp

@@ -26,7 +26,7 @@ TEST(TestIPhreeqc, TestLoadDatabase)
 	std::string FILES[] = { "phreeqc.dat", "pitzer.dat", "wateq4f.dat",
 		"Amm.dat", "frezchem.dat", "iso.dat",
 		"llnl.dat", "minteq.dat", "minteq.v4.dat",
-		"sit.dat","ColdChem.dat","core10.dat",
+		"sit.dat", "stimela.dat" ,"ColdChem.dat","core10.dat", 
 		"Tipping_Hurley.dat"
 	};
 

gtest/TestIPhreeqcLib.cpp

@@ -128,7 +128,7 @@ TEST(TestIPhreeqcLib, TestLoadDatabase)
 	std::string FILES[] = { "phreeqc.dat", "pitzer.dat", "wateq4f.dat",
 		"Amm.dat", "frezchem.dat", "iso.dat",
 		"llnl.dat", "minteq.dat", "minteq.v4.dat",
-		"sit.dat","ColdChem.dat","core10.dat",
+		"sit.dat", "stimela.dat", "ColdChem.dat","core10.dat",
 		"Tipping_Hurley.dat"
 	};