Commit graph

49 commits

Author SHA1 Message Date
Paul
c4aff04418 Updated URL in references to Cantera's license. 2019-09-23 22:02:33 -04:00
Ray Speth
ae6e7fdff7 Add license/copyright info to files that were missing it 2016-10-10 22:48:23 -04:00
Ray Speth
4582e724ee Eliminate compiler warnings issued by Visual Studio 2015 2016-07-30 23:09:17 -04:00
Ray Speth
64983aaf16 Remove some unnecessary copy constructors and assignment operators
The implicitly-defined copy constructors and assignment operators work fine for
these classes.
2016-07-29 18:39:45 -04:00
Ray Speth
a026c6ad8b [Thermo] Add compatibility check for phases added to MultiPhase
PureFluidPhase and WaterSSTP are not compatible with MultiPhase since they are
already multi-phase mixtures.

Resolves #306
2016-04-18 14:40:28 -04:00
Ray Speth
a60217cfc6 [Equil] Make better use of local variables 2016-04-05 12:52:01 -04:00
Ray Speth
4887775109 Eliminate unnecessary counter member variables 2015-12-01 15:54:55 -05:00
Ray Speth
ee95c60813 Simplify error handling to eliminate need for global error stack
All of the functions for manipulating the global error stack
(CanteraError::save, setError, showErrors, etc.) are deprecated. The ability to
store an error is retained only for use in the C and Fortran interfaces so that
the last error message can be retrieved after a function returns an error code.
2015-11-16 19:50:55 -05:00
Ray Speth
5bf3b0fc67 Clean up comments in other equilibrium-related classes 2015-11-09 17:59:22 -05:00
Ray Speth
0647823ada Replace DATA_PTR macro with calls to data() 2015-10-17 18:58:50 -04:00
Ray Speth
3f6d8b0aca Use cppformat instead of int2str and fp2str 2015-10-14 18:45:23 -04:00
Ray Speth
41527b1ea7 Rename two-argument version of writelog 'debuglog'
This is a prerequisite to allowing writelog to take an arbitrary number
of arguments.
2015-10-14 18:45:22 -04:00
Ray Speth
acdf9cf0ed Clean up interstitial whitespace
Remove extra space around operators, between words, etc.
2015-08-02 23:06:16 -04:00
Ray Speth
6a04193646 Fix un-bracketed if, for, and else statements 2015-08-02 23:06:15 -04:00
Ray Speth
e4c45b6429 General whitespace cleanup
Remove unnecessary blank lines and trailing whitespace. Replace tabs with
spaces.
2015-08-02 23:06:15 -04:00
Ray Speth
619cd20f14 Fix badly-formatted else/else if/catch clauses 2015-08-02 23:06:15 -04:00
Ray Speth
bf2ceed60e Remove some leftover debugging ifdefs 2015-07-20 15:47:17 -04:00
Ray Speth
f1f10b6526 Remove unused, deprecated code marked for removal after Cantera 2.2 2015-07-15 12:08:50 -04:00
Ray Speth
808f088ffd Merge namespace VCSnonideal with namespace Cantera 2015-05-27 18:27:25 -04:00
Ray Speth
2e53890adf Minor cleanup of constructors and destructors 2015-02-26 21:58:42 +00:00
Ray Speth
39b751d655 [Equil] Always use the member function versions of 'equilibrate'
The various free functions are deprecated, along with the now unnecessary
headers 'equil.h' and 'equilibrium.h'.
2014-11-08 00:53:45 +00:00
Ray Speth
8c934ab678 [Equil] Implement equilibrate as a method of MultiPhase
This differs from the current equilibrate method in that it can use either of
the multiphase equilibrium solvers.
2014-11-08 00:53:42 +00:00
Ray Speth
a208c54d1c Add a version of XML_Node::getChildren with a simpler interface 2014-10-22 21:48:04 +00:00
Ray Speth
5b1b08849c Additional uses for getValue with default value 2014-10-03 01:45:54 +00:00
Ray Speth
002c158761 Cleanup include statements
Move includes from header to implementation files where possible, and remove
unnecessary includes.
2014-08-28 16:54:13 +00:00
Ray Speth
b5396837b2 Make use of std::min, std::max, and clip 2014-06-03 16:52:43 +00:00
Ray Speth
373e4ae565 Remove goto and manual memory management from MultiPhase::equilibrate 2014-05-27 02:53:42 +00:00
Ray Speth
789574ac80 Remove commented-out code 2014-05-27 02:52:21 +00:00
Ray Speth
14ea7e64c6 [Thermo] make compositonMap a const argument 2014-04-08 16:26:20 +00:00
Ray Speth
95eb7ab3ba Remove newline after '::' in member function definitions
This inconsistency makes it hard to directly search the code for a specific
member function definition.
2014-03-24 04:03:09 +00:00
Ray Speth
6f8da1a27e Fix 'unused variable' warnings 2014-02-21 19:08:33 +00:00
Ray Speth
f63f8ae57e Remove deprecated HTML logging functionality 2013-12-09 01:36:11 +00:00
Ray Speth
d1e438d8dd Cleaned up Doxygen docs for class MultiPhase and related functions 2013-04-18 22:07:37 +00:00
Ray Speth
6d6e237f07 Removed unnecessary checks surrounding delete operations 2013-02-14 01:03:32 +00:00
Ray Speth
7da738d238 Re-applied consistent formatting to trunk
Applied using: astyle -n --style=kr --add-brackets --indent=spaces=4
--indent-col1-comments --unpad-paren --pad-header --align-pointer=type
--lineend=linux
2013-02-07 23:40:59 +00:00
Ray Speth
31f90fe32d Removed unnecessary typedef for 'index_t' 2013-01-11 22:56:44 +00:00
Harry Moffat
ea25de7fe7 Continuing transfering LiquidTransport changes, doing bugfixes, and
qualifying against our testsuite.
2012-12-15 00:49:14 +00:00
Ray Speth
1d19803885 Pass "const std::string&" instead of "std::string" when possible 2012-10-24 15:42:51 +00:00
Ray Speth
49dbb605ab Changed parseCompString to simplify its typical usage pattern 2012-08-17 16:44:34 +00:00
Ray Speth
b5b536ff83 Removed some deprecated code 2012-07-16 22:19:10 +00:00
Ray Speth
ca4212cc57 Removed a number of unused / redundant typedefs 2012-03-15 19:51:57 +00:00
Ray Speth
d8edde0264 Expanded array bounds checking in C interface functions 2012-03-15 19:51:37 +00:00
Ray Speth
3bff32dd55 Fixed problems that generated warnings with the Intel compiler 2012-03-07 00:51:13 +00:00
Ray Speth
54efbaa320 Rewrote exception handling to be more general and more explicit
CanteraError inerits from std:exception, so now it has a what() method
that is used to print a message describing the exception. Adding an
exception to the Cantera error stack now requires explicitly calling
the .save() method.
2012-03-05 20:45:56 +00:00
Ray Speth
e487d95054 Fixed a few "unused variable" warnings 2012-02-28 19:01:43 +00:00
Ray Speth
3648bfef39 Use of deprecated functions generates compiler warnings 2012-02-27 18:11:39 +00:00
Ray Speth
9bc4a261c7 Fixed a bunch of GCC warnings 2012-02-15 20:28:08 +00:00
Ray Speth
a310345b9e Updated #includes to reflect new header file locations 2012-02-12 02:44:14 +00:00
Ray Speth
2528df0f75 Reorganized source tree structure
These changes make it unnecessary to copy header files around during
the build process, which tends to confuse IDEs and debuggers. The
headers which comprise Cantera's external C++ interface are now in
the 'include' directory.

All of the samples and demos are now in the 'samples' subdirectory.
2012-02-12 02:27:14 +00:00
Renamed from Cantera/src/equil/MultiPhase.cpp (Browse further)