1445 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	1150a4a2aa	changed restart file to include UZ	2018-11-30 17:41:13 -07:00
David Parkhurst	b500c5448b	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
David Parkhurst	058375c2bf	removed check of ss when sum of components is small	2018-10-31 14:01:22 -06:00
Scott R Charlton	a69488c64a	Merge commit 'c4fa021ec11b89ab9f4498823409abae9c256d1b'	2018-10-19 20:14:50 -06:00
Scott R Charlton	c4fa021ec1	Merge commit '2977db4424a04e3643bb02d356984c7aa78d1fde'	2018-10-19 20:14:33 -06:00
David Parkhurst	2977db4424	Tonys fix to diffusion bug with porosity change	2018-10-17 20:07:13 -06:00
Scott R Charlton	39d69af25e	Merge commit 'ec4ec0a3cb6abe172788ffc9d7db5d183390b4da'	2018-08-28 12:19:48 -06:00
Scott R Charlton	ec4ec0a3cb	Merge commit 'f90446715b85306f1c8489219316d4c962fd4659'	2018-08-28 12:19:22 -06:00
Scott R Charlton	30ae101acc	Merge commit '3a0292c6956e0bb4d9bf1e9b4bed9831ac517d39'	2018-08-28 12:15:40 -06:00
David Parkhurst	f90446715b	revised lists to be cumulative for eq, gas, kin, ss	2018-08-23 16:37:14 -06:00
David Parkhurst	3a0292c695	revised lists to be cumulative for eq, gas, kin, ss	2018-08-23 16:37:14 -06:00
Scott R Charlton	da6660ae70	Merge commit '7b836dd6cffc6e52c29192e6ae7583044c27cadb'	2018-08-22 16:44:38 -06:00
Scott R Charlton	7b836dd6cf	Merge commit '9285985dc0222cf6fde33c32625027d376159b3b'	2018-08-22 16:44:20 -06:00
David Parkhurst	9285985dc0	merging coupled/master into copy	2018-08-22 16:39:26 -06:00
David Parkhurst	7c23b62594	Fixed string_duplicate memory error	2018-08-22 08:20:51 -06:00
David Parkhurst	2d5551a313	fixed sc7 for copy and initial time	2018-08-21 16:57:24 -06:00
David Parkhurst	4842d9efba	inverse iter 100000; finished copy operator; a bit more testing to go	2018-08-21 11:33:27 -06:00
David Parkhurst	4eefe43a5b	ex20_debug fix	2018-08-19 19:49:26 -06:00
David Parkhurst	78e39cdebc	still debugging copy	2018-08-19 13:15:43 -06:00
David Parkhurst	cee10e7ab9	fixing bugs in copy operator	2018-08-18 13:14:30 -06:00
David Parkhurst	ebab4bce42	fixing bugs in copy operator	2018-08-18 12:42:30 -06:00
David Parkhurst	5a35e0278b	Fixed Linux warnings, memory errors	2018-08-16 20:35:44 -06:00
David Parkhurst	b86f79386a	Beginning to test copy operator	2018-08-16 11:52:11 -06:00
Scott R Charlton	bda358e2d0	Merge commit 'b3e7b2eca602b628e05c15dd920a1cb470980736'	2018-08-14 21:27:22 -06:00
Scott R Charlton	b3e7b2eca6	Merge commit '5d40e69cc7fcc5bca0037ee70d9d64e4c370e5dd'	2018-08-14 21:25:47 -06:00