max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
638 Commits 6 Branches 4 Tags
Commit Graph

638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
693306ba6f added code to replace non-ascii chars from database files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8642 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-10 00:07:21 +00:00
Scott R Charlton
056fee3440 removed phrGetSelectedOutputFileName, phrGetSelectedOutputStrings, phrSetSelectedOutputFileName, phrSetSelectedOutputFileOn, phrSetSelectedOutputStringOn 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8641 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-09 06:06:50 +00:00
Scott R Charlton
8bef87f09d alalphabetized routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8640 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-09 05:34:21 +00:00
Scott R Charlton
c097d609bd alphabetized routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8639 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-09 00:14:09 +00:00
Scott R Charlton
cc2b4466d2 fixed typo 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8638 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-08 23:32:13 +00:00
Scott R Charlton
babe09d64c before removing selected-output string/file methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8637 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-08 23:31:02 +00:00
Scott R Charlton
3313c79322 changed phrSetSelectedOutputStringOn 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8636 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-08 22:20:18 +00:00
Scott R Charlton
85ee774f20 accidental deletion 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8626 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-08 00:53:55 +00:00
Scott R Charlton
b383f2570f added for extra compression 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8625 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-07 22:16:05 +00:00
Scott R Charlton
2a10f0f71b updating docs 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8620 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-05 04:19:17 +00:00
Scott R Charlton
d7de17c703 first pass @ removing std::cerr, std::cout, exit, stderr, stdout from R version. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8619 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-05 04:14:16 +00:00
Scott R Charlton
dd2fd74bab added changes for CRAN submission 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8618 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-04 22:49:48 +00:00
Scott R Charlton
6b34c42885 added build target to Makefile 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8615 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-03 05:35:38 +00:00
Scott R Charlton
a3705b1437 updated similar to jsonlite 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8614 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-03 05:33:38 +00:00
Scott R Charlton
5153c34946 removed .list from filenames; added -as-cran to check 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8613 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-03 04:33:59 +00:00
Scott R Charlton
61cd91092e cleanup; removed .list from filenames 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8612 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-03 04:33:02 +00:00
Scott R Charlton
d628df744b added roxygenize.R 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8611 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-02 23:51:22 +00:00
Scott R Charlton
9bf03d7d20 added SE_to_export_03142014.csv 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8610 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-02 23:49:47 +00:00
Scott R Charlton
d590096443 removed extra parens 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8597 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-26 00:47:49 +00:00
Scott R Charlton
0a87c1d578 updated strings in cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8594 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-25 04:41:12 +00:00
Scott R Charlton
8b9384f2ca working on roxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8593 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-25 04:19:31 +00:00
Scott R Charlton
0a7d7f5e3a working on roxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8588 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-21 08:12:14 +00:00
Scott R Charlton
d6eac5ddfa added build-csv.R make target 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8587 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-21 08:11:24 +00:00
Scott R Charlton
66fc23c0cb AccumulatedLines are now cleared after LoadDatabase/LoadDatabaseString/RunFile/RunString. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8583 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 05:55:57 +00:00
Scott R Charlton
e89555fdee added cleanup of Rd files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8582 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 04:12:47 +00:00
Scott R Charlton
be80393f62 added roxygen to Makefile 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8581 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 04:01:31 +00:00
Scott R Charlton
e38d194a66 removed NAMESPACE 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8580 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 03:59:09 +00:00
Scott R Charlton
2fca0d65e4 added one more NA value for doubles (1e-99) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8579 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 03:50:16 +00:00
Scott R Charlton
ae432ace35 added Rd to ignore list 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8578 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 02:05:19 +00:00
Scott R Charlton
381f8458aa removed Rd files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8577 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 02:01:06 +00:00
Scott R Charlton
08d375a3c9 Fixes error that occurs when using the DATABASE keyword with multiple calls RunAccumulated 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8574 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-19 06:26:46 +00:00
Scott R Charlton
24bdf3a302 working on CO2 example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8572 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-18 05:19:37 +00:00
Scott R Charlton
ab88354e07 working on excel example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8571 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-18 04:41:26 +00:00
Scott R Charlton
7ed15c09e3 working on CO2 example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8570 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-18 04:34:21 +00:00
Scott R Charlton
b685f71d36 added some database checking routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8565 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-17 22:49:04 +00:00
Scott R Charlton
52287e6957 Rd2roxygenized 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8553 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-10 23:16:36 +00:00
Scott R Charlton
a7b5f4509c changed so phrLoadDatabaseString/phrRunString accept lists 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8549 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-07 07:35:28 +00:00
Scott R Charlton
ff17087266 before changing PROTECT/UNPROTECT in getSelOut 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8548 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-07 01:07:49 +00:00
Scott R Charlton
7c831fc893 a few fixes 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8511 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-21 04:57:22 +00:00
Scott R Charlton
f03c453eb4 passes all unit tests on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8506 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-20 07:19:05 +00:00
David L Parkhurst
7048a648a0 revised Char2TrimString. Did not work correctly for Fortran. 
changed lengths of character buffers to int. Perhaps OK.

Added RM_GetComponentCount to RM_interface_C.cpp.

Through GetFilePrefix in documenting.

Revised Fortran output message.

Missing interface for RM_OutputMessage

Modified tests to use GetFilePrefix, OutputMessage, ErrorMessage, and LogMessage.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8504 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-19 22:16:49 +00:00
Scott R Charlton
946cff1ce3 kinn fix 2014-02-18 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8501 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-19 01:24:38 +00:00
Scott R Charlton
7a522c35f8 converted svn:externals to relative to repository root using '^' operator 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8495 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-15 07:20:26 +00:00
Scott R Charlton
c745dd1aca added missing prototypes and interfaces for fortran 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8494 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-15 07:06:38 +00:00
Scott R Charlton
f6d279ce20 selected output columns coersed to valid R names 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8493 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-15 03:52:23 +00:00
Scott R Charlton
292101f19a added additional files to cleanup script 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8492 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-14 07:22:24 +00:00
Scott R Charlton
bb83289a6b updated to build R package in windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8491 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-14 07:19:54 +00:00
Scott R Charlton
e31acfe57a added R scripts to build datasets 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8489 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-13 05:36:56 +00:00
Scott R Charlton
041c8173f6 working on build for R 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8488 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-13 03:33:44 +00:00
David L Parkhurst
a64b046058 Concentrations2UtilityH2O 
Concentrations2UtilityNoH2O
Number solutions 1-n.

Working on documentation

Revised example use of RM_Concentrations2Utility to calculate pH of a mixture.

Added inc files to project

Added interface SetCurrentSelectedOutputUserNumber to IPhreeqc.f90.inc

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8485 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-12 18:08:11 +00:00