3705 Commits

Author SHA1 Message Date
Darth Vader
90c958c7a4 Merge commit 'afff58ffb022065fab2fe9b960633f0b86e2066b' 2021-06-24 18:32:58 +00:00
Darth Vader
afff58ffb0 Merge commit '48cb5e8969285f6d6e54955b6b7f8db76b2ec99f' 2021-06-24 18:31:49 +00:00
Darth Vader
339e7f14a9 Merge commit '2aee1d68f8eadc2596d3cc1c7cd1cb6a8f303557' 2021-06-24 18:31:19 +00:00
David Parkhurst
2aee1d68f8 updated RELEASE.TXT 2021-06-14 11:25:11 -06:00
David Parkhurst
cb1f9afc17 Finished up C, Fortran, documentation. Need to check DOxygen 2021-06-14 09:38:48 -06:00
David Parkhurst
524bfc46cc Finished up C, Fortran, documentation. Need to check DOxygen 2021-06-14 09:38:48 -06:00
David Parkhurst
9dad4471c2 Merge remote-tracking branch 'origin/master' into state 2021-06-13 07:37:50 -06:00
David Parkhurst
26c71a359b Merge remote-tracking branch 'origin/master' into state 2021-06-13 07:37:50 -06:00
David Parkhurst
d647eec2ef Added StateSave, StateApply, StateDelete with documentation for C++. Need testing, Fortran, and C 2021-06-13 07:37:41 -06:00
David Parkhurst
c22cbb7bc7 Added StateSave, StateApply, StateDelete with documentation for C++. Need testing, Fortran, and C 2021-06-13 07:37:41 -06:00
David Parkhurst
48cb5e8969 Including OH- in converting units. Revised calculated density for H+ and OH-. Makes a difference in several test cases. Removed timing at end of .out in test cases. Checking in all test cases and selected output. 2021-06-10 17:21:08 -06:00
David Parkhurst
47e1ce5dfb added OH in density iteration calculation, test case NaOH_density 2021-06-07 16:23:20 -06:00
David Parkhurst
a3d35b638d Update RELEASE.TXT, add + in solution definition 2021-06-03 13:08:52 -06:00
David Parkhurst
4aefb0660a allow Fe(+3), equivalent to Fe(3), in TOT and TOTMOL. Previously fixed in SELECTED_OUTPUT -total 2021-06-03 13:04:35 -06:00
Darth Vader
a51e5e1ce9 Merge commit 'd469c0d9e090c82962054fd4db0a5107a4b2714b' 2021-05-28 21:33:30 +00:00
Darth Vader
78c35d51cf Merge commit '9b94f8be88ba1d2b73948f2ddb790fd976fe8e0a' 2021-05-28 18:22:16 +00:00
Darth Vader
9b94f8be88 Merge commit 'bea0ad10a02659d9964f6c88e0ca4e415a2c0aca' 2021-05-28 18:21:02 +00:00
Darth Vader
09732ae31b Merge commit 'b40b25fd2362701c6536fb2c135da0e3420bd578' 2021-05-28 18:20:17 +00:00
David Parkhurst
d469c0d9e0 latest change Fe(+3) in RELEASE.TXT 2021-05-28 09:33:44 -06:00
David Parkhurst
bea0ad10a0 unused variable, punch Fe(+3) 2021-05-28 09:03:14 -06:00
Darth Vader
476a097407 Merge commit '37de8fa93ce958aeed5e61f6b3b3e507f059257e' 2021-05-12 13:56:26 +00:00
Darth Vader
37de8fa93c Merge commit 'eaf788b473321914e188d3afd7ff0df1500665fb' 2021-05-12 13:54:31 +00:00
Darth Vader
dc01965b3e Merge commit '4656bd0064b142fb5f4896bb5bbe815903ee5abd' 2021-05-12 13:49:42 +00:00
David Parkhurst
b40b25fd23 Another SIT database 2021-05-11 09:45:15 -06:00
David Parkhurst
4656bd0064 fixed add_constant, undefined surface null pointer, added test cases 2021-05-10 17:37:13 -06:00
David Parkhurst
eaf788b473 fixed add_constant, undefined surface null pointer, added test cases 2021-05-10 17:37:13 -06:00
Darth Vader
cc88c631ba Merge commit '5b7cf2f8f32d1df2855a34f51102876527236915' 2021-05-10 22:50:57 +00:00
Darth Vader
0e3b9ea178 Merge commit '6251be94920311e0c8ac9cddf79b680866b845b7' 2021-05-10 22:50:56 +00:00
Darth Vader
5b7cf2f8f3 Merge commit '2212f9ccb1ed55b463746d524ace70e78258d5bc' 2021-05-10 22:50:17 +00:00
David Parkhurst
6251be9492 updated RELEASE 2021-05-10 13:43:53 -06:00
David Parkhurst
2212f9ccb1 fixed bug in reprep when sit had surface species. Added capability of sit + edl, have not tested it 2021-05-10 13:36:52 -06:00
Charlton, Scott R
af20075233 fixed clr testing 2021-05-05 14:17:00 -06:00
Charlton, Scott R
fbddcf3789 fixed CLR builds 2021-05-04 15:24:36 -06:00
Charlton, Scott R
dd82622052 removed continue-on-error 2021-05-04 13:22:35 -06:00
Charlton, Scott R
90b0938539 setup matrix builds 2021-05-04 13:16:26 -06:00
Scott Charlton
1eed24860c
Update cmake.yml 2021-05-03 09:05:43 -06:00
Scott Charlton
de8d686ac3
Create cmake.yml 2021-05-03 09:02:50 -06:00
Darth Vader
b16173b60a Merge commit '2e334cb417d144fb082c88cfcf5661ffa0cfacb8' 2021-04-27 14:00:27 +00:00
Darth Vader
2e334cb417 Merge commit '79956e3d9ffcae4885bb46b893d01f311100dca1' 2021-04-27 13:58:45 +00:00
David Parkhurst
79956e3d9f made tally_table a vector of class tally 2021-04-26 23:38:21 -06:00
David Parkhurst
db31383e9a made tally_table a vector of class tally 2021-04-26 23:38:21 -06:00
David Parkhurst
7a2f8916aa made tally_table a vector of class tally 2021-04-26 23:38:21 -06:00
Darth Vader
0d764e5c0c Merge commit 'aa62814aa6731a0b093267ec2d361d4837fa3ba9' 2021-04-23 20:15:50 +00:00
Darth Vader
aa62814aa6 Merge commit '58b0d1fccfc6763e569bee30f4ab5e4122963ede' 2021-04-23 20:14:47 +00:00
Darth Vader
58b0d1fccf Merge commit 'd77c11ec700085f19b76af6543013e23ee0739d3' 2021-04-23 20:14:07 +00:00
Scott R Charlton
d77c11ec70 [phreeqci] fixed header error with phast 2021-04-23 14:06:58 -06:00
Scott R Charlton
63175ab743 [phreeqci] fixed header error with phast 2021-04-23 14:06:58 -06:00
Darth Vader
95adefff76 Merge commit '2efc74230a9105f21920ee93317781e1c56e34d1' 2021-04-22 21:39:02 +00:00
Darth Vader
2efc74230a Merge commit '0feb71507f3a246e8021a2c4781ab6c814c73e71' 2021-04-22 21:37:59 +00:00
Scott R Charlton
0feb71507f [phreeqci] fixed WINDOWS.H already included error on windows builds 2021-04-22 14:11:23 -06:00