Darth Vader
|
3d05ce1743
|
Merge commit '710d0096aa62355bf6c212efb3f6f9392ccd3f37'
|
2021-03-12 16:57:53 +00:00 |
|
Darth Vader
|
710d0096aa
|
Merge commit '6a5bb8aba56d568bd139bc3aed7363d929397790'
|
2021-03-12 16:57:10 +00:00 |
|
Scott Charlton
|
6a5bb8aba5
|
Merge pull request #1 from usgs-coupled/mar10
Merge mar10
|
2021-03-12 09:50:17 -07:00 |
|
David Parkhurst
|
d9ced82fda
|
Fixed uninitialized constructors and couple of other warnings
|
2021-03-12 07:50:01 -07:00 |
|
David Parkhurst
|
6b19edba79
|
Fixed uninitialized constructors and couple of other warnings
|
2021-03-12 07:50:01 -07:00 |
|
David Parkhurst
|
c79d2c23c8
|
working on UTF-8
|
2021-03-11 19:52:49 -07:00 |
|
David Parkhurst
|
fcee4d5da4
|
Added delta_h_species, delta_h_phase, dh_a0, dh_bdot Basic functions
|
2021-03-11 08:52:45 -07:00 |
|
David Parkhurst
|
81e862db5d
|
Tonys changes Mar 10. SIs in inverse calulations
|
2021-03-10 14:08:03 -07:00 |
|
Darth Vader
|
deec05fc83
|
Merge commit '62c51bb410b3f9fd18cc5a21b5341e9652089d86'
|
2021-03-06 01:42:53 +00:00 |
|
Darth Vader
|
62c51bb410
|
Merge commit '9e8b3828595be0339d3c63b5707412e34a4e5007'
|
2021-03-06 01:42:08 +00:00 |
|
Charlton, Scott R
|
9e8b382859
|
Merge remote-tracking branch 'usgs-coupled/master'
|
2021-03-05 18:38:44 -07:00 |
|
Darth Vader
|
a75a9caa08
|
Merge commit '4473286a216928665f9c1b00932687c9945175a9'
|
2021-03-05 23:51:16 +00:00 |
|
Darth Vader
|
4473286a21
|
Merge commit '053b4c6fb3cb778f08377b932745643472888aa5'
|
2021-03-05 23:50:16 +00:00 |
|
Darth Vader
|
0409a3ed07
|
Merge commit 'b9f44da20a78a23395d38205c001298f6a68bd0c'
|
2021-03-05 23:49:46 +00:00 |
|
Charlton, Scott R
|
053b4c6fb3
|
Merge remote-tracking branch 'origin/master'
|
2021-03-05 16:43:46 -07:00 |
|
Charlton, Scott R
|
b9f44da20a
|
Merge remote-tracking branch 'origin/master'
|
2021-03-05 16:43:46 -07:00 |
|
David Parkhurst
|
20091aa52d
|
Merge branch 'log10molalities' into gasphasepressures
|
2021-03-02 20:58:44 -07:00 |
|
David Parkhurst
|
c4f9d291db
|
Merge branch 'log10molalities' into gasphasepressures
|
2021-03-02 20:58:44 -07:00 |
|
David Parkhurst
|
41e1112fb9
|
Last of changes for GetGasPhasePressures and GetGasPhasePhi, openmp and mpi. MPI fortrans not tested.
|
2021-02-27 22:26:48 -07:00 |
|
David Parkhurst
|
18158db399
|
Last of changes for GetGasPhasePressures and GetGasPhasePhi, openmp and mpi. MPI fortrans not tested.
|
2021-02-27 22:26:48 -07:00 |
|
David Parkhurst
|
e1f9cb1cc5
|
more checking in. Should be down to tweaks for SetGasPhaseMoles.
|
2021-02-25 18:04:29 -07:00 |
|
David Parkhurst
|
e1554d9987
|
more checking in. Should be down to tweaks for SetGasPhaseMoles.
|
2021-02-25 18:04:29 -07:00 |
|
David Parkhurst
|
00ee6e365a
|
C++ is working with OpenMP and MPI for Get/SetGasPhaseMoles. Need to add c and F90.
|
2021-02-23 10:56:26 -07:00 |
|
David Parkhurst
|
0a63328909
|
C++ is working with OpenMP and MPI for Get/SetGasPhaseMoles. Need to add c and F90.
|
2021-02-23 10:56:26 -07:00 |
|
David Parkhurst
|
c3a3153f9b
|
Added GetSpeciesLog10Molalities. Tested OpenMP with VS. Tested MPI with MinGW. Fortran, C, and C++ seem to work.
|
2021-02-21 21:13:05 -07:00 |
|
David Parkhurst
|
566bfbce3b
|
Added GetSpeciesLog10Molalities. Tested OpenMP with VS. Tested MPI with MinGW. Fortran, C, and C++ seem to work.
|
2021-02-21 21:13:05 -07:00 |
|
David Parkhurst
|
e8b11f3472
|
added optional 6th argument to Basic function sys to change sort order from molality or moles to the name. Added synonym PAD$. Added new mytest/sys_sort.
|
2021-02-20 20:53:29 -07:00 |
|
Darth Vader
|
dcd7188a71
|
Merge commit '20ab4be9f3235740e6ed5ede81bca488adffd991'
|
2020-12-16 19:05:29 +00:00 |
|
Darth Vader
|
20ab4be9f3
|
Merge commit '3e4fc7ea18da750b2746422898dc100d74271b34'
|
2020-12-16 19:04:47 +00:00 |
|
David Parkhurst
|
3e4fc7ea18
|
cleanup commented lines
|
2020-12-09 10:49:13 -07:00 |
|
David Parkhurst
|
54b992f566
|
working on tabs and no newline
|
2020-12-08 20:38:18 -07:00 |
|
David Parkhurst
|
2181847329
|
Merge branch 'master' of https://github.com/usgs-coupled/phreeqc3
|
2020-12-07 15:25:58 -07:00 |
|
David Parkhurst
|
deeecb0c43
|
needed strexpr in ADD_HEADING to allow expressions
|
2020-12-07 15:24:11 -07:00 |
|
Darth Vader
|
7ea1a6d42b
|
Merge commit '2d2f55adc0376d3ba4bc366e0e8bcc44f658a9c7'
|
2020-12-03 03:07:53 +00:00 |
|
Darth Vader
|
2d2f55adc0
|
Merge commit '9b7785f0730513093816cfbd1c24fbf068e4f2ca'
|
2020-12-03 03:07:20 +00:00 |
|
Darth Vader
|
554256e3bc
|
Merge commit '33f589897a8e09ca3dd745b150f3eb6555347052'
|
2020-12-03 03:04:34 +00:00 |
|
Charlton, Scott R
|
9b7785f073
|
[iphreeqccom] updated date
|
2020-12-02 20:02:35 -07:00 |
|
Charlton, Scott R
|
33f589897a
|
[iphreeqccom] updated date
|
2020-12-02 20:02:35 -07:00 |
|
Darth Vader
|
d4a8833af3
|
Merge commit 'e224625f086369b838e5db00d5105b30f444b963'
|
2020-12-03 01:53:46 +00:00 |
|
Darth Vader
|
e224625f08
|
Merge commit '711b1d061cba1005f028d1b17b0bb34e2b2d9162'
|
2020-12-03 01:53:17 +00:00 |
|
Darth Vader
|
711b1d061c
|
Merge commit '608e74f5d3c55a4d91a4e08d86f2fd6df0ce0a05'
|
2020-12-03 01:52:54 +00:00 |
|
Charlton, Scott R
|
608e74f5d3
|
[wphast] updated date
|
2020-12-02 18:42:20 -07:00 |
|
Darth Vader
|
fa25db5da9
|
Merge commit '50016849a03a70eeb0f714f23a3b56f1983a8189'
|
2020-12-02 01:05:29 +00:00 |
|
Darth Vader
|
50016849a0
|
Merge commit '5128e1337b2edd39ac3d16d2a5ce1c7f1e5f0773'
|
2020-12-02 00:46:34 +00:00 |
|
Charlton, Scott R
|
fb31cc3811
|
[iphreeqc] updated image location
|
2020-12-01 17:36:14 -07:00 |
|
Charlton, Scott R
|
73d356aad2
|
[iphreeqc] updated image location
|
2020-12-01 17:36:14 -07:00 |
|
Charlton, Scott R
|
5128e1337b
|
[phreeqc3] updated image location
|
2020-12-01 15:33:48 -07:00 |
|
Charlton, Scott R
|
fba8ae2a09
|
[phreeqc3] updated image location
|
2020-12-01 15:33:48 -07:00 |
|
David Parkhurst
|
43988f06a6
|
initialize punch_newline
|
2020-11-25 15:53:50 -07:00 |
|
David Parkhurst
|
176fb029d3
|
Moved initialization from header to constructor, special characters in As.out
|
2020-11-25 10:39:52 -07:00 |
|