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

334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
d7222e4f0b Squashed 'src/' changes from 2bcb24a8..f627828f 
f627828f Merge commit 'c1c1f286b61ca73ae3204c7fa4831bb2e3066070'
c1c1f286 Squashed 'phreeqcpp/' changes from b6a23a2..faf8144
d051e14c Merge remote-tracking branch 'usgs-coupled/master'
7ad5a592 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57)

git-subtree-dir: src
git-subtree-split: f627828fb52a2880ff95d7c341dc335b856fd8c5
 2024-08-15 17:09:44 +00:00
Darth Vader
2d96a18877 Squashed 'src/' changes from 178b05c2..2bcb24a8 
2bcb24a8 Merge commit '88d5ec20353fab67149768c11765c3c248ee0cea'
88d5ec20 Squashed 'phreeqcpp/' changes from 587223f..b6a23a2
d3b4b10b Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran
128b7a11 reorder classes in global_structures.h to avoid incomplete definitions
8bf2d298 add missing include of stddef.h in IPhreeqc.h if no fortran module

git-subtree-dir: src
git-subtree-split: 2bcb24a86a6da0e35150c73e0421634854a5d7b1
 2024-08-14 21:45:07 +00:00
Darth Vader
7c714dfbd3 Squashed 'src/' changes from 0da302ae..178b05c2 
178b05c2 Merge commit '9a4caf7def182e3f6aa3caa5024c7af821663b65'
9a4caf7d Squashed 'phreeqcpp/' changes from e4c4cf3..587223f

git-subtree-dir: src
git-subtree-split: 178b05c251c6d7acc6e19bb19a27a23b51a0d895
 2024-07-11 17:09:41 +00:00
Darth Vader
0e2456f051 Squashed 'src/' changes from 1a84cced..0da302ae 
0da302ae Merge commit '2abb0b0bcd4bcae42f84ff001aba7f2ab6df2af7'
2abb0b0b Squashed 'phreeqcpp/' changes from 798f8f9..e4c4cf3

git-subtree-dir: src
git-subtree-split: 0da302aedfffccd97d50d919d1c3e696859de899
 2024-06-20 21:53:21 +00:00
Darth Vader
231f8e3658 Squashed 'src/' changes from 279b8435..1a84cced 
1a84cced Merge commit 'a9c4ef8324b6c59ba5cf0d78fc0d8ef93b33923f'
a9c4ef83 Squashed 'phreeqcpp/' changes from ceab9a1..798f8f9

git-subtree-dir: src
git-subtree-split: 1a84cced60c5d09270cee34d3f18a16d267012c8
 2024-06-11 00:59:16 +00:00
Darth Vader
1ec7448cb0 Squashed 'src/' changes from 2b17f7ca..279b8435 
279b8435 [iphreeqc] Fixed for R

git-subtree-dir: src
git-subtree-split: 279b84357dd36426396d7916436c373d319d2082
 2024-06-11 00:57:31 +00:00
Darth Vader
ed24ec246b Squashed 'src/' changes from 79511203..2b17f7ca 
2b17f7ca Merge commit '8024ee12891fde0332b86544b2b18010a91fde15'
8024ee12 Squashed 'phreeqcpp/' changes from e2f4d06..ceab9a1

git-subtree-dir: src
git-subtree-split: 2b17f7ca917334c9d668b1d63a6499118cd1273f
 2024-06-07 21:56:59 +00:00
Darth Vader
9ba726de0f Squashed 'src/' changes from fb3f60ce..79511203 
79511203 Merge commit '067a8b1aaa326cecf6a1b5a167fe88448ef1e0b2'
067a8b1a Squashed 'phreeqcpp/' changes from 3d5242f..e2f4d06

git-subtree-dir: src
git-subtree-split: 795112031bb1ef92c0eb3c07aea03ea7b222093e
 2024-05-29 19:06:21 +00:00
Darth Vader
7552f8f680 Squashed 'src/' changes from 70e32eba..fb3f60ce 
fb3f60ce Merge commit '09af2d5b127a8efe403f47751c7c8465ec94874d'
09af2d5b Squashed 'phreeqcpp/' changes from cb6d9f4..3d5242f

git-subtree-dir: src
git-subtree-split: fb3f60ce26395696273caf5cdf9f3415fca60d5a
 2024-05-27 19:32:06 +00:00
Darth Vader
06332bcb62 Squashed 'src/' changes from e8716142..70e32eba 
70e32eba Merge commit '0b3f349ad3bb84d493fc4d54bb6537a1fcafbc15'
0b3f349a Squashed 'phreeqcpp/' changes from 07c887a..cb6d9f4

git-subtree-dir: src
git-subtree-split: 70e32eba2ffcd58704cacd12134893f16b8e87be
 2024-05-16 01:05:21 +00:00
Darth Vader
51648664f6 Squashed 'src/' changes from 78fa3ba3..e8716142 
e8716142 Merge commit '1efeb356693a42a67a7d7ccf60982c06e882dfdf'
1efeb356 Squashed 'phreeqcpp/' changes from 8f6cb45..07c887a

git-subtree-dir: src
git-subtree-split: e871614214e39fe009f3306b9f4997c5149c8493
 2024-05-13 18:46:18 +00:00
Darth Vader
fff75534d7 Squashed 'src/' changes from edd80cec..78fa3ba3 
78fa3ba3 Merge commit '97a4237601d215dd712df5fee01399c9c2841ff8'
97a42376 Squashed 'phreeqcpp/' changes from c035d9c..8f6cb45

git-subtree-dir: src
git-subtree-split: 78fa3ba34e587ccf739759274cff9affc7308a5a
 2024-05-10 20:36:54 +00:00
Darth Vader
9882e3df3c Squashed 'src/' changes from c767e9c6..edd80cec 
edd80cec Merge commit 'bacfb0ea50c83434d21d3b0c8eda18543ee8b89a'
bacfb0ea Squashed 'phreeqcpp/' changes from 60ccbf8..c035d9c

git-subtree-dir: src
git-subtree-split: edd80cecf2ebc91f889e31872355bb6450bc9c0a
 2024-05-09 19:46:50 +00:00
Darth Vader
a159b5af31 Squashed 'src/' changes from 8acfbb38..c767e9c6 
c767e9c6 Merge commit '4a24a89572cca75b5919dabde3ac798c175bf899'
4a24a895 Squashed 'phreeqcpp/' changes from 0243c90..60ccbf8

git-subtree-dir: src
git-subtree-split: c767e9c6a1847ed4e968b2f45b5d9e4c7f69d429
 2024-05-07 22:42:01 +00:00
Darth Vader
b1888bb5d6 Squashed 'src/' changes from 478318af..8acfbb38 
8acfbb38 Merge branch 'master' into module
666e4b81 Issue 160 in phreeqc. llnl minimum temperature problem. There are several places where a SOLUTION is constructed to get lists or test the database. By default the SOLUTION is 25C, so if llnl has a minimum temperature greater (or maximum temperature less) than 25, an error is encountered. The fix is to change the temperature of the SOLUTIONs to the minimum temperature of the llnl grid if llnl is being used.

git-subtree-dir: src
git-subtree-split: 8acfbb384a34dead1b805f5ee33d7dcd6c0b3a13
 2024-04-19 19:50:19 +00:00
Darth Vader
799a4e7ee4 Squashed 'src/' changes from e8c03d16..478318af 
478318af Merge commit 'f100f492a5750d4998da1daa4a3e9b14b245a0e8'
f100f492 Squashed 'phreeqcpp/' changes from 89d028d..0243c90

git-subtree-dir: src
git-subtree-split: 478318affeece3b1026a8c6a9d44264d61766bfa
 2024-04-18 21:18:01 +00:00
Darth Vader
1d8783186c Squashed 'src/' changes from b4a42445..e8c03d16 
e8c03d16 Merge commit 'c378c74d7f2510092a8fca311f7ffbbb7ed96f1d'
c378c74d Squashed 'phreeqcpp/' changes from 7284fed..89d028d

git-subtree-dir: src
git-subtree-split: e8c03d169346861db62629edb0ca43e1fd688be9
 2024-04-18 18:17:11 +00:00
Darth Vader
ccdbd0ce20 Squashed 'src/' changes from 2dcf4062..b4a42445 
b4a42445 Merge commit '1ebe8191c254ea7a50f20876ef1bf21450f7887a'
1ebe8191 Squashed 'phreeqcpp/' changes from 87919a0..7284fed

git-subtree-dir: src
git-subtree-split: b4a424453b03269c6af9be2fd5f0d7a7e63b5eb4
 2024-04-17 00:17:30 +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
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
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
7f291d1c56 Squashed 'src/' changes from a8a469b2..ba2ac191 
ba2ac191 Merge commit '488c119ac8fb2c9755ce3708519c79f4bd7d382c'
488c119a Squashed 'phreeqcpp/' changes from f975e17..9925ceb

git-subtree-dir: src
git-subtree-split: ba2ac191650c3db3e396fd006e26c18587efdf09
 2023-11-18 03:55:04 +00:00
Darth Vader
7027935759 Squashed 'src/' changes from 6ce9ad66..a8a469b2 
a8a469b2 Merge commit 'a5b8a03fd7c84cdedb6507c4cd0679b46997ed7d'
a5b8a03f Squashed 'phreeqcpp/' changes from ff1cc7a..f975e17

git-subtree-dir: src
git-subtree-split: a8a469b26ffa800f78faccbe9e072640563d8e3f
 2023-11-18 01:36:06 +00:00
Darth Vader
d554fc3acf Squashed 'src/' changes from c7c1a23d..6ce9ad66 
6ce9ad66 Merge commit '589ec40c7ce71d50ea98f7ff283f58ed5283cb29'
589ec40c Squashed 'phreeqcpp/' changes from 3e6c2e9..ff1cc7a

git-subtree-dir: src
git-subtree-split: 6ce9ad665a2c2df324fb9e1f7317da862fc4f4dd
 2023-11-18 01:32:52 +00:00
Darth Vader
d1b5d92efc Squashed 'src/' changes from 1df4f189..c7c1a23d 
c7c1a23d Merge commit 'deb497735e9dea915ec582d42e671e0cfbcdd10e'
deb49773 Squashed 'phreeqcpp/' changes from 625f6f1..3e6c2e9

git-subtree-dir: src
git-subtree-split: c7c1a23d71636e117713e6a0e74a7b7ac8cff803
 2023-11-16 05:12:33 +00:00
Darth Vader
37276c050f Squashed 'src/' changes from 81f180a0..1df4f189 
1df4f189 Merge commit 'ed1fbe949157f56f0799b2170ce207b7716a10f2'
ed1fbe94 Squashed 'phreeqcpp/' changes from bd2e2b6..625f6f1

git-subtree-dir: src
git-subtree-split: 1df4f189113f240fd735471f78f038415071d500
 2023-11-16 05:09:42 +00:00
Darth Vader
1b2eb6ca0d Squashed 'src/' changes from 6e248c34..81f180a0 
81f180a0 Fixed bugs in inverse
6d575967 strcpy_safe and strcat_safe
6d98c4e1 trying different header files
72796f15 added <cstring>
e8481607 warnings, strcat, strcpy
988bdee0 Try using goto(s)
9b10ce3f Try updated logical expression
812061be Turn off optimizing on k_temp

git-subtree-dir: src
git-subtree-split: 81f180a069285bcb4d180c860664b4b2a193854d
 2023-11-16 05:04:39 +00:00
Darth Vader
10bcb271d7 Squashed 'src/' changes from d5808fd1..6e248c34 
6e248c34 Updated to pass unit tests on linux Added two additional selected_output tests:   TestSelectedOutputFileMultipleRuns   TestGetSelectedOutputRowCountMultipleRuns
4d2181b7 Fixed bug that caused selected_output to accumulate in selected_output storage

git-subtree-dir: src
git-subtree-split: 6e248c34be4094371c707879f5142cb2fe353a1f
 2023-08-27 01:17:34 +00:00
Darth Vader
1a3663493c Squashed 'src/' changes from 99451c08..d5808fd1 
d5808fd1 Merge commit '6ea0442d458c0a029140954f6c801006cac0871b'
6ea0442d Squashed 'phreeqcpp/' changes from 8dade82..bd2e2b6

git-subtree-dir: src
git-subtree-split: d5808fd1883cb30122c94d058584f462e0af4074
 2023-08-25 15:29:56 +00:00
Darth Vader
fb29ba4c3a Squashed 'src/' changes from 52357404..99451c08 
99451c08 Merge commit '99b10305984102705405888e62ff98cae0c70fe6'
99b10305 Squashed 'phreeqcpp/' changes from 3b5f98c..8dade82

git-subtree-dir: src
git-subtree-split: 99451c08559e74014d45752e0b7d1c2c0a6c6bfe
 2023-08-25 03:36:29 +00:00
Darth Vader
8d6d4a6b4f Squashed 'src/' changes from 0cb7f629..52357404 
52357404 Merge commit 'e902474819623e9469f66b6514a8293063ff2b86'
e9024748 Squashed 'phreeqcpp/' changes from 8fa568f..3b5f98c

git-subtree-dir: src
git-subtree-split: 52357404b505448cd243c2714dfd4bcd7b95c183
 2023-08-25 03:33:23 +00:00
Darth Vader
90ccb6dc2b Squashed 'src/' changes from 8da0b219..0cb7f629 
0cb7f629 No memory leaks; Still need to turn-on Fortran

git-subtree-dir: src
git-subtree-split: 0cb7f629943a58c808f22ad2d8f169f83beb38ff
 2023-08-25 03:28:29 +00:00
Darth Vader
0e67b4a454 Squashed 'src/' changes from 446e7a8a..8da0b219 
8da0b219 Merge commit '322a40bb3a8db90d73fe707afaee51381e422aad'
322a40bb Squashed 'phreeqcpp/' changes from 6dade54..8fa568f

git-subtree-dir: src
git-subtree-split: 8da0b219402f72d81e06aeeceef5160237e3a59e
 2023-05-28 20:03:31 +00:00
Darth Vader
c50de2e4a7 Squashed 'src/' changes from 32fbc5ab..446e7a8a 
446e7a8a Merge commit 'dd7aa466004fee2b8f0ddc5ba8c04e6199af7fc8'
dd7aa466 Squashed 'phreeqcpp/' changes from 82515f7..6dade54

git-subtree-dir: src
git-subtree-split: 446e7a8a2a67e2fa92cbcefe3613a75382728db2
 2023-05-26 04:33:19 +00:00
Darth Vader
d83e815edb Squashed 'src/' changes from 9bd0be28..32fbc5ab 
32fbc5ab Merge commit '050663209be623e2af35e3f93a41ac6f5ac1f18f'
05066320 Squashed 'phreeqcpp/' changes from 93ab5c9..82515f7

git-subtree-dir: src
git-subtree-split: 32fbc5ab56eb19fff92831e32cbac7f01e1cdf56
 2023-05-26 04:28:17 +00:00
Darth Vader
0e6c28f226 Squashed 'src/' changes from b9bc048c..9bd0be28 
9bd0be28 Merge commit 'dc26aa2a8fe1111439df64025df25f8f01a615fe'
dc26aa2a Squashed 'phreeqcpp/' changes from b12de1f..93ab5c9

git-subtree-dir: src
git-subtree-split: 9bd0be28d6d496117fbe1fae1cc23146faca459f
 2023-05-26 02:37:26 +00:00
Darth Vader
7c3113fb1d Squashed 'src/' changes from 8a1e3f97..b9bc048c 
b9bc048c Merge commit '35dec7bafcb86c2fb40acc463c51be5af1af21b4'
35dec7ba Squashed 'phreeqcpp/' changes from e7c12e1..b12de1f

git-subtree-dir: src
git-subtree-split: b9bc048c32629ba034ce822b6b49ccc439a8b82c
 2023-05-26 02:33:23 +00:00
Darth Vader
71af2952a3 Squashed 'src/' changes from 813150bc..8a1e3f97 
8a1e3f97 Added sleeps after curl -X POST
91d35938 working on SelectedOutput for BMI
4234c11e Closes #48 -- Illegal character encoding in string literal (#49)

git-subtree-dir: src
git-subtree-split: 8a1e3f97118cf39d63ed4e6bcb9ee07ef30075b9
 2023-05-26 02:28:11 +00:00
Darth Vader
8494cef9c5 Squashed 'src/' changes from c35cbe19..813150bc 
813150bc Merge commit 'aff166b18426080aa53a136931d221f7afa810d3'
aff166b1 Squashed 'phreeqcpp/' changes from 97a0327..e7c12e1

git-subtree-dir: src
git-subtree-split: 813150bc86cd190acde156b7f1f9d85d54dc09d6
 2023-04-10 18:28:01 +00:00
Darth Vader
4419fccb31 Squashed 'src/' changes from 25f24721..c35cbe19 
c35cbe19 Merge commit '0a7874068e77f654f99f8a66b57f3963fea8ec0f'
0a787406 Squashed 'phreeqcpp/' changes from e1de8e8..97a0327

git-subtree-dir: src
git-subtree-split: c35cbe19ca04d0e1bc5fdd1e216784d92e608c08
 2023-04-10 03:21:40 +00:00
Darth Vader
05d97e8baf Squashed 'src/' changes from c0e62935..25f24721 
25f24721 fixed compiler warnings except NAN
3f24bf17 moved enum to RMVARS.h
54045123 changed all double precision to real(kind=8) in all files. Compiles and runs test cases.

git-subtree-dir: src
git-subtree-split: 25f2472130c22c1a63e15f0fa58f1021c83a7b4a
 2023-04-10 02:31:55 +00:00
Darth Vader
4fde5d2a99 Squashed 'src/' changes from da9a093d..c0e62935 
c0e62935 Merge commit 'cb707ac2b79acb0dd01a80e37a0b3f3beb690957'
cb707ac2 Squashed 'phreeqcpp/' changes from 11d588e..e1de8e8

git-subtree-dir: src
git-subtree-split: c0e629358b1b8cadd164afc1c68c974f3b6ec270
 2023-03-08 19:59:39 +00:00
Darth Vader
a695dadce2 Squashed 'src/' changes from fe577a18..da9a093d 
da9a093d Closes usgs-coupled/phast3#2 (#3)

git-subtree-dir: src
git-subtree-split: da9a093d9aaf63d9336fcf01bfeef5ea9e4f5a87
 2023-03-08 19:58:11 +00:00
Darth Vader
ad57aa549f Squashed 'src/' changes from 8a85d230..fe577a18 
fe577a18 [webmod] webmod-dist-windows-git fails to build on jenkins

git-subtree-dir: src
git-subtree-split: fe577a188cf0fc8102941d161bd4cc03c10881fe
 2023-03-07 20:05:21 +00:00
Darth Vader
c906404856 Squashed 'src/' changes from c77222b7..8a85d230 
8a85d230 Merge commit 'eeee6d3cce2549d37d7051ea3aebd78d77b944e8'
eeee6d3c Squashed 'phreeqcpp/' changes from eb35357..11d588e

git-subtree-dir: src
git-subtree-split: 8a85d230127e762c7182034c882f81024ef111ce
 2023-03-07 02:50:37 +00:00
Darth Vader
ce82b6836a Squashed 'src/' changes from 94f3c45a..c77222b7 
c77222b7 Merge commit '772c30924fd12ad20b8be7c128ae7cc33bb7b170'
772c3092 Squashed 'phreeqcpp/' changes from f8cd55c..eb35357

git-subtree-dir: src
git-subtree-split: c77222b71fe0762cc0afa54ca7fd7b2527d524bf
 2023-03-07 02:49:11 +00:00
Darth Vader
1a19a99b23 Squashed 'src/' changes from 28517a89..94f3c45a 
94f3c45a Merge pull request #17 from scharlton2/bmi-working
b4aa81fa pre-commit changes use $ pre-commit run --all-files

git-subtree-dir: src
git-subtree-split: 94f3c45a58255723a034f61b62b1218a393b02e0
 2023-03-07 02:43:15 +00:00
Darth Vader
90affba324 Squashed 'src/' changes from ec1947dc..28517a89 
28517a89 Merge commit 'bc9ab58d16539fa4c3580b66a7cd309db1c3568e'
bc9ab58d Squashed 'phreeqcpp/' changes from 0b60d1a..f8cd55c

git-subtree-dir: src
git-subtree-split: 28517a89cef56f3eb56b382e584ca8251d4af795
 2023-03-07 01:00:52 +00:00
Darth Vader
15c997e314 Squashed 'src/' changes from 9b9ee1b0..ec1947dc 
ec1947dc Merge commit 'c85a9cde6d9bf3f7841b3bc9b87c18e1012df0c9'
c85a9cde Squashed 'phreeqcpp/' changes from e9db33b..0b60d1a

git-subtree-dir: src
git-subtree-split: ec1947dcfe62d83054d56433ec3b563e70326879
 2023-03-07 00:43:16 +00:00
Darth Vader
9fac4a5659 Squashed 'src/' changes from 6e14dda9..9b9ee1b0 
9b9ee1b0 Closes usgs-coupled/phreeqcrm#12 (#13)

git-subtree-dir: src
git-subtree-split: 9b9ee1b061d2245ad878072c4cd01f6140ca11d8
 2023-03-07 00:41:52 +00:00