1468 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Scott R Charlton	9cbf676df3	Merge commit 'fbde6453ae53afa9bd4910ff00b48ecccc1153b8'	2019-01-30 17:20:34 -07:00
Scott R Charlton	7237eb267d	Merge branch 'issue-2' into 'master' ... Issue 2 See merge request coupled/IPhreeqc!7	2019-01-30 17:12:46 -07:00
Scott R Charlton	fbde6453ae	Merge branch 'issue-2' into 'master' ... Issue 2 See merge request coupled/IPhreeqc!7	2019-01-30 17:12:46 -07:00
Scott R Charlton	d157977bcd	Merge commit '548aead510d42fd3998eb74be8a5f94396c69bea'	2019-01-29 11:10:59 -07:00
Scott R Charlton	548aead510	Merge commit '040fd95fadbc2cd62df3c056ef7a41e10c8b7a29'	2019-01-29 11:10:34 -07:00
David Parkhurst	040fd95fad	include restart, remove ex20_debug	2019-01-29 11:03:15 -07:00
Scott R Charlton	1eb3ed948a	Merge commit '12df06b34cba4744a36bf519bb7298caf98a320a'	2019-01-28 22:14:47 -07:00
Scott R Charlton	12df06b34c	Merge commit 'd57264d9733b6f5687d8b7d87f5e9a8aad7e7d71'	2019-01-28 22:14:36 -07:00
David Parkhurst	d57264d973	2. changes to solid solution numerical method	2019-01-28 22:08:04 -07:00
Scott R Charlton	1bbc004477	Merge commit '43386a0bc4d26c2891a23c27cfb2bae0f6cec9eb'	2019-01-28 21:20:43 -07:00
Scott R Charlton	43386a0bc4	Merge commit '3fd8155d566798e121a1f54418f901cdd0db5e6c'	2019-01-28 21:20:14 -07:00
David Parkhurst	3fd8155d56	changes to solid solution numerical method	2019-01-28 21:08:54 -07:00
Scott R Charlton	f56958652e	Merge commit 'f90fc5afeaa5347ef057416551bb406e8ce5d855'	2019-01-28 18:20:25 -07:00
Scott R Charlton	f90fc5afea	Merge commit '2b14a9475c1cb0c64d3adaf67a907b63ea454c9c'	2019-01-28 18:19:55 -07:00
David Parkhurst	2b14a9475c	Tony's changes 20190117	2019-01-28 17:24:59 -07:00
Scott R Charlton	4c7946afb5	Added code to record git commit hash	2019-01-28 16:41:11 -07:00
Scott R Charlton	9d51f5cf64	Added code to record git commit hash	2019-01-28 16:41:11 -07:00
Scott R Charlton	ad4fc43e3b	Merge commit '1a4422b8af0f7801aa8cfcff161804516ac50910'	2018-12-11 17:55:34 -07:00
Scott R Charlton	1a4422b8af	Merge commit 'ae6e8b05440ea1db35226a479daf5d3b4a05690a'	2018-12-11 17:54:50 -07:00
Scott R Charlton	6091a42e2b	Merge commit '1bfc9f49d032d42460c4e993f3aafc8a3f341625'	2018-12-11 17:50:24 -07:00
David L Parkhurst	1bfc9f49d0	Merge branch 'master' into 'master' ... added modify methods for restart files See merge request coupled/phast3!8	2018-12-11 17:35:17 -07:00
David Parkhurst	ae6e8b0544	added modify methods for restart files	2018-12-11 17:17:49 -07:00
David Parkhurst	fa7776b8fe	added modify methods for restart files	2018-12-11 17:17:49 -07:00
Scott R Charlton	8170cb9824	Merge commit '749c3e09ee53cd345d1375e72ebf3c10591581b2'	2018-12-06 13:54:54 -07:00
Scott R Charlton	749c3e09ee	Merge commit 'b500c5448b613a20c48a08237460c3b495d3d390'	2018-12-06 13:54:43 -07:00
Scott R Charlton	eefd6bfa78	Merge commit '1150a4a2aa4b6957fbf8bb2cf1d0c58ce8cf81d5'	2018-12-06 13:50:29 -07:00
David Parkhurst	b500c5448b	changed restart file to include UZ	2018-11-30 17:41:13 -07:00
David Parkhurst	1150a4a2aa	changed restart file to include UZ	2018-11-30 17:41:13 -07:00
Scott R Charlton	fdb8d13703	Merge commit 'c2dada993c2edb3f80f9bae636ace9b099073051'	2018-11-07 23:14:47 -07:00
Scott R Charlton	c2dada993c	Merge commit 'fffac6d359c01544c617aae6717678f0fd884193'	2018-11-07 23:14:22 -07:00
David Parkhurst	fffac6d359	another try for ex20_debug	2018-11-07 23:04:05 -07:00
Scott R Charlton	85c8d55a4b	Merge commit '4235170d91bbc77f6775c141ada27b130518329b'	2018-11-07 20:11:06 -07:00
Scott R Charlton	4235170d91	Merge commit 'fa5ee5049432867a5161fcd97aebe475854fffdb'	2018-11-07 20:10:00 -07:00
David Parkhurst	fa5ee50494	fix problem with ex20_debug	2018-11-07 20:03:36 -07:00
Scott R Charlton	a8730c6e95	Merge commit '65dbd2c15b866dd75bc66faab28f0761ebaf348d'	2018-11-07 16:21:51 -07:00
Scott R Charlton	65dbd2c15b	Merge commit 'd99390113028519f41895af04cedba4a43258336'	2018-11-07 16:20:41 -07:00
David Parkhurst	d993901130	encoding, limit.h	2018-11-07 15:41:07 -07:00
Scott R Charlton	c1c6ca18a8	Merge commit '6e92ecf9efab80668453622bc42226616043320e'	2018-11-07 15:29:50 -07:00
Scott R Charlton	6e92ecf9ef	Merge commit '92c81f9fdd43f175d302028b56e7edbab81a7d06'	2018-11-07 15:29:36 -07:00
David Parkhurst	92c81f9fdd	Revised logic for nmix	2018-11-07 15:04:54 -07:00
Scott R Charlton	bf865f6a3b	Merge commit 'dbefc44f31ee85768c0ac5a2f9eeba05c525eabe'	2018-11-07 14:39:52 -07:00
Scott R Charlton	dbefc44f31	Merge commit '3cc84da8ceac5d4a819fc0a6779b7ca361c17226'	2018-11-07 14:39:33 -07:00
David Parkhurst	3cc84da8ce	Merge remote-tracking branch 'coupled/master' into ss_trans	2018-11-07 14:33:17 -07:00
Scott R Charlton	9e0bf943a3	Merge commit 'c83e4bf78e37924add9da5889dc133e335d3efe6'	2018-11-06 16:50:49 -07:00
Scott R Charlton	c83e4bf78e	Merge commit '56b5bf3f438e0b99c7a35b79ad169be36c2fa352'	2018-11-06 16:49:45 -07:00
Scott R Charlton	56b5bf3f43	create valid ranges when sscanf doesn't return 2	2018-11-06 16:25:34 -07:00
David Parkhurst	c43c9af38d	tweaked ss, changed surf function per Kinniburgh	2018-11-06 10:17:35 -07:00
David Parkhurst	b10df16b03	Corrected syntax of integer limit, previous commit actually changed ss convergence parameter, used to multiply by 0.99	2018-11-03 22:35:15 -06:00
David Parkhurst	d74c8ff554	Corrected syntax of integer limit	2018-11-03 22:33:06 -06:00
David Parkhurst	906cfd49c7	Check value of nmix	2018-11-03 15:30:19 -06:00