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

2270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
a0bffdbc3f Merge commit '8f7d206a800852d06bc9a1230320fd670dd34473' 2024-08-29 21:04:42 +00:00
Darth Vader
672e854d0e Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6' 2024-08-29 19:03:35 +00:00
Darth Vader
45befa7108 Squashed 'phreeqcpp/' changes from faf8144..c477ba1 
c477ba1 Converted to utf-8
53b14b4 Tony fixed latest viscosity bug in surface calculations
2375f7b fixed mismatched ifdef
84ad1ce Tony's changes. [200~Added variable viscos_DDL in EDL(viscos_DDL, surface_name) to give the viscosity of a Donnan layer on a surface in BASIC. Note that the surface_name should not contain an underscore _, the Donnan properties are for the surface, not for surface charge, thus use the surface name Hfo, not Hfo_w. If surface_name is omitted, the viscosity is given for the first surface in the alphabetical order.

git-subtree-dir: phreeqcpp
git-subtree-split: c477ba119a0ecfa4361b88f0b49523847a1a03bc
 2024-08-29 19:02:04 +00:00
Darth Vader
7e60110c31 Merge commit '45befa710880429a2a04cbc0294e83e0f2ce66b9' 2024-08-29 19:02:04 +00:00
Darth Vader
aa8cdd0113 Merge commit 'd7222e4f0b773e52ff448f83ba057ec492471ea1' 2024-08-15 17:09:45 +00:00
Darth Vader
c1c1f286b6 Squashed 'phreeqcpp/' changes from b6a23a2..faf8144 
faf8144 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57)

git-subtree-dir: phreeqcpp
git-subtree-split: faf81447ee82e86ce3b2cb9d71fd81316cccfd9f
 2024-08-15 17:08:49 +00:00
Darth Vader
f627828fb5 Merge commit 'c1c1f286b61ca73ae3204c7fa4831bb2e3066070' 2024-08-15 17:08:49 +00:00
Charlton, Scott R.
62ebb6ad11 Merge remote-tracking branch 'usgs-coupled/master' 2024-08-15 11:04:30 -06:00
Charlton, Scott R
d051e14c0b Merge remote-tracking branch 'usgs-coupled/master' 2024-08-15 11:04:30 -06:00
Charlton, Scott R.
1e41b0ca7a 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57) 
Change char* -> const char* for callbacks
 2024-08-15 10:12:44 -06:00
Charlton, Scott R
7ad5a592a7 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57) 
Change char* -> const char* for callbacks
 2024-08-15 10:12:44 -06:00
Darth Vader
48ea6ea0ea Merge commit '2d96a188772ef1fd12575913362d1fa01f198be8' 2024-08-14 21:45:07 +00:00
Darth Vader
88d5ec2035 Squashed 'phreeqcpp/' changes from 587223f..b6a23a2 
b6a23a2 reorder classes in global_structures.h to avoid incomplete definitions

git-subtree-dir: phreeqcpp
git-subtree-split: b6a23a2457530f9ca6e13fe4f0c226db3bba48af
 2024-08-14 21:44:26 +00:00
Darth Vader
2bcb24a86a Merge commit '88d5ec20353fab67149768c11765c3c248ee0cea' 2024-08-14 21:44:26 +00:00
Charlton, Scott R.
99e8a5271b Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran 
Add missing include of stddef.h in IPhreeqc.h when IPHREEQC_NO_FORTRAN_MODULE is defined
 2024-08-14 13:49:05 -06:00
Charlton, Scott R
d3b4b10b79 Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran 
Add missing include of stddef.h in IPhreeqc.h when IPHREEQC_NO_FORTRAN_MODULE is defined
 2024-08-14 13:49:05 -06:00
SpaceIm
29f1d4098e reorder classes in global_structures.h to avoid incomplete definitions 2024-08-11 21:08:04 +02:00
SpaceIm
128b7a1109 reorder classes in global_structures.h to avoid incomplete definitions 2024-08-11 21:08:04 +02:00
SpaceIm
c244641700 add missing include of stddef.h in IPhreeqc.h if no fortran module 
when IPHREEQC_NO_FORTRAN_MODULE is defined, the type of the last parameter of SetBasicFortranCallback is size_t, which is defined in stddef.h
 2024-08-11 20:55:26 +02:00
SpaceIm
8bf2d2989c add missing include of stddef.h in IPhreeqc.h if no fortran module 
when IPHREEQC_NO_FORTRAN_MODULE is defined, the type of the last parameter of SetBasicFortranCallback is size_t, which is defined in stddef.h
 2024-08-11 20:55:26 +02:00
Darth Vader
4c58a0f6b7 Merge commit '7c714dfbd3c917247c9c9346799bb3fa1b9dee16' 2024-07-11 17:09:41 +00:00
Darth Vader
9a4caf7def Squashed 'phreeqcpp/' changes from e4c4cf3..587223f 
587223f Extra check to not dump negative user numbers

git-subtree-dir: phreeqcpp
git-subtree-split: 587223f4d35ddca5105498f1f0ef31638f748562
 2024-07-11 17:08:34 +00:00
Darth Vader
178b05c251 Merge commit '9a4caf7def182e3f6aa3caa5024c7af821663b65' 2024-07-11 17:08:34 +00:00
Darth Vader
78f374b831 Merge commit '0e2456f051d9e2ad6f61f899721fa8ab2db1a30c' 2024-06-20 21:53:22 +00:00
Darth Vader
2abb0b0bcd Squashed 'phreeqcpp/' changes from 798f8f9..e4c4cf3 
e4c4cf3 Added functions SPECIES_EQUATION and PHASE_EQUATION, and species_equation test case.

git-subtree-dir: phreeqcpp
git-subtree-split: e4c4cf31fb54a3546e6bdbb1fda762952803fd82
 2024-06-20 21:52:29 +00:00
Darth Vader
0da302aedf Merge commit '2abb0b0bcd4bcae42f84ff001aba7f2ab6df2af7' 2024-06-20 21:52:29 +00:00
Darth Vader
0517529467 Merge commit '231f8e36589ed86c2270d0915bb91cc74b4a15ef' 2024-06-11 00:59:17 +00:00
Darth Vader
1a84cced60 Merge commit 'a9c4ef8324b6c59ba5cf0d78fc0d8ef93b33923f' 2024-06-11 00:58:18 +00:00
Darth Vader
a9c4ef8324 Squashed 'phreeqcpp/' changes from ceab9a1..798f8f9 
798f8f9 Merge commit '3eaa057b5d2bbc9327f2ab3adfd52577c687cfca'
3eaa057 Squashed 'common/' changes from 6abe004..399aba2
4cad3d5 [iphreeqc] Fixed for R

git-subtree-dir: phreeqcpp
git-subtree-split: 798f8f9d827d6ba7cf6a6d0c9a1fd3c7e806c72c
 2024-06-11 00:58:17 +00:00
Darth Vader
ab92280593 Merge commit '1ec7448cb08f1cc2917b33e3337946a8da23208f' 2024-06-11 00:57:31 +00:00
Charlton, Scott R
279b84357d [iphreeqc] Fixed for R 2024-06-10 18:55:01 -06:00
Charlton, Scott R
a8ac479491 [iphreeqc] Fixed for R 2024-06-10 18:55:01 -06:00
Darth Vader
ca0ba8d528 Merge commit 'ed24ec246bbfdcd57adbd0d4a9e8fe088a5de5b7' 2024-06-07 21:56:59 +00:00
Darth Vader
8024ee1289 Squashed 'phreeqcpp/' changes from e2f4d06..ceab9a1 
ceab9a1 Tony's change to Sr and NH4, SC_Ohm and rate_xmpls, basicsubs.cpp error

git-subtree-dir: phreeqcpp
git-subtree-split: ceab9a1033d2046c72a6bcf19c2c2244e8b23f97
 2024-06-07 21:56:13 +00:00
Darth Vader
2b17f7ca91 Merge commit '8024ee12891fde0332b86544b2b18010a91fde15' 2024-06-07 21:56:13 +00:00
Darth Vader
051687d391 Merge commit '9ba726de0f8b36a9143922bf148f6a259982756a' 2024-05-29 19:06:22 +00:00
Darth Vader
067a8b1aaa Squashed 'phreeqcpp/' changes from 3d5242f..e2f4d06 
e2f4d06 updated InternalCopy
d8abe83 Fixed problem with N vs NO3, for example, converting units with calculated density. Now gives same result for N or NO3.

git-subtree-dir: phreeqcpp
git-subtree-split: e2f4d060cd01b0b9912f0da7aa6c7cc20f77a9c5
 2024-05-29 19:05:39 +00:00
Darth Vader
795112031b Merge commit '067a8b1aaa326cecf6a1b5a167fe88448ef1e0b2' 2024-05-29 19:05:39 +00:00
Darth Vader
967cc4e68e Merge commit '7552f8f680a41d12454080cc1174765c86bb6354' 2024-05-27 19:32:06 +00:00
Darth Vader
fb3f60ce26 Merge commit '09af2d5b127a8efe403f47751c7c8465ec94874d' 2024-05-27 19:31:41 +00:00
Darth Vader
09af2d5b12 Squashed 'phreeqcpp/' changes from cb6d9f4..3d5242f 
3d5242f bug in processing ISOTOPE_RATIOS
034e921 added commented code to check e- in non-master species.

git-subtree-dir: phreeqcpp
git-subtree-split: 3d5242f5ccaf56cbcad48d33caee0340fb97da65
 2024-05-27 19:31:40 +00:00
Darth Vader
bbcb4c0ec7 Merge commit '06332bcb62daece34f3818f46e11064a56799f23' 2024-05-16 01:05:21 +00:00
Darth Vader
70e32eba2f Merge commit '0b3f349ad3bb84d493fc4d54bb6537a1fcafbc15' 2024-05-16 01:04:33 +00:00
Darth Vader
0b3f349ad3 Squashed 'phreeqcpp/' changes from 07c887a..cb6d9f4 
cb6d9f4 [phreeqci] Fixed phreeqci memory leaks
77df73c [phreeqci] Fixed memory leak for phreeqci
38a34f7 [phreeqci] Removed trailing whitespace

git-subtree-dir: phreeqcpp
git-subtree-split: cb6d9f49b0957bc431c0eca2c21711bfde4411e7
 2024-05-16 01:04:33 +00:00
Darth Vader
ad75e79efe Merge commit '51648664f6f6550440d014f3a985ef9d575c02bd' 2024-05-13 18:46:19 +00:00
Darth Vader
e871614214 Merge commit '1efeb356693a42a67a7d7ccf60982c06e882dfdf' 2024-05-13 18:45:27 +00:00
Darth Vader
1efeb35669 Squashed 'phreeqcpp/' changes from 8f6cb45..07c887a 
07c887a [phreeqci] Removed assert since svn -r8264(3.1.0 -- 2013-11-27) fails opening ex6

git-subtree-dir: phreeqcpp
git-subtree-split: 07c887a02026b1c0bfc6019d09b8ed45e22bb678
 2024-05-13 18:45:27 +00:00
Darth Vader
a162eb9ebb Merge commit 'fff75534d73a06719ce2fbb482f843e0fb9dc4c6' 2024-05-10 20:36:55 +00:00
Darth Vader
78fa3ba34e Merge commit '97a4237601d215dd712df5fee01399c9c2841ff8' 2024-05-10 20:36:07 +00:00
Darth Vader
97a4237601 Squashed 'phreeqcpp/' changes from c035d9c..8f6cb45 
8f6cb45 Pad needed a free. Ran all test cases.
56ba680 Freed result from strexpr

git-subtree-dir: phreeqcpp
git-subtree-split: 8f6cb45a04ca40ea253c0f3ca90f52427d99592d
 2024-05-10 20:36:07 +00:00