1910 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	50016849a0	Merge commit '5128e1337b2edd39ac3d16d2a5ce1c7f1e5f0773'	2020-12-02 00:46:34 +00: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
David Parkhurst	c9f796a0f8	added ADD_HEADING for IPhreeqc	2020-11-24 20:50:05 -07:00
David Parkhurst	1362f0ff8a	Added EOL_NOTAB$ and NO_NEWLINE$, updated release notes	2020-11-24 14:09:28 -07:00
Darth Vader	055ebf5c1f	Merge commit '2b4dbbdb167b77809e7c89bbec406810aa28162a'	2020-09-29 22:14:23 +00:00
Darth Vader	2b4dbbdb16	Merge commit 'cd51d8aeed46909e5f028a19089acfef43d6ede9'	2020-09-29 22:13:38 +00:00
Darth Vader	589d88ff89	Merge commit 'f2023c4d83f55cbf4598ae8e308df3ef06b8f08c'	2020-09-29 22:12:01 +00:00
Charlton, Scott R	f2023c4d83	Merge branch 'gtest' into 'master' ... Reset dllexport; fixed doxygen example tests See merge request coupled/iphreeqc!19	2020-09-29 22:09:46 +00:00
Charlton, Scott R	f4bf55d7bf	Merge branch 'gtest' into 'master' ... Reset dllexport; fixed doxygen example tests See merge request coupled/iphreeqc!19	2020-09-29 22:09:46 +00:00
Charlton, Scott R	cd51d8aeed	reset for dlls	2020-09-29 10:27:55 -06:00
Charlton, Scott R	54161f4ae3	reset for dlls	2020-09-29 10:27:55 -06:00
Charlton, Scott R	a28c241478	reset for dlls	2020-09-29 10:27:55 -06:00
Darth Vader	e904f5b730	Merge commit '01c99a70a5baf72d53ae8e8f6db53948ddcd990c'	2020-09-24 04:29:35 +00:00
Charlton, Scott R	01c99a70a5	Merge remote-tracking branch 'github/master'	2020-09-23 22:25:35 -06:00
David Parkhurst	23f391743a	Merge remote-tracking branch 'scharlton2/master'	2020-09-23 15:49:19 -06:00
David Parkhurst	f6644e6e34	check for null pointer. Encoding for .out file	2020-09-23 15:47:05 -06:00
Darth Vader	e562e09e9a	Merge commit '9319c9daf8fe76ef24cf4d262081e8cd0c8fc3fe'	2020-09-17 06:11:12 +00:00
Darth Vader	9319c9daf8	Merge commit '5b816fa1fd82eb94e2702b6bd9df6066fb71267b'	2020-09-17 06:10:18 +00:00
Darth Vader	ea2c663c90	Merge commit '07717b1e931b4526f3c33921cd872577599410b6'	2020-09-17 06:09:05 +00:00
Charlton, Scott R	5b816fa1fd	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	07717b1e93	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	0b0fced395	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	d8c638fba3	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00
Charlton, Scott R	c8be5daebc	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00
Darth Vader	18e137ff55	Merge commit '87bbb6a6f08a3f6cf0e4122e9c080db4ef000344'	2020-09-06 04:13:56 +00:00
Charlton, Scott R	87bbb6a6f0	adjusted alignment for utf-8 strings	2020-09-05 21:06:50 -07:00
Darth Vader	3782d4420d	Merge commit '03bda166155a6b2ce652e4ad6aceaf807c3bc041'	2020-09-04 23:43:25 +00:00
Charlton, Scott R	03bda16615	added write_banner to non-DOS and added UTF8 define	2020-09-03 13:11:57 -07:00
Charlton, Scott R	995de526c0	converted to utf-8	2020-09-03 12:54:51 -06:00
Darth Vader	d4261840c7	Merge commit 'fc8fe3e98fb3f1e42482636938537ed6028b3ee6'	2020-08-31 03:45:31 +00:00
Charlton, Scott R	fc8fe3e98f	re-added src/ZedGraph.dll	2020-08-30 21:42:00 -06:00
Darth Vader	6e7023f842	Merge commit 'fbae3e92947cf79c1d615e657192eb8d5c78b9e9'	2020-08-31 01:55:19 +00:00
David Parkhurst	fbae3e9294	code change for extending porosity definition. Change to TonyLitharge2a	2020-08-30 15:40:08 -06:00
Charlton, Scott R	46257e7349	added googletest and fixed some minor bugs	2020-08-25 12:27:15 -06:00
Charlton, Scott R	13ca055192	added googletest and fixed some minor bugs	2020-08-25 12:27:15 -06:00
Charlton, Scott R	2760ad0c36	added googletest and fixed some minor bugs	2020-08-25 12:27:15 -06:00
Charlton, Scott R	dd058e3bec	implemented Get/SetErrorOn	2020-08-25 12:17:54 -06:00
David Parkhurst	f1dda6c53b	Fixed problem with exchange-related when exchanger is defined as CaX2	2020-08-23 15:57:54 -06:00
Darth Vader	b138ed208d	Merge commit '20daad41c8999670f933430f1c705384cdfa6947'	2020-08-20 02:37:16 +00:00
David Parkhurst	20daad41c8	I guess cxxSurface::NO_EDL is correct	2020-08-18 15:21:08 -06:00
Darth Vader	5631ce1e56	Merge commit '801812ded3961b37ed264997211694bd0563d554'	2020-08-18 19:58:22 +00:00
David Parkhurst	801812ded3	Tony's changes to implicit Nernst-Planck calculation	2020-08-17 14:40:41 -06:00
David Parkhurst	6b4892cfc7	added Basic function DEBYE_LENGTH and test case zeta	2020-08-17 09:41:37 -06:00
David Parkhurst	921ab106b8	Changed tidy_exchange_min and tidy_exchange_kin to tidy only for new_def and n_user >= 0. Fixed bug if surf_charge not defined for NO_EDL. Added test MoreExchMix	2020-08-13 23:11:21 -06:00