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
1,992 Commits 6 Branches 4 Tags
Commit Graph

1992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
a8a469b26f Merge commit 'a5b8a03fd7c84cdedb6507c4cd0679b46997ed7d' 2023-11-18 01:35:08 +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
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
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
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
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
4d2181b795 Fixed bug that caused selected_output to 
accumulate in selected_output storage
 2023-08-25 19:44:03 -06: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
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
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
Charlton, Scott R
0cb7f62994 No memory leaks; Still need to turn-on Fortran 2023-08-10 11:01:24 -06:00
Darth Vader
322a40bb3a Squashed 'phreeqcpp/' changes from 6dade54..8fa568f 
8fa568f removed src/print.cpp.utf8
d140c3f End of Run after

git-subtree-dir: phreeqcpp
git-subtree-split: 8fa568f0b446527445c0601dc860cfeab5626212
 2023-05-28 19:59:33 +00:00
Darth Vader
8da0b21940 Merge commit '322a40bb3a8db90d73fe707afaee51381e422aad' 2023-05-28 19:59:33 +00:00
Darth Vader
dd7aa46600 Squashed 'phreeqcpp/' changes from 82515f7..6dade54 
6dade54 Merge commit '4f698833b1b758cefb3440762b18bec08bb945b9'
4f69883 Squashed 'common/' changes from 7c31f5b..a088e29

git-subtree-dir: phreeqcpp
git-subtree-split: 6dade54926bd93a4c9a2bcbd792a41b525784929
 2023-05-26 04:32:50 +00:00
Darth Vader
446e7a8a2a Merge commit 'dd7aa466004fee2b8f0ddc5ba8c04e6199af7fc8' 2023-05-26 04:32:50 +00:00
Darth Vader
050663209b Squashed 'phreeqcpp/' changes from 93ab5c9..82515f7 
82515f7 Merge remote-tracking branch 'origin/master'
1cc4fa0 fix phi for water at high TP. Tony May, 2023
275b340 Tony's changes May 5 and 7.
0fb2509 cleaned up compiler warnings. removed math.h. cleaned up NAN

git-subtree-dir: phreeqcpp
git-subtree-split: 82515f7fecada9be373fd832dd0c5cdf53c79da7
 2023-05-26 04:27:58 +00:00
Darth Vader
32fbc5ab56 Merge commit '050663209be623e2af35e3f93a41ac6f5ac1f18f' 2023-05-26 04:27:58 +00:00
Darth Vader
dc26aa2a8f Squashed 'phreeqcpp/' changes from b12de1f..93ab5c9 
93ab5c9 Merge commit '2841329ea39783ebc402e2644413de9e72904213'
2841329 Squashed 'common/' changes from 6e625e5..7c31f5b

git-subtree-dir: phreeqcpp
git-subtree-split: 93ab5c94e48156a2792207f284e9413df097c82f
 2023-05-26 02:36:52 +00:00
Darth Vader
9bd0be28d6 Merge commit 'dc26aa2a8fe1111439df64025df25f8f01a615fe' 2023-05-26 02:36:52 +00:00
Darth Vader
35dec7bafc Squashed 'phreeqcpp/' changes from e7c12e1..b12de1f 
b12de1f Added sleeps after curl -X POST
fb55642 working on SelectedOutput for BMI
a050758 Closes #48 -- Illegal character encoding in string literal (#49)

git-subtree-dir: phreeqcpp
git-subtree-split: b12de1f7f0eadb7b6153bffca9d0412801d2e132
 2023-05-26 02:32:21 +00:00
Darth Vader
b9bc048c32 Merge commit '35dec7bafcb86c2fb40acc463c51be5af1af21b4' 2023-05-26 02:32:21 +00:00
Charlton, Scott R
8a1e3f9711 Added sleeps after curl -X POST 2023-05-25 20:24:19 -06:00
David Parkhurst
91d35938de working on SelectedOutput for BMI 2023-04-22 16:14:01 -06:00
Charlton, Scott R
4234c11ed7 Closes #48 -- Illegal character encoding in string literal (#49) 2023-04-14 15:25:45 -06:00
Darth Vader
aff166b184 Squashed 'phreeqcpp/' changes from 97a0327..e7c12e1 
e7c12e1 Merge commit '823f839bc515d692be4dba290f43673b3c0493ab'
823f839 Squashed 'common/' changes from 04cb71a..6e625e5
c0c3f59 Merge remote-tracking branch 'github/master'
6a30753 changed math.h to cmath.
171ff7f ifdef for NAN
f0839d1 fixed warnings from Intel C++ 2023 compiler
49d0a56 fixed surface.cxx correct_gc. tweaked P_Vm, but it is not too stable.
f2b8caa added viscosity to solution.h, solution.cpp, and xsolution_save
7ff51aa Tony's viscosity with many examples

git-subtree-dir: phreeqcpp
git-subtree-split: e7c12e191414a87ddcedcf73f17d7765702cb75b
 2023-04-10 18:27:31 +00:00
Darth Vader
813150bc86 Merge commit 'aff166b18426080aa53a136931d221f7afa810d3' 2023-04-10 18:27:31 +00:00
Darth Vader
0a7874068e Squashed 'phreeqcpp/' changes from e1de8e8..97a0327 
97a0327 fixed compiler warnings except NAN
ee1acc4 changed all double precision to real(kind=8) in all files. Compiles and runs test cases.

git-subtree-dir: phreeqcpp
git-subtree-split: 97a0327aa6a4017dcd2e0298f44d5e672b05288a
 2023-04-10 03:21:02 +00:00
Darth Vader
c35cbe19ca Merge commit '0a7874068e77f654f99f8a66b57f3963fea8ec0f' 2023-04-10 03:21:02 +00:00
David Parkhurst
25f2472130 fixed compiler warnings except NAN 2023-04-03 03:27:21 -06:00
David Parkhurst
3f24bf1780 moved enum to RMVARS.h 2023-03-30 23:48:27 -06:00
David Parkhurst
540451234f changed all double precision to real(kind=8) in all files. Compiles and runs test cases. 2023-03-24 15:11:36 -06:00
Darth Vader
cb707ac2b7 Squashed 'phreeqcpp/' changes from 11d588e..e1de8e8 
e1de8e8 Closes usgs-coupled/phast3#2 (#3)

git-subtree-dir: phreeqcpp
git-subtree-split: e1de8e819060ecaf6d402694b29d70ffd0a3bf10
 2023-03-08 19:58:39 +00:00
Darth Vader
c0e629358b Merge commit 'cb707ac2b79acb0dd01a80e37a0b3f3beb690957' 2023-03-08 19:58:39 +00:00
Charlton, Scott R
da9a093d9a Closes usgs-coupled/phast3#2 (#3) 2023-03-08 12:51:02 -07:00
Charlton, Scott R
fe577a188c [webmod] webmod-dist-windows-git fails to build on jenkins 2023-03-07 13:02:09 -07:00
Darth Vader
8a85d23012 Merge commit 'eeee6d3cce2549d37d7051ea3aebd78d77b944e8' 2023-03-07 02:49:50 +00:00
Darth Vader
eeee6d3cce Squashed 'phreeqcpp/' changes from eb35357..11d588e 
11d588e Merge commit '84dc8253eb8498cc204cacb6b24ee3b92f0a58b3'
84dc825 Squashed 'common/' changes from fb03f6a..04cb71a

git-subtree-dir: phreeqcpp
git-subtree-split: 11d588edde138d4961072f7b55c9bebc666189db
 2023-03-07 02:49:49 +00:00