Darth Vader
15388e0f19
Merge commit '63ca4c7ef4b0202b4b6c6cd3463158dc10bfa758'
2024-04-05 17:14:35 +00:00
Charlton, Scott R
2dcf40623f
normalized text files
2024-03-26 17:51:00 -06:00
Darth Vader
df6534c795
Merge commit '07f1d0d4680fe19cf1d77ea86b6485b319607f96'
2024-03-05 15:44:19 +00:00
Darth Vader
6fd34ae380
Merge commit '0ebad0eedcbb952d1411042592b4081823abdbf5'
2024-03-05 15:42:26 +00:00
Darth Vader
0ebad0eedc
Squashed 'phreeqcpp/' changes from 9925ceb..87919a0
...
87919a0 Merge commit 'b397d9d56c7985fddac5b7dbe8cd3c63152bf033'
b397d9d Squashed 'common/' changes from 11183a1..6abe004
a25b00d Try this to fix warning on Darwin
a2f6386 fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
git-subtree-dir: phreeqcpp
git-subtree-split: 87919a001bdcde90d6559f597b06586d0d5015fd
2024-03-05 15:42:26 +00:00
Darth Vader
7a6efcbd1b
Merge commit 'b96cfe81141ed6734872794468ac9bb321ba9d8b'
2024-03-05 15:41:19 +00:00
Scott R Charlton
64e51c1d13
Try this to fix warning on Darwin
2024-03-04 19:11:28 -07:00
Scott R Charlton
2294b1ed91
Try this to fix warning on Darwin
2024-03-04 19:11:28 -07:00
Scott R Charlton
79518deebc
fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
2024-03-04 18:42:52 -07:00
Scott R Charlton
d336cd6760
fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
2024-03-04 18:42:52 -07:00
Darth Vader
7824c9cba5
Merge commit '7f291d1c56070131ef8e5b665c58dfb953ec5ebd'
2023-11-18 03:55:04 +00:00
Darth Vader
488c119ac8
Squashed 'phreeqcpp/' changes from f975e17..9925ceb
...
9925ceb Updated for more visual studios tested on vs2005 vs2012 vs2013 vs2015 vs2019
git-subtree-dir: phreeqcpp
git-subtree-split: 9925ceb3d2afa5ed8686dbc781b857e6f1b45314
2023-11-18 03:54:34 +00:00
Darth Vader
ba2ac19165
Merge commit '488c119ac8fb2c9755ce3708519c79f4bd7d382c'
2023-11-18 03:54:34 +00:00
Darth Vader
b9e8939029
Merge commit '70279357596338c2e09bbe32fefe5417e82193df'
2023-11-18 01:36:06 +00:00
Darth Vader
a5b8a03fd7
Squashed 'phreeqcpp/' changes from ff1cc7a..f975e17
...
f975e17 Merge commit 'f82d3a73538ba56c8ed81977b0d26d46ebcb7f98'
f82d3a7 Squashed 'common/' changes from 740bdd5..11183a1
git-subtree-dir: phreeqcpp
git-subtree-split: f975e17ccce7eca010a391898d91c25e6e10990b
2023-11-18 01:35:08 +00:00
Darth Vader
a8a469b26f
Merge commit 'a5b8a03fd7c84cdedb6507c4cd0679b46997ed7d'
2023-11-18 01:35:08 +00:00
Darth Vader
83b1930eae
Merge commit 'd554fc3acfdfbe18c34c6c527fc685643129db2b'
2023-11-18 01:32:52 +00:00
Darth Vader
589ec40c7c
Squashed 'phreeqcpp/' changes from 3e6c2e9..ff1cc7a
...
ff1cc7a [phreeqci] Updated to compile on vs2005
git-subtree-dir: phreeqcpp
git-subtree-split: ff1cc7aa82e0ec1145f593a84025ff174af18463
2023-11-18 01:30:46 +00:00
Darth Vader
6ce9ad665a
Merge commit '589ec40c7ce71d50ea98f7ff283f58ed5283cb29'
2023-11-18 01:30:46 +00:00
Darth Vader
77e7356d7f
Merge commit 'd1b5d92efc04bd216d5354cb2df537d1ded008b0'
2023-11-16 05:12:33 +00:00
Darth Vader
deb497735e
Squashed 'phreeqcpp/' changes from 625f6f1..3e6c2e9
...
3e6c2e9 Merge commit 'c4958bb740964f1804a6a4e6ae5d8df52c5c64ad'
c4958bb Squashed 'common/' changes from b9af572..740bdd5
git-subtree-dir: phreeqcpp
git-subtree-split: 3e6c2e94e308d95c2be3b98e50cf0f253f327a29
2023-11-16 05:11:36 +00:00
Darth Vader
c7c1a23d71
Merge commit 'deb497735e9dea915ec582d42e671e0cfbcdd10e'
2023-11-16 05:11:36 +00:00
Darth Vader
4883e48156
Merge commit '37276c050f8194055e00a875c185c4f0ffe38abf'
2023-11-16 05:09:42 +00:00
Darth Vader
1df4f18911
Merge commit 'ed1fbe949157f56f0799b2170ce207b7716a10f2'
2023-11-16 05:06:28 +00:00
Darth Vader
ed1fbe9491
Squashed 'phreeqcpp/' changes from bd2e2b6..625f6f1
...
625f6f1 Fixed bugs in inverse
ea9e0ef strcpy_safe and strcat_safe
9b06157 trying different header files
e890269 added <cstring>
c370c7b warnings, strcat, strcpy
14ed59f Try using goto(s)
d2d31d2 Try updated logical expression
d2a3eac Turn off optimizing on k_temp
git-subtree-dir: phreeqcpp
git-subtree-split: 625f6f14905e41a1130a3d0a217b8de478631aca
2023-11-16 05:06:27 +00:00
Darth Vader
832810fcf7
Merge commit '1b2eb6ca0dfb1229d50bcb58c12ac6d6f63bbe4c'
2023-11-16 05:04:40 +00:00
David Parkhurst
81f180a069
Fixed bugs in inverse
2023-11-14 22:37:11 -07:00
David Parkhurst
6d575967d4
strcpy_safe and strcat_safe
2023-11-14 14:37:25 -07:00
David Parkhurst
6d98c4e13d
trying different header files
2023-11-13 15:35:27 -07:00
David Parkhurst
72796f154c
added <cstring>
2023-11-13 15:18:55 -07:00
David Parkhurst
e848160727
warnings, strcat, strcpy
2023-11-13 14:32:40 -07:00
Charlton, Scott R
988bdee0a6
Try using goto(s)
2023-10-31 14:15:28 -06:00
Charlton, Scott R
9b10ce3f5c
Try updated logical expression
2023-10-31 13:34:41 -06:00
Charlton, Scott R
812061be2c
Turn off optimizing on k_temp
2023-10-31 11:57:11 -06:00
Darth Vader
42ba243209
Merge commit '10bcb271d74cf65f6427a7293f1b32c043bc7180'
2023-08-27 01:17:34 +00:00
Charlton, Scott R
6e248c34be
Updated to pass unit tests on linux
...
Added two additional selected_output tests:
TestSelectedOutputFileMultipleRuns
TestGetSelectedOutputRowCountMultipleRuns
2023-08-26 18:15:23 -06:00
Charlton, Scott R
4662baee2f
Updated to pass unit tests on linux
...
Added two additional selected_output tests:
TestSelectedOutputFileMultipleRuns
TestGetSelectedOutputRowCountMultipleRuns
2023-08-26 18:15:23 -06:00
Charlton, Scott R
4d2181b795
Fixed bug that caused selected_output to
...
accumulate in selected_output storage
2023-08-25 19:44:03 -06:00
Charlton, Scott R
6721837c27
Fixed bug that caused selected_output to
...
accumulate in selected_output storage
2023-08-25 19:44:03 -06:00
Darth Vader
b4b9e7da01
Merge commit '1a3663493c8f6e1f9accef266dce18790271ca2b'
2023-08-25 15:29:56 +00:00
Darth Vader
6ea0442d45
Squashed 'phreeqcpp/' changes from 8dade82..bd2e2b6
...
bd2e2b6 Merge remote-tracking branch 'usgs-coupled/master'
f170ab5 Merge branch 'usgs-coupled:master' into phreeqc-1-working
4cbc303 bug fix on Basic functions; minor update to Release.txt
git-subtree-dir: phreeqcpp
git-subtree-split: bd2e2b68ccf277552f19c498e9ef0b972c6d8b7e
2023-08-25 15:29:27 +00:00
Darth Vader
d5808fd188
Merge commit '6ea0442d458c0a029140954f6c801006cac0871b'
2023-08-25 15:29:27 +00:00
Darth Vader
c9d004b611
Merge commit 'fb29ba4c3af45fd6745970fda308ff13353edc9c'
2023-08-25 03:36:29 +00:00
Darth Vader
99b1030598
Squashed 'phreeqcpp/' changes from 3b5f98c..8dade82
...
8dade82 Merge commit '64c9761e116474c4c9e673976f02111fbec32caf'
64c9761 Squashed 'common/' changes from a088e29..b9af572
git-subtree-dir: phreeqcpp
git-subtree-split: 8dade82c963a39f50ceeaab4d2d7b9700b53822f
2023-08-25 03:34:17 +00:00
Darth Vader
99451c0855
Merge commit '99b10305984102705405888e62ff98cae0c70fe6'
2023-08-25 03:34:17 +00:00
Darth Vader
1b46a8dcf2
Merge commit '8d6d4a6b4fae111d36a3225507095202e684a40f'
2023-08-25 03:33:23 +00:00
Darth Vader
e902474819
Squashed 'phreeqcpp/' changes from 8fa568f..3b5f98c
...
3b5f98c No memory leaks; Still need to turn-on Fortran
git-subtree-dir: phreeqcpp
git-subtree-split: 3b5f98c838520da9638d08384186b2c85103ff30
2023-08-25 03:29:16 +00:00
Darth Vader
52357404b5
Merge commit 'e902474819623e9469f66b6514a8293063ff2b86'
2023-08-25 03:29:16 +00:00
Darth Vader
3415544f41
Merge commit '90ccb6dc2bfcd1b2fa9aa0492f4553cf4f598f49'
2023-08-25 03:28:29 +00:00
Charlton, Scott R
0cb7f62994
No memory leaks; Still need to turn-on Fortran
2023-08-10 11:01:24 -06:00
