Darth Vader
be441d7f80
Merge commit '80ab6f112d777072ba8708838991b3d00ee7bb2d'
2024-04-17 00:17:29 +00:00
Darth Vader
8e1a4d0836
Squashed 'database/' changes from 976555e2..22eb9506
...
22eb9506 normalized text files
git-subtree-dir: database
git-subtree-split: 22eb9506866dbce35ae69811760e51e5fc785b5c
2024-04-05 17:14:37 +00:00
Darth Vader
6fb40a2b32
Merge commit '8e1a4d08360d4dbfa1505460fa5323ca24085528'
2024-04-05 17:14:37 +00:00
Darth Vader
63ca4c7ef4
Squashed 'src/' changes from 6fd34ae3..2dcf4062
...
2dcf4062 normalized text files
git-subtree-dir: src
git-subtree-split: 2dcf40623ff462e2b379cd5f8ed8299928d0a6fd
2024-04-05 17:14:35 +00:00
Darth Vader
894d25fb5a
Merge commit '63ca4c7ef4b0202b4b6c6cd3463158dc10bfa758'
2024-04-05 17:14:35 +00:00
Max Lübke
4ec8b7006c
Merge branch 'add-solution-names-func' into 'poet'
...
Add getSolutionNames() method to IPhreeqcPOET.hpp
See merge request naaice/iphreeqc!3
2024-04-03 14:28:19 +02:00
Max Luebke
c645eea842
Add getSolutionNames() method to IPhreeqcPOET.hpp
2024-04-03 12:28:08 +00:00
Max Lübke
c0c830eab7
Merge branch 'fix-cell-queuing' into 'poet'
...
Fix reset of cell queue pointer
See merge request naaice/iphreeqc!2
2024-04-03 12:45:57 +02:00
Max Luebke
a554c3fa4f
Fix reset of cell queue pointer
2024-04-03 10:45:41 +00:00
Max Lübke
daeecf1126
Merge branch 'tmp/ml' into 'poet'
...
Add Run_Cells functionality
See merge request naaice/iphreeqc!1
2024-04-02 13:34:28 +02:00
Max Luebke
3e43e0e6db
Fix cell copy functionality in constructor
2024-04-02 11:33:14 +00:00
Max Lübke
f695619875
Add queueCell, dequeueCells, runQueuedCells, setCell, and getCell methods
2024-03-28 14:23:05 +00:00
Max Lübke
d6e7130746
Update IPhreeqcPOET constructor to use LoadDatabaseString and RunString methods
2024-03-19 13:11:33 +00:00
Max Lübke
b34c327377
Refactor getModuleSizes method and remove commented code
2024-03-19 08:57:53 +00:00
Max Luebke
d92ab31765
Refactor API
2024-03-18 23:05:59 +01:00
Scott R Charlton
a0f62fd540
increased the number of lines
2024-03-14 17:01:29 -06:00
Charlton, Scott R
999ceb7741
Updated old unit tests
2024-03-14 13:43:06 -06:00
Max Luebke
54136c8e0c
Add module sizes
2024-03-13 23:49:57 +01:00
Darth Vader
76aea93737
Squashed 'database/' changes from 9665bd4a..976555e2
...
976555e2 Added PHREEQC_ThermoddemV1.10_15Dec2020.dat
git-subtree-dir: database
git-subtree-split: 976555e201ea1ba8a0f37a78edfeec0e1550dd98
2024-03-13 18:03:29 +00:00
Darth Vader
9921b0b0a4
Merge commit '76aea9373733cbcbc1d4bb44f41a567c4d2fcf27'
2024-03-13 18:03:29 +00:00
Max Luebke
f3f86bb4ac
Add raw_dumps() function to IPhreeqcPOET.hpp
2024-03-13 16:55:00 +01:00
Max Luebke
9cb2aba57a
Add SolutionMapping struct and related methods to IPhreeqc and IPhreeqcPOET classes
2024-03-09 23:51:15 +01:00
Max Lübke
1a644baaba
Add poet library and related files
2024-03-08 15:27:52 +01:00
Max Lübke
5422384a43
Ignore additional files and folders
2024-03-08 15:27:46 +01:00
Max Lübke
68f4e7723f
Apply patches from GFZ
2024-03-08 15:27:38 +01:00
Darth Vader
d59be381ee
Squashed 'database/' changes from e0447f7a..9665bd4a
...
9665bd4a Updated for ubuntu 22.04
git-subtree-dir: database
git-subtree-split: 9665bd4a81b47793f54efa908511c8caaa890d53
2024-03-05 18:15:01 +00:00
Darth Vader
ba475ee488
Merge commit 'd59be381ee545f7c2295428fd731d80fb2727b58'
2024-03-05 18:15:01 +00:00
Darth Vader
07f1d0d468
Squashed 'src/' changes from 64e51c1d..6fd34ae3
...
6fd34ae3 Merge commit '0ebad0eedcbb952d1411042592b4081823abdbf5'
0ebad0ee Squashed 'phreeqcpp/' changes from 9925ceb..87919a0
git-subtree-dir: src
git-subtree-split: 6fd34ae38050a84a6fccf32298615edbfa3f7830
2024-03-05 15:44:19 +00:00
Darth Vader
a200f387a9
Merge commit '07f1d0d4680fe19cf1d77ea86b6485b319607f96'
2024-03-05 15:44:19 +00:00
Darth Vader
b96cfe8114
Squashed 'src/' changes from ba2ac191..64e51c1d
...
64e51c1d Try this to fix warning on Darwin
79518dee fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
git-subtree-dir: src
git-subtree-split: 64e51c1d13711fd636fc9df7532d21d3584b52aa
2024-03-05 15:41:19 +00:00
Darth Vader
7d4df5893d
Merge commit 'b96cfe81141ed6734872794468ac9bb321ba9d8b'
2024-03-05 15:41:19 +00:00
Charlton, Scott R
1a8e4166dc
Merge pull request #42 from usgs-coupled/37-older-c++-compilers-dont-support-nullptr
...
37 older c++ compilers dont support nullptr
2024-03-05 08:37:06 -07:00
Scott R Charlton
5ab544f7ca
Try this to fix warning on Darwin
2024-03-04 19:11:28 -07:00
Scott R Charlton
e5803f9449
fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
2024-03-04 18:42:52 -07:00
Charlton, Scott R
fe188a10e0
Merge pull request #40 from scharlton2/38-nodejs-16-actions-are-deprecated
...
38 nodejs 16 actions are deprecated
2024-02-29 12:33:03 -07:00
Charlton, Scott R
7a2e137765
Merge branch 'usgs-coupled:master' into 38-nodejs-16-actions-are-deprecated
2024-02-29 12:02:25 -07:00
Charlton, Scott R
e2b1bddee4
Updated actions/download-artifacts version
2024-02-29 12:01:21 -07:00
Charlton, Scott R
12483c3d0c
Merge pull request #39 from scharlton2/38-nodejs-16-actions-are-deprecated
...
Updated Node.js actions
2024-02-29 11:55:56 -07:00
Charlton, Scott R
8d995bc229
And another
2024-02-29 11:50:50 -07:00
Charlton, Scott R
d44b47a019
Another test
2024-02-29 11:47:20 -07:00
Charlton, Scott R
bc6bb15279
Pull Request not running on actions
2024-02-29 11:44:59 -07:00
Charlton, Scott R
956eff22f9
Updated Node.js actions
2024-02-29 11:20:27 -07:00
Charlton, Scott R
342a7461f5
Add apt-get update to linux build
2023-12-11 10:55:08 -07:00
Charlton, Scott R
9af26d4209
Merge pull request #35 from scharlton2/cran-update-v3.7.5
...
CRAN update to v3.7.5
2023-12-07 09:25:58 -07:00
Charlton, Scott R
d77b07649c
Updated tm6-A43.pdf links
2023-12-06 16:36:07 -07:00
Charlton, Scott R
35521760a5
Missed adding R.cpp
2023-12-06 12:13:58 -07:00
Charlton, Scott R
220db26eb7
Fixes v3.7.5 for CRAN
2023-12-06 11:58:57 -07:00
Darth Vader
0d4210cb6c
Merge commit 'cb06063eaebcdc140a770d4f70fcda2b74345a04'
2023-11-20 01:06:37 +00:00
Darth Vader
cb06063eae
Squashed 'phreeqc3-doc/' changes from f1ef4343..f289b94c
...
f289b94c Updated to force subtree merges
git-subtree-dir: phreeqc3-doc
git-subtree-split: f289b94cda5705b762909891b8f330e7f243595b
2023-11-20 01:06:36 +00:00
Darth Vader
4a8e5582e7
Squashed 'database/' changes from 6b0972bd..e0447f7a
...
e0447f7a Minimum data base.
git-subtree-dir: database
git-subtree-split: e0447f7ad56fc91f0c37b79f3e895fd700f048a6
2023-11-20 00:17:18 +00:00
