diff --git a/CMakeLists.txt b/CMakeLists.txt index ec286708..d93a6e42 100644 --- a/CMakeLists.txt +++ b/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( diff --git a/R/build-databases.R b/R/build-databases.R index 6e651cf6..34c297fc 100644 --- a/R/build-databases.R +++ b/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") diff --git a/R/phreeqc.R.in b/R/phreeqc.R.in index 1221c513..95532728 100644 --- a/R/phreeqc.R.in +++ b/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 diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt index 565ab4a6..3446347d 100644 --- a/gtest/CMakeLists.txt +++ b/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 diff --git a/gtest/TestIPhreeqc.cpp b/gtest/TestIPhreeqc.cpp index d734bc96..46a6a685 100644 --- a/gtest/TestIPhreeqc.cpp +++ b/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" }; diff --git a/gtest/TestIPhreeqcLib.cpp b/gtest/TestIPhreeqcLib.cpp index 6fadd9f7..1244c335 100644 --- a/gtest/TestIPhreeqcLib.cpp +++ b/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" };