[CHNOSZ-commits] r857 - in pkg/CHNOSZ: . R inst inst/extdata/OBIGT inst/extdata/OBIGT/testing inst/tinytest vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Dec 25 03:21:19 CET 2024
Author: jedick
Date: 2024-12-25 03:21:18 +0100 (Wed, 25 Dec 2024)
New Revision: 857
Added:
pkg/CHNOSZ/inst/extdata/OBIGT/testing/
pkg/CHNOSZ/inst/extdata/OBIGT/testing/AS04.csv
pkg/CHNOSZ/inst/extdata/OBIGT/testing/GEMSFIT.csv
pkg/CHNOSZ/inst/extdata/OBIGT/testing/IGEM24.csv
pkg/CHNOSZ/inst/extdata/OBIGT/testing/KBJ24.csv
Removed:
pkg/CHNOSZ/inst/extdata/OBIGT/AS04.csv
pkg/CHNOSZ/inst/extdata/OBIGT/GEMSFIT.csv
pkg/CHNOSZ/inst/extdata/OBIGT/IGEM24.csv
pkg/CHNOSZ/inst/extdata/OBIGT/KBJ24.csv
Modified:
pkg/CHNOSZ/DESCRIPTION
pkg/CHNOSZ/R/add.OBIGT.R
pkg/CHNOSZ/R/util.data.R
pkg/CHNOSZ/inst/NEWS.Rd
pkg/CHNOSZ/inst/tinytest/test-util.data.R
pkg/CHNOSZ/vignettes/OBIGT.Rmd
Log:
Move some optional data files to OBIGT/testing
Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/DESCRIPTION 2024-12-25 02:21:18 UTC (rev 857)
@@ -1,6 +1,6 @@
Date: 2024-12-24
Package: CHNOSZ
-Version: 2.1.0-29
+Version: 2.1.0-30
Title: Thermodynamic Calculations and Diagrams for Geochemistry
Authors at R: c(
person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),
Modified: pkg/CHNOSZ/R/add.OBIGT.R
===================================================================
--- pkg/CHNOSZ/R/add.OBIGT.R 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/R/add.OBIGT.R 2024-12-25 02:21:18 UTC (rev 857)
@@ -115,11 +115,22 @@
thermo <- get("thermo", CHNOSZ)
to1 <- thermo$OBIGT
id1 <- paste(to1$name,to1$state)
- # We match system files with the file suffixes (.csv) removed
- sysfiles <- dir(system.file("extdata/OBIGT/", package = "CHNOSZ"))
- sysnosuffix <- sapply(strsplit(sysfiles, "\\."), "[", 1)
- isys <- match(file, sysnosuffix)
- if(!is.na(isys)) file <- system.file(paste0("extdata/OBIGT/", sysfiles[isys]), package = "CHNOSZ")
+
+ # `file` should be the path to a CSV file, or the name (without path or .csv) of a file in the package's OBIGT or OBIGT/testing
+ if(!file.exists(file)) {
+
+ # List all files in OBIGT and OBIGT/testing
+ OBIGT_files <- dir(system.file("extdata/OBIGT/", package = "CHNOSZ"), full.names = TRUE)
+ testing_files <- dir(system.file("extdata/OBIGT/testing", package = "CHNOSZ"), full.names = TRUE)
+ all_files <- c(OBIGT_files, testing_files)
+ # Match argument to file names without path or .csv suffix
+ all_names <- gsub(".csv", "", basename(all_files))
+ ifile <- match(file, all_names)
+ if(is.na(ifile)) stop(paste(file, "is not a file and doesn't match any files in the OBIGT database"))
+ file <- all_files[ifile]
+
+ }
+
# Read data from the file
to2 <- read.csv(file, as.is = TRUE)
Etxt <- paste(unique(to2$E_units), collapse = " and ")
Modified: pkg/CHNOSZ/R/util.data.R
===================================================================
--- pkg/CHNOSZ/R/util.data.R 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/R/util.data.R 2024-12-25 02:21:18 UTC (rev 857)
@@ -265,14 +265,11 @@
message(paste("check.OBIGT: checking", what))
# Looking at thermo$OBIGT
if(what == "OBIGT") tdata <- get("thermo", CHNOSZ)$OBIGT
- else if(what == "DEW") tdata <- read.csv(system.file("extdata/OBIGT/DEW.csv", package = "CHNOSZ"), as.is = TRUE)
- else if(what == "SLOP98") tdata <- read.csv(system.file("extdata/OBIGT/SLOP98.csv", package = "CHNOSZ"), as.is = TRUE)
- else if(what == "SUPCRT92") tdata <- read.csv(system.file("extdata/OBIGT/SUPCRT92.csv", package = "CHNOSZ"), as.is = TRUE)
- else if(what == "AS04") tdata <- read.csv(system.file("extdata/OBIGT/AS04.csv", package = "CHNOSZ"), as.is = TRUE)
- else if(what == "AD") tdata <- read.csv(system.file("extdata/OBIGT/AD.csv", package = "CHNOSZ"), as.is = TRUE)
- else if(what == "GEMSFIT") tdata <- read.csv(system.file("extdata/OBIGT/GEMSFIT.csv", package = "CHNOSZ"), as.is = TRUE)
- else if(what == "IGEM24") tdata <- read.csv(system.file("extdata/OBIGT/IGEM24.csv", package = "CHNOSZ"), as.is = TRUE)
- else if(what == "KBJ24") tdata <- read.csv(system.file("extdata/OBIGT/KBJ24.csv", package = "CHNOSZ"), as.is = TRUE)
+ else {
+ if(what %in% c("DEW", "SLOP98", "SUPCRT92" ,"AD")) file <- paste0("extdata/OBIGT/", what, ".csv")
+ else file <- paste0("extdata/OBIGT/testing/", what, ".csv")
+ tdata <- read.csv(system.file(file, package = "CHNOSZ"), as.is = TRUE)
+ }
ntot <- nrow(tdata)
# Where to keep the results
DCp <- DV <- DG <- rep(NA, ntot)
@@ -305,13 +302,11 @@
# Check default database (OBIGT)
out <- checkfun("OBIGT")
# Check optional data
- out <- rbind(out, checkfun("DEW"))
- out <- rbind(out, checkfun("SLOP98"))
- out <- rbind(out, checkfun("SUPCRT92"))
- out <- rbind(out, checkfun("AS04"))
- out <- rbind(out, checkfun("GEMSFIT"))
- out <- rbind(out, checkfun("IGEM24"))
- out <- rbind(out, checkfun("KBJ24"))
+ for(what in c("DEW", "SLOP98", "SUPCRT92" ,"AD")) out <- rbind(out, checkfun(what))
+ # Check testing data
+ testing_files <- dir(system.file("extdata/OBIGT/testing", package = "CHNOSZ"), full.names = TRUE)
+ sources <- gsub(".csv", "", basename(testing_files))
+ for(what in sources) out <- rbind(out, checkfun(what))
# Set differences within a tolerance to NA
out$DCp[abs(out$DCp) < 1] <- NA
out$DV[abs(out$DV) < 1] <- NA
@@ -387,19 +382,18 @@
SLOP98 <- cbind(source = "SLOP98", dat)
dat <- read.csv(system.file("extdata/OBIGT/SUPCRT92.csv", package = "CHNOSZ"), as.is = TRUE)
SUPCRT92 <- cbind(source = "SUPCRT92", dat)
- # More optional data 20220929
- dat <- read.csv(system.file("extdata/OBIGT/AS04.csv", package = "CHNOSZ"), as.is = TRUE)
- AS04 <- cbind(source = "AS04", dat)
dat <- read.csv(system.file("extdata/OBIGT/AD.csv", package = "CHNOSZ"), as.is = TRUE)
AD <- cbind(source = "AD", dat)
- dat <- read.csv(system.file("extdata/OBIGT/GEMSFIT.csv", package = "CHNOSZ"), as.is = TRUE)
- GEMSFIT <- cbind(source = "GEMSFIT", dat)
- dat <- read.csv(system.file("extdata/OBIGT/IGEM24.csv", package = "CHNOSZ"), as.is = TRUE)
- IGEM24 <- cbind(source = "IGEM24", dat)
- dat <- read.csv(system.file("extdata/OBIGT/KBJ24.csv", package = "CHNOSZ"), as.is = TRUE)
- KBJ24 <- cbind(source = "KBJ24", dat)
+ # Testing data 20220929
+ testing_files <- dir(system.file("extdata/OBIGT/testing", package = "CHNOSZ"), full.names = TRUE)
+ testing_list <- lapply(testing_files, function(file) {
+ dat <- read.csv(file, as.is = TRUE)
+ source <- gsub(".csv", "", basename(file))
+ cbind(source = source, dat)
+ })
+ testing <- do.call(rbind, testing_list)
# Put it all together
- out <- rbind(OBIGT, SUPCRT92, SLOP98, AS04, AD, DEW, GEMSFIT, IGEM24, KBJ24)
+ out <- rbind(OBIGT, SUPCRT92, SLOP98, AD, DEW, testing)
# Quote columns 2 (name) and 3 (abbrv) because they have commas for some entries
if(!is.null(file)) write.csv(out, file, row.names = FALSE, quote = c(2, 3))
else(return(out))
Modified: pkg/CHNOSZ/inst/NEWS.Rd
===================================================================
--- pkg/CHNOSZ/inst/NEWS.Rd 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/inst/NEWS.Rd 2024-12-25 02:21:18 UTC (rev 857)
@@ -15,7 +15,7 @@
\newcommand{\Cp}{\ifelse{latex}{\eqn{C_P}}{\ifelse{html}{\out{<I>C<sub>P</sub></I>}}{Cp}}}
\newcommand{\DG0}{\ifelse{latex}{\eqn{{\Delta}G^{\circ}}}{\ifelse{html}{\out{Δ<I>G</I>°}}{ΔG°}}}
-\section{Changes in CHNOSZ version 2.1.0-29 (2024-12-24)}{
+\section{Changes in CHNOSZ version 2.1.0-30 (2024-12-25)}{
\subsection{OBIGT DEFAULT DATA}{
\itemize{
@@ -32,7 +32,7 @@
\item Add alkylamines, benzylamines, and aminiums from
\href{https://doi.org/10.1016/j.gca.2024.03.013}{Robinson et al. (2024)}.
- \item \samp{OBIGT/inorganic_cr.csv}: Add cerianite (CeO\s{2}) and
+ \item \file{inorganic_cr.csv}: Add cerianite (CeO\s{2}) and
chromite (FeCr\s{2}O\s{4}) from
\href{https://doi.org/10.3133/b2131}{Robie and Hemingway (1995)}.
@@ -47,14 +47,18 @@
\subsection{OBIGT OPTIONAL DATA}{
\itemize{
- \item Except for HUO\s{4}\S{-}, aqueous uranium species from
+ \item Aqueous uranium species other than HUO\s{4}\S{-} from
\href{https://doi.org/10.1016/S0016-7037(97)00240-8}{Shock et al. (1997)}
have been moved to \file{SLOP98.csv}.
- \item \file{IGEM24.csv}: updated data for Au and Cu complexes and
+ \item Make new directory \file{OBIGT/testing} to hold optional data files
+ for testing (currently \file{AS04.csv}, \file{GEMSFIT.csv},
+ \file{IGEM24.csv}, and \file{KBJ24.csv}).
+
+ \item Add \file{IGEM24.csv}: updated data for Au and Cu complexes and
SO\s{4}\S{-2}-bearing species from researchers at IGEM RAS.
- \item \file{KBJ24.csv}: Mg(OH)\s{2}-MgCl\s{2}-H\s{2}O phases from
+ \item Add \file{KBJ24.csv}: Mg(OH)\s{2}-MgCl\s{2}-H\s{2}O phases from
\href{https://doi.org/10.1016/j.apgeochem.2024.106032}{Knight et al.
(2024)}.
@@ -61,20 +65,31 @@
}
}
- \subsection{NEW FEATURES}{
+ \subsection{DOCUMENTATION}{
+
\itemize{
- \item Move \code{read.fasta()}, \code{count.aa()}, and \code{aasum()} to
- canprot package with different names.
-
- \item Remove \code{seq2aa()}.
-
- \item Remove \code{add.alpha()}. Now \code{grDevices::adjustcolor()} is
- used in \code{stack_mosaic()} to add transparency.
-
\item Add FAQ question: Why are mineral stability boundaries curved on
mosaic diagrams?
+ \item Add \file{demo/total_S.R}: total activity of S--pH diagram for
+ Fe-S-O-C minerals.
+
+ \item Add \file{demo/uranyl.R}: total (carbonate|sulfate)-pH diagrams
+ for uranyl species, after
+ \href{https://doi.org/10.1016/j.gca.2024.04.023}{Migdisov et al. (2024)}.
+
+ \item Rename \file{demo/total_S.R} to \file{demo/sum_S.R}, change axes,
+ and add solubility contours for Fe and Au.
+
+ }
+
+ }
+
+
+ \subsection{OTHER CHANGES}{
+ \itemize{
+
\item \code{check.EOS()} now uses values of Born coefficients \emph{X}
and \emph{Q} that are consistent with either SUPCRT92 or DEW, depending
on the \code{model} defined in OBIGT (HKF or DEW, respectively).
@@ -82,22 +97,13 @@
\item Remove \code{ispecies} from output of \code{check.OBIGT()} to avoid
superfluous diffs.
- \item Add \file{demo/total_S.R} (total activity of S--pH diagram for
- Fe-S-O-C minerals).
-
\item Restore \code{lines} to the output of \code{diagram()} for the x
and y values of predominance field boundaries.
- \item Add \file{demo/uranyl.R}, total (carbonate|sulfate)-pH diagrams
- for uranyl species, after
- \href{https://doi.org/10.1016/j.gca.2024.04.023}{Migdisov et al. (2024)}.
-
- \item Adjust \code{axis.label()} to show sum symbol for
- \code{mosaic()}-ed basis species used as a plot variable.
+ \item Adjust \code{axis.label()} to show sum symbol (Σ) for total
+ activity or molality of basis species used as a plotting variable in
+ \code{mosaic()}.
- \item Rename \file{demo/total_S.R} to \file{demo/sum_S.R}, change axes,
- and add solubility contours for Fe and Au.
-
\item For better readability, formulas of species are no longer
subscripted by \code{axis.label()} (via \code{expr.species()}). An
example of the new formatting is log \emph{f}O\s{2}). Similar formatting
@@ -106,6 +112,20 @@
}
}
+ \subsection{REMOVED FEATURES}{
+ \itemize{
+
+ \item Move \code{read.fasta()}, \code{count.aa()}, and \code{aasum()} to
+ canprot package with different names.
+
+ \item Remove \code{seq2aa()}.
+
+ \item Remove \code{add.alpha()}. Instead, \code{grDevices::adjustcolor()}
+ is now used in \code{stack_mosaic()} to add transparency.
+
+ }
+ }
+
}
\section{Changes in CHNOSZ version 2.1.0 (2024-02-11)}{
Deleted: pkg/CHNOSZ/inst/extdata/OBIGT/AS04.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/AS04.csv 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/AS04.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -1,4 +0,0 @@
-name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
-H4SiO4,NA,H4SiO4,aq,Ste01,NA,2006-08-31,HKF,cal,-312919.933078394,-348676.147227533,45.1003824091778,15.0095602294455,52.3,18.7299235181644,-21.2600382409178,18.6199808795411,-1.20004780114723,58.0305927342256,-20.789913957935,0.0869024856596558,0
-SiO2,NA,SiO2,aq,AS04,NA,2019-02-08,HKF,cal,-199540,-212179,11.128325,-22.324515,15.575422,1.9,1.7,20,-2.7,32.221331,-25.288582,0.342671,0
-HSiO3-,HSiO3-,HSiO3-,aq,SSH97.2,OBIGT.8,2019-02-08,HKF,cal,-243151,-276276,-1.871675,-21,5,2.9735,-0.5158,5.9467,-2.7575,8.1489,-7.3123,1.5511,-1
Deleted: pkg/CHNOSZ/inst/extdata/OBIGT/GEMSFIT.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/GEMSFIT.csv 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/GEMSFIT.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -1,43 +0,0 @@
-name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
-Al+3,NA,Al+3,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-116298.8,,-81.2,-28.523,-45.3,-3.3984,-16.0789,12.0699,-2.1143,14.4295,-8.8523,2.7403,3
-AlOH+2,NA,AlOH+2,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-166238.3,,-43.291,-8.948,-20.6,-0.4532,-8.8878,9.2434,-2.4116,15.4131,-4.8618,1.5897,2
-Al(OH)2+,NA,Al(OH)2+,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-214696.9,,-6.58,9.766,3.85,2.4944,-1.6909,6.4146,-2.7091,16.7439,-1.0465,0.5324,1
-Al(OH)3,NA,Al(OH)3,aq,MWKH16.1,MWKL17.1,2022-02-01,HKF,cal,-264295.7,,1.233,59.407,30.7,6.1977,8.2816,2.495,-3.1214,71.1003,-1.0644,1.0461,0
-Al(OH)4-,NA,Al(OH)4-,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-311925.7,,24.749,23.074,46.3,8.4938,12.9576,0.657,-3.3147,55.7265,-11.4047,1.0403,-1
-NaAl(OH)4,NA,NaAl(OH)4,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-373346.8,,48.8,32.161,53.6,9.1267,14.3411,0.1121,-3.3719,60.7157,-14.0523,0,0
-AlH3SiO4+2,NA,AlH3SiO4+2,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-426008.8,,13.571,-71.862,-13.96,0.16,-7.23,8.61,-2.48,37.07,-49.66,0.88,2
-KAlO2,NA,KAlO2,aq,PH97,MWKL17.1,2022-02-01,HKF,cal,-262938.3,,35.7,4.314,31.14,6.007,6.8858,3.0436,-3.0637,1.394,1.212,-0.05,0
-K+,NA,K+,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-66173.5,,24.149,2.005,9.01,3.559,-1.473,5.435,-2.712,7.4,-1.791,0.1927,1
-KOH,NA,KOH,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-103162.8,,21.654,9.912,14.1,3.7562,1.39,5.2037,-2.8365,13.499,-1.0192,0.1665,0
-KCl,NA,KCl,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-96204.8,,43.537,7.964,29.9,5.8341,7.055,2.9771,-3.0707,-5.7084,7.6228,0.1996,0
-Na+,NA,Na+,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-61219.4,,13.96,9.111,-1.21,1.839,-2.285,3.256,-2.726,18.18,-2.981,0.3306,1
-NaOH,NA,NaOH,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-98366.9,,10.134,27.127,-0.23,1.7792,-3.4372,7.101,-2.6369,22.8222,2.6543,0.1189,0
-NaCl,NA,NaCl,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-91554.5,,26.482,11.358,24,5.0828,4.629,3.9306,-2.9704,13.6339,-0.7212,0.0889,0
-NaHSiO3,NA,NaHSiO3,aq,SSH97.5,MWKL17.1,2022-02-01,HKF,cal,-306641.3,,10,24.606,12.73,3.4928,0.75,5.4483,-2.81,20.2395,1.9785,-0.038,0
-HSiO3-,NA,HSiO3-,aq,MWKH16.1,MWKL17.1,2022-02-01,HKF,cal,-242632.6,,4.708,-9.195,5,3.309,-0.5201,5.9467,-2.7575,15,-4.9202,1.5583,-1
-SiO2,NA,SiO2,aq,SHS89.1,MWKL17.1,2022-02-01,HKF,cal,-199340.6,,18,-76.119,16.1,1.9,1.7,20,-2.7,29.1,-51.2,0.1291,0
-Cl-,NA,Cl-,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-31379.1,,13.561,-29.276,17.34,4.032,4.801,5.563,-2.847,-4.4,-5.714,1.456,-1
-HCl,NA,HCl,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-30411.1,,0.421,35.731,16.4,16.1573,-11.4311,-46.1866,-2.3036,46.4716,-5.2811,0,0
-OH-,NA,OH-,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-37594.9,,-2.56,-32.586,-4.71,1.2527,0.0738,1.8423,-2.7821,4.15,-10.346,1.7246,-1
-CaOH+,NA,CaOH+,aq,MWKL17,NA,2022-02-01,HKF,cal,-171307.4,,8.717,-18.74,10.96,3.9385,-1.1019,6.1831,-2.7334,-9.5888,-2.6253,0.419,1
-CaCl+,NA,CaCl+,aq,MWKL17,NA,2022-02-01,HKF,cal,-164745.9,,-0.71,17.526,5.56,2.7406,-1.0897,6.1783,-2.734,21.588,0.524,0.5626,1
-CaCl2,NA,CaCl2,aq,MWKL17,NA,2022-02-01,HKF,cal,-190246.2,,16.188,30.956,32.65,6.2186,7.4024,2.8406,-3.085,23.9609,3.272,-0.038,0
-CaHCO3+,NA,CaHCO3+,aq,MWKL17,NA,2022-02-01,HKF,cal,-273712.7,,15.839,55.992,13.28,3.7,1.2579,5.252,-2.831,43.112,7.7228,0.3113,1
-CaCO3,NA,CaCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-262687.4,,4.806,-29.603,-15.65,-0.3907,-8.7325,9.1753,-2.4179,-11.5309,-9.0641,-0.038,0
-MgOH+,NA,MgOH+,aq,MWKL17,NA,2022-02-01,HKF,cal,-149737.8,,-16.099,30.856,1.66,2.2937,-2.1809,6.6072,-2.6888,31.5415,3.2394,0.795,1
-MgCl+,NA,MgCl+,aq,MWKL17,NA,2022-02-01,HKF,cal,-141540.2,,-19.001,25.086,1.25,2.2809,-2.3585,6.677,-2.6815,28.5471,2.0579,0.8389,1
-MgCl2,NA,MgCl2,aq,MWKL17,NA,2022-02-01,HKF,cal,-166483.3,,-2.765,40.815,28.25,5.6165,5.9323,3.4184,-3.0242,29.7395,5.2804,-0.038,0
-MgHCO3+,NA,MgHCO3+,aq,MWKL17,NA,2022-02-01,HKF,cal,-250682.8,,-4.567,60.872,9.34,3.3,0.1608,5.6868,-2.7875,47.5204,9.3524,0.6204,1
-MgCO3,NA,MgCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-239242.8,,-24.515,-27.4,-18.27,-0.7355,-9.5745,9.5062,-2.3831,-9.8914,-8.616,0,0
-NaCO3-,NA,NaCO3-,aq,MWKL17,NA,2022-02-01,HKF,cal,-188774.6,,13.406,-19.673,-1.52,2,-2.335,6.6714,-2.6825,7.7693,-7.1095,1.4265,-1
-NaHCO3,NA,NaHCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-201258.4,,37.921,48.241,31.82,6.1192,7.1597,2.9359,-3.075,34.4381,6.7919,0,0
-KCO3-,NA,KCO3-,aq,MWKL17,NA,2022-02-01,HKF,cal,-193772.9,,18.241,-26.972,8.29,3.4128,0.554,5.5266,-2.8018,2.739,-8.5569,1.3525,-1
-KHCO3,NA,KHCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-206090.8,,49.89,32.249,43.2,7.6623,10.9298,1.4497,-3.2307,24.7193,3.5355,-0.038,0
-CO3-2,NA,CO3-2,aq,MWKL17,NA,2022-02-01,HKF,cal,-126191,,-11.95,-77.115,-6.06,2.8524,-3.9844,6.4142,-2.6143,-7.9872,-18.8139,3.3914,-2
-HCO3-,NA,HCO3-,aq,MWKL17,NA,2022-02-01,HKF,cal,-140261.7,,23.093,-8.329,24.21,2.9936,4.9787,23.5905,-2.9848,12.994,-4.7579,1.2792,-1
-CaSiO3,NA,CaSiO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-362130.5,,-4.909,-42.782,15.7,3.1272,-10.5859,42.3257,-2.3414,61.911,-51.1046,0.0935,0
-MgSiO3,NA,MgSiO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-338990.2,,-24.379,-40.607,12.1,0.8426,-11.069,52.9604,-2.3216,68.7194,-53.9981,-0.0445,0
-Ca+2,NA,Ca+2,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-132127.4,,-13.5,-7.53,-18.06,-0.1947,-7.252,5.2966,-2.4792,9,-2.522,1.2366,2
-Mg+2,NA,Mg+2,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-108987.8,,-33,-5.34,-21.55,-0.8217,-8.599,8.39,-2.39,20.8,-5.892,1.5372,2
-CaHSiO3+,NA,CaHSiO3+,aq,SSH97.5,MWKL17.1,2022-02-01,HKF,cal,-376457.2,,-1.99,32.87,-6.56,1.0647,-5.1787,7.7785,-2.5649,30.8048,3.6619,0.5831,1
-MgHSiO3+,NA,MgHSiO3+,aq,SSH97.5,MWKL17.1,2022-02-01,HKF,cal,-353658.7,,-23.78,37.82,-10.57,0.6289,-6.2428,8.1967,-2.5209,36.7882,4.6702,0.9177,1
Deleted: pkg/CHNOSZ/inst/extdata/OBIGT/IGEM24.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/IGEM24.csv 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/IGEM24.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -1,17 +0,0 @@
-name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
-KHSO4,NA,KHSO4,aq,TAT+24,NA,2024-11-30,HKF,cal,-246551,NA,52.892,43.67,36.82,6.8032,8.8337,2.278,-3.1442,31.8025,5.8381,0,0
-KSO4-,NA,KSO4-,aq,TAT+24,NA,2024-11-30,HKF,cal,-246636,NA,60.893,-136.37,30.4,6.8612,6.0072,3.3889,-3.0273,-63.7366,-30.8131,1.0996,-1
-H2SO4,NA,H2SO4,aq,TAT+24,NA,2024-11-30,HKF,cal,-178211,NA,28.058,67.18,83.42,13.1225,24.5891,-3.9144,-3.7955,45.8348,10.5047,0,0
-AuHS,NA,AuHS,aq,TAT+24,NA,2024-11-30,HKF,cal,8208,NA,38.583,26.25,45.73,8.0227,11.8073,1.1093,-3.2671,-49.3817,37.2185,0,0
-AuHS(H2S)3,NA,AuHS(H2S)3,aq,TAT+24,NA,2024-11-30,HKF,cal,-13146,NA,174.161,111.89,145.3,21.6476,45.0745,-11.966,-4.6424,-48.4088,78.8834,0,0
-Au(HS)2-,NA,Au(HS)2-,aq,TAT+24,NA,2024-11-30,HKF,cal,3532,NA,71.791,-30.47,67.97,11.5845,20.504,-2.3089,-3.6266,1.6472,-8.8534,1.5338,-1
-Au2S2-2,NA,Au2S2-2,aq,TAT+24,NA,2024-11-30,HKF,cal,28054,NA,78.65,-119.3,83.58,14.2429,26.9949,-4.86,-3.895,-35.3863,-27.3368,3.079,-2
-AuOH,NA,AuOH,aq,TAZ24,NA,2024-11-30,HKF,cal,-25947,NA,33.492,18.03,46.58,8.1395,12.0926,0.9972,-3.2789,1.6058,8.0824,0,0
-AuCl,NA,AuCl,aq,TAZ24,NA,2024-11-30,HKF,cal,-1900,NA,52.2,-71.9,50.8,8.7165,13.5013,0.4435,-3.3371,-35.9711,-17.6806,0,0
-AuCl2-,NA,AuCl2-,aq,TAZ24,NA,2024-11-30,HKF,cal,-36572,NA,43.5,9.5,68.52,11.4087,20.0747,-2.1401,-3.6089,16.8432,-0.463,0.7031,-1
-CuHS,NA,CuHS,aq,TTA+23,NA,2024-11-30,HKF,cal,-2969,NA,59.1,-67.713,44.85,7.9477,11.6243,1.1812,-3.2596,-32.4272,-16.8275,0.1197,0
-Cu(HS)2-,NA,Cu(HS)-2,aq,TTA+23,NA,2024-11-30,HKF,cal,-5665,NA,56.647,7.274,79.573,13.0153,23.9975,-3.6819,-3.7711,18.2332,-1.1267,0.9517,-1
-CuCl,NA,CuCl,aq,TTA+23,NA,2024-11-30,HKF,cal,-23360,NA,61.777,-101.336,26.967,5.4552,5.5383,3.5732,-3.008,-52.5985,-23.9839,0,0
-CuCl2-,NA,CuCl2-,aq,TTA+23,NA,2024-11-30,HKF,cal,-58026,NA,53.111,-19.991,32.604,6.6297,8.406,2.4461,-3.1265,4.1186,-7.1067,1.0612,-1
-Cu+,NA,Cu+,aq,AZ23,NA,2024-11-30,HKF,cal,11945,NA,9.7,13.66,-7.99,0.9243,-5.5244,7.9213,-2.5506,37.8578,-8.925,0.6653,1
-CuO-,NA,CuO-,aq,AZ23,NA,2024-11-30,HKF,cal,-19574,NA,-2.45,-12.69,-13.11,0.3673,-6.8845,8.4559,-2.4944,-55.4517,25.7204,1.0433,-1
Deleted: pkg/CHNOSZ/inst/extdata/OBIGT/KBJ24.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/KBJ24.csv 2024-12-24 13:16:34 UTC (rev 856)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/KBJ24.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -1,8 +0,0 @@
-name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
-brucite,NA,Mg(OH)2,cr,KBJ24,RH95.8,2024-12-23,CGL,J,-831798,-922826,63.199,74.99,24.63,80.764,0.00157,-550000,0,-5.77E-07,0,0,1000
-bischofite,NA,MgCl2*6H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-2115074,-2499458,366.083,389.74,NA,300,0.387,-550000,0,-0.000224,0,0,1000
-"magnesium chloride tetrahydrate",NA,MgCl2*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-1624923,-1900649,263.982,255.44,NA,255.44,0,0,0,-1.04E-10,0,0,1000
-"3-1-8 phase",NA,Mg2(OH)3Cl*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-2554730,-2942309,313.7,286.07,NA,204.93,0.286,-272000,0,-1.22E-05,0,0,1000
-"2-1-2 phase",NA,Mg2(OH)4MgCl2*2H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-2815800,-3158670,309.17,293.73,NA,243.72,0.275,-2300000,0,-6.85E-05,0,0,1000
-"2-1-4 phase",NA,Mg2(OH)4MgCl2*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-3306055,-3762785,393.89,362.08,NA,363.70,2.62E-08,0,0,-6.76E-05,0,0,1000
-"9-1-4 phase",NA,Mg9(OH)18MgCl2*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-9136206,-10228288,842.43,885.06,NA,766.4,0.834,-10700000,0,-0.000108,0,0,1000
Copied: pkg/CHNOSZ/inst/extdata/OBIGT/testing/AS04.csv (from rev 856, pkg/CHNOSZ/inst/extdata/OBIGT/AS04.csv)
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/testing/AS04.csv (rev 0)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/testing/AS04.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -0,0 +1,4 @@
+name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
+H4SiO4,NA,H4SiO4,aq,Ste01,NA,2006-08-31,HKF,cal,-312919.933078394,-348676.147227533,45.1003824091778,15.0095602294455,52.3,18.7299235181644,-21.2600382409178,18.6199808795411,-1.20004780114723,58.0305927342256,-20.789913957935,0.0869024856596558,0
+SiO2,NA,SiO2,aq,AS04,NA,2019-02-08,HKF,cal,-199540,-212179,11.128325,-22.324515,15.575422,1.9,1.7,20,-2.7,32.221331,-25.288582,0.342671,0
+HSiO3-,HSiO3-,HSiO3-,aq,SSH97.2,OBIGT.8,2019-02-08,HKF,cal,-243151,-276276,-1.871675,-21,5,2.9735,-0.5158,5.9467,-2.7575,8.1489,-7.3123,1.5511,-1
Copied: pkg/CHNOSZ/inst/extdata/OBIGT/testing/GEMSFIT.csv (from rev 856, pkg/CHNOSZ/inst/extdata/OBIGT/GEMSFIT.csv)
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/testing/GEMSFIT.csv (rev 0)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/testing/GEMSFIT.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -0,0 +1,43 @@
+name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
+Al+3,NA,Al+3,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-116298.8,,-81.2,-28.523,-45.3,-3.3984,-16.0789,12.0699,-2.1143,14.4295,-8.8523,2.7403,3
+AlOH+2,NA,AlOH+2,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-166238.3,,-43.291,-8.948,-20.6,-0.4532,-8.8878,9.2434,-2.4116,15.4131,-4.8618,1.5897,2
+Al(OH)2+,NA,Al(OH)2+,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-214696.9,,-6.58,9.766,3.85,2.4944,-1.6909,6.4146,-2.7091,16.7439,-1.0465,0.5324,1
+Al(OH)3,NA,Al(OH)3,aq,MWKH16.1,MWKL17.1,2022-02-01,HKF,cal,-264295.7,,1.233,59.407,30.7,6.1977,8.2816,2.495,-3.1214,71.1003,-1.0644,1.0461,0
+Al(OH)4-,NA,Al(OH)4-,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-311925.7,,24.749,23.074,46.3,8.4938,12.9576,0.657,-3.3147,55.7265,-11.4047,1.0403,-1
+NaAl(OH)4,NA,NaAl(OH)4,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-373346.8,,48.8,32.161,53.6,9.1267,14.3411,0.1121,-3.3719,60.7157,-14.0523,0,0
+AlH3SiO4+2,NA,AlH3SiO4+2,aq,TS01.1,MWKL17.1,2022-02-01,HKF,cal,-426008.8,,13.571,-71.862,-13.96,0.16,-7.23,8.61,-2.48,37.07,-49.66,0.88,2
+KAlO2,NA,KAlO2,aq,PH97,MWKL17.1,2022-02-01,HKF,cal,-262938.3,,35.7,4.314,31.14,6.007,6.8858,3.0436,-3.0637,1.394,1.212,-0.05,0
+K+,NA,K+,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-66173.5,,24.149,2.005,9.01,3.559,-1.473,5.435,-2.712,7.4,-1.791,0.1927,1
+KOH,NA,KOH,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-103162.8,,21.654,9.912,14.1,3.7562,1.39,5.2037,-2.8365,13.499,-1.0192,0.1665,0
+KCl,NA,KCl,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-96204.8,,43.537,7.964,29.9,5.8341,7.055,2.9771,-3.0707,-5.7084,7.6228,0.1996,0
+Na+,NA,Na+,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-61219.4,,13.96,9.111,-1.21,1.839,-2.285,3.256,-2.726,18.18,-2.981,0.3306,1
+NaOH,NA,NaOH,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-98366.9,,10.134,27.127,-0.23,1.7792,-3.4372,7.101,-2.6369,22.8222,2.6543,0.1189,0
+NaCl,NA,NaCl,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-91554.5,,26.482,11.358,24,5.0828,4.629,3.9306,-2.9704,13.6339,-0.7212,0.0889,0
+NaHSiO3,NA,NaHSiO3,aq,SSH97.5,MWKL17.1,2022-02-01,HKF,cal,-306641.3,,10,24.606,12.73,3.4928,0.75,5.4483,-2.81,20.2395,1.9785,-0.038,0
+HSiO3-,NA,HSiO3-,aq,MWKH16.1,MWKL17.1,2022-02-01,HKF,cal,-242632.6,,4.708,-9.195,5,3.309,-0.5201,5.9467,-2.7575,15,-4.9202,1.5583,-1
+SiO2,NA,SiO2,aq,SHS89.1,MWKL17.1,2022-02-01,HKF,cal,-199340.6,,18,-76.119,16.1,1.9,1.7,20,-2.7,29.1,-51.2,0.1291,0
+Cl-,NA,Cl-,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-31379.1,,13.561,-29.276,17.34,4.032,4.801,5.563,-2.847,-4.4,-5.714,1.456,-1
+HCl,NA,HCl,aq,MWKH16,MWKL17.1,2022-02-01,HKF,cal,-30411.1,,0.421,35.731,16.4,16.1573,-11.4311,-46.1866,-2.3036,46.4716,-5.2811,0,0
+OH-,NA,OH-,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-37594.9,,-2.56,-32.586,-4.71,1.2527,0.0738,1.8423,-2.7821,4.15,-10.346,1.7246,-1
+CaOH+,NA,CaOH+,aq,MWKL17,NA,2022-02-01,HKF,cal,-171307.4,,8.717,-18.74,10.96,3.9385,-1.1019,6.1831,-2.7334,-9.5888,-2.6253,0.419,1
+CaCl+,NA,CaCl+,aq,MWKL17,NA,2022-02-01,HKF,cal,-164745.9,,-0.71,17.526,5.56,2.7406,-1.0897,6.1783,-2.734,21.588,0.524,0.5626,1
+CaCl2,NA,CaCl2,aq,MWKL17,NA,2022-02-01,HKF,cal,-190246.2,,16.188,30.956,32.65,6.2186,7.4024,2.8406,-3.085,23.9609,3.272,-0.038,0
+CaHCO3+,NA,CaHCO3+,aq,MWKL17,NA,2022-02-01,HKF,cal,-273712.7,,15.839,55.992,13.28,3.7,1.2579,5.252,-2.831,43.112,7.7228,0.3113,1
+CaCO3,NA,CaCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-262687.4,,4.806,-29.603,-15.65,-0.3907,-8.7325,9.1753,-2.4179,-11.5309,-9.0641,-0.038,0
+MgOH+,NA,MgOH+,aq,MWKL17,NA,2022-02-01,HKF,cal,-149737.8,,-16.099,30.856,1.66,2.2937,-2.1809,6.6072,-2.6888,31.5415,3.2394,0.795,1
+MgCl+,NA,MgCl+,aq,MWKL17,NA,2022-02-01,HKF,cal,-141540.2,,-19.001,25.086,1.25,2.2809,-2.3585,6.677,-2.6815,28.5471,2.0579,0.8389,1
+MgCl2,NA,MgCl2,aq,MWKL17,NA,2022-02-01,HKF,cal,-166483.3,,-2.765,40.815,28.25,5.6165,5.9323,3.4184,-3.0242,29.7395,5.2804,-0.038,0
+MgHCO3+,NA,MgHCO3+,aq,MWKL17,NA,2022-02-01,HKF,cal,-250682.8,,-4.567,60.872,9.34,3.3,0.1608,5.6868,-2.7875,47.5204,9.3524,0.6204,1
+MgCO3,NA,MgCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-239242.8,,-24.515,-27.4,-18.27,-0.7355,-9.5745,9.5062,-2.3831,-9.8914,-8.616,0,0
+NaCO3-,NA,NaCO3-,aq,MWKL17,NA,2022-02-01,HKF,cal,-188774.6,,13.406,-19.673,-1.52,2,-2.335,6.6714,-2.6825,7.7693,-7.1095,1.4265,-1
+NaHCO3,NA,NaHCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-201258.4,,37.921,48.241,31.82,6.1192,7.1597,2.9359,-3.075,34.4381,6.7919,0,0
+KCO3-,NA,KCO3-,aq,MWKL17,NA,2022-02-01,HKF,cal,-193772.9,,18.241,-26.972,8.29,3.4128,0.554,5.5266,-2.8018,2.739,-8.5569,1.3525,-1
+KHCO3,NA,KHCO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-206090.8,,49.89,32.249,43.2,7.6623,10.9298,1.4497,-3.2307,24.7193,3.5355,-0.038,0
+CO3-2,NA,CO3-2,aq,MWKL17,NA,2022-02-01,HKF,cal,-126191,,-11.95,-77.115,-6.06,2.8524,-3.9844,6.4142,-2.6143,-7.9872,-18.8139,3.3914,-2
+HCO3-,NA,HCO3-,aq,MWKL17,NA,2022-02-01,HKF,cal,-140261.7,,23.093,-8.329,24.21,2.9936,4.9787,23.5905,-2.9848,12.994,-4.7579,1.2792,-1
+CaSiO3,NA,CaSiO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-362130.5,,-4.909,-42.782,15.7,3.1272,-10.5859,42.3257,-2.3414,61.911,-51.1046,0.0935,0
+MgSiO3,NA,MgSiO3,aq,MWKL17,NA,2022-02-01,HKF,cal,-338990.2,,-24.379,-40.607,12.1,0.8426,-11.069,52.9604,-2.3216,68.7194,-53.9981,-0.0445,0
+Ca+2,NA,Ca+2,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-132127.4,,-13.5,-7.53,-18.06,-0.1947,-7.252,5.2966,-2.4792,9,-2.522,1.2366,2
+Mg+2,NA,Mg+2,aq,SH88.4,MWKL17.1,2022-02-01,HKF,cal,-108987.8,,-33,-5.34,-21.55,-0.8217,-8.599,8.39,-2.39,20.8,-5.892,1.5372,2
+CaHSiO3+,NA,CaHSiO3+,aq,SSH97.5,MWKL17.1,2022-02-01,HKF,cal,-376457.2,,-1.99,32.87,-6.56,1.0647,-5.1787,7.7785,-2.5649,30.8048,3.6619,0.5831,1
+MgHSiO3+,NA,MgHSiO3+,aq,SSH97.5,MWKL17.1,2022-02-01,HKF,cal,-353658.7,,-23.78,37.82,-10.57,0.6289,-6.2428,8.1967,-2.5209,36.7882,4.6702,0.9177,1
Copied: pkg/CHNOSZ/inst/extdata/OBIGT/testing/IGEM24.csv (from rev 856, pkg/CHNOSZ/inst/extdata/OBIGT/IGEM24.csv)
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/testing/IGEM24.csv (rev 0)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/testing/IGEM24.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -0,0 +1,17 @@
+name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
+KHSO4,NA,KHSO4,aq,TAT+24,NA,2024-11-30,HKF,cal,-246551,NA,52.892,43.67,36.82,6.8032,8.8337,2.278,-3.1442,31.8025,5.8381,0,0
+KSO4-,NA,KSO4-,aq,TAT+24,NA,2024-11-30,HKF,cal,-246636,NA,60.893,-136.37,30.4,6.8612,6.0072,3.3889,-3.0273,-63.7366,-30.8131,1.0996,-1
+H2SO4,NA,H2SO4,aq,TAT+24,NA,2024-11-30,HKF,cal,-178211,NA,28.058,67.18,83.42,13.1225,24.5891,-3.9144,-3.7955,45.8348,10.5047,0,0
+AuHS,NA,AuHS,aq,TAT+24,NA,2024-11-30,HKF,cal,8208,NA,38.583,26.25,45.73,8.0227,11.8073,1.1093,-3.2671,-49.3817,37.2185,0,0
+AuHS(H2S)3,NA,AuHS(H2S)3,aq,TAT+24,NA,2024-11-30,HKF,cal,-13146,NA,174.161,111.89,145.3,21.6476,45.0745,-11.966,-4.6424,-48.4088,78.8834,0,0
+Au(HS)2-,NA,Au(HS)2-,aq,TAT+24,NA,2024-11-30,HKF,cal,3532,NA,71.791,-30.47,67.97,11.5845,20.504,-2.3089,-3.6266,1.6472,-8.8534,1.5338,-1
+Au2S2-2,NA,Au2S2-2,aq,TAT+24,NA,2024-11-30,HKF,cal,28054,NA,78.65,-119.3,83.58,14.2429,26.9949,-4.86,-3.895,-35.3863,-27.3368,3.079,-2
+AuOH,NA,AuOH,aq,TAZ24,NA,2024-11-30,HKF,cal,-25947,NA,33.492,18.03,46.58,8.1395,12.0926,0.9972,-3.2789,1.6058,8.0824,0,0
+AuCl,NA,AuCl,aq,TAZ24,NA,2024-11-30,HKF,cal,-1900,NA,52.2,-71.9,50.8,8.7165,13.5013,0.4435,-3.3371,-35.9711,-17.6806,0,0
+AuCl2-,NA,AuCl2-,aq,TAZ24,NA,2024-11-30,HKF,cal,-36572,NA,43.5,9.5,68.52,11.4087,20.0747,-2.1401,-3.6089,16.8432,-0.463,0.7031,-1
+CuHS,NA,CuHS,aq,TTA+23,NA,2024-11-30,HKF,cal,-2969,NA,59.1,-67.713,44.85,7.9477,11.6243,1.1812,-3.2596,-32.4272,-16.8275,0.1197,0
+Cu(HS)2-,NA,Cu(HS)-2,aq,TTA+23,NA,2024-11-30,HKF,cal,-5665,NA,56.647,7.274,79.573,13.0153,23.9975,-3.6819,-3.7711,18.2332,-1.1267,0.9517,-1
+CuCl,NA,CuCl,aq,TTA+23,NA,2024-11-30,HKF,cal,-23360,NA,61.777,-101.336,26.967,5.4552,5.5383,3.5732,-3.008,-52.5985,-23.9839,0,0
+CuCl2-,NA,CuCl2-,aq,TTA+23,NA,2024-11-30,HKF,cal,-58026,NA,53.111,-19.991,32.604,6.6297,8.406,2.4461,-3.1265,4.1186,-7.1067,1.0612,-1
+Cu+,NA,Cu+,aq,AZ23,NA,2024-11-30,HKF,cal,11945,NA,9.7,13.66,-7.99,0.9243,-5.5244,7.9213,-2.5506,37.8578,-8.925,0.6653,1
+CuO-,NA,CuO-,aq,AZ23,NA,2024-11-30,HKF,cal,-19574,NA,-2.45,-12.69,-13.11,0.3673,-6.8845,8.4559,-2.4944,-55.4517,25.7204,1.0433,-1
Copied: pkg/CHNOSZ/inst/extdata/OBIGT/testing/KBJ24.csv (from rev 856, pkg/CHNOSZ/inst/extdata/OBIGT/KBJ24.csv)
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/testing/KBJ24.csv (rev 0)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/testing/KBJ24.csv 2024-12-25 02:21:18 UTC (rev 857)
@@ -0,0 +1,8 @@
+name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
+brucite,NA,Mg(OH)2,cr,KBJ24,RH95.8,2024-12-23,CGL,J,-831798,-922826,63.199,74.99,24.63,80.764,0.00157,-550000,0,-5.77E-07,0,0,1000
+bischofite,NA,MgCl2*6H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-2115074,-2499458,366.083,389.74,NA,300,0.387,-550000,0,-0.000224,0,0,1000
+"magnesium chloride tetrahydrate",NA,MgCl2*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-1624923,-1900649,263.982,255.44,NA,255.44,0,0,0,-1.04E-10,0,0,1000
+"3-1-8 phase",NA,Mg2(OH)3Cl*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-2554730,-2942309,313.7,286.07,NA,204.93,0.286,-272000,0,-1.22E-05,0,0,1000
+"2-1-2 phase",NA,Mg2(OH)4MgCl2*2H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-2815800,-3158670,309.17,293.73,NA,243.72,0.275,-2300000,0,-6.85E-05,0,0,1000
+"2-1-4 phase",NA,Mg2(OH)4MgCl2*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-3306055,-3762785,393.89,362.08,NA,363.70,2.62E-08,0,0,-6.76E-05,0,0,1000
+"9-1-4 phase",NA,Mg9(OH)18MgCl2*4H2O,cr,KBJ24,NA,2024-12-23,CGL,J,-9136206,-10228288,842.43,885.06,NA,766.4,0.834,-10700000,0,-0.000108,0,0,1000
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/chnosz -r 857
More information about the CHNOSZ-commits
mailing list