Darth Vader
7f683b4082
Merge commit '622bc5fb4cc8f67f9303e45c98397b97fe30822f'
2024-10-08 20:05:43 +00:00
Darth Vader
d6a74675d7
Merge commit '4e80a54467a084df3b666c7d6fc56a4798fd3301'
2024-10-08 20:05:00 +00:00
Darth Vader
4e80a54467
Squashed 'phreeqcpp/' changes from 7c7fafd..c876219
...
c876219 Merge commit '64310ada821d1cc387af4507db7029fe3326784b'
64310ad Squashed 'common/' changes from 399aba2..648db22
git-subtree-dir: phreeqcpp
git-subtree-split: c876219b1b064ab7c17e0bc4ad8bff13e0aeb108
2024-10-08 20:05:00 +00:00
Darth Vader
0209fdf9c7
Merge commit 'b537589773f4819fe97ff8e5322bcd38c54b63f7'
2024-10-08 20:04:33 +00:00
Darth Vader
b537589773
Squashed 'phreeqcpp/' changes from e317dd0..7c7fafd
...
7c7fafd Merge pull request #78 from dlparkhurst/mix_error
eb0591c Merge pull request #74 from mwtoews/fix-typos
334df5e Tony's fix in heat transport
bf897a2 Marked old error in mix. Updated test case.
58566a6 Fix ah2o in adding a solution. Fixed bad_graph database.
75effd0 Merge branch 'viscosity' into mix_error
f4708df account for water mass in addition to mixing fractions
70954c6 mixing by water mass times mixing fraction
84b59ab Fix typos
git-subtree-dir: phreeqcpp
git-subtree-split: 7c7fafd686d7c41753132a978a1d55d4d25b601b
2024-10-08 20:04:33 +00:00
Darth Vader
0bd8217516
Merge commit 'ca6b882bcab9708f90c8761e0d4a4d572c57fce7'
2024-09-24 22:03:32 +00:00
Darth Vader
ac39375609
Merge commit 'c155685f6393b3cd780a56e72651eb79ea5f4bc1'
2024-09-24 22:02:30 +00:00
Darth Vader
c155685f63
Squashed 'phreeqcpp/' changes from fdc0bb5..e317dd0
...
e317dd0 Guarded case with no points in curves for log axes. Added bad_graph test case.
git-subtree-dir: phreeqcpp
git-subtree-split: e317dd0e41bbfd18abd2255ab5f2cf3933cd4c69
2024-09-24 22:02:30 +00:00
Darth Vader
9fac273ef2
Merge commit 'ce2280a77a81e5a8214ae01f97e9766e168327cf'
2024-08-29 21:05:25 +00:00
Darth Vader
a0bffdbc3f
Merge commit '8f7d206a800852d06bc9a1230320fd670dd34473'
2024-08-29 21:04:42 +00:00
Darth Vader
8f7d206a80
Squashed 'phreeqcpp/' changes from c477ba1..fdc0bb5
...
fdc0bb5 fixed nullptr for pre-c++11
git-subtree-dir: phreeqcpp
git-subtree-split: fdc0bb51869877771df528f727fe577f58877c7d
2024-08-29 21:04:42 +00:00
Darth Vader
672e854d0e
Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6'
2024-08-29 19:03:35 +00:00
Darth Vader
7e60110c31
Merge commit '45befa710880429a2a04cbc0294e83e0f2ce66b9'
2024-08-29 19:02:04 +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
aa8cdd0113
Merge commit 'd7222e4f0b773e52ff448f83ba057ec492471ea1'
2024-08-15 17:09:45 +00:00
Darth Vader
f627828fb5
Merge commit 'c1c1f286b61ca73ae3204c7fa4831bb2e3066070'
2024-08-15 17:08:49 +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
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
