Commit graph

750 commits

Author SHA1 Message Date
Ray Speth
a5d735f047 [Reactor] Disable verbose output by default, even in "debug mode" 2014-06-03 16:52:09 +00:00
Ray Speth
0e9ca0fc4b [Reactor] Eliminate tracking of Reservoirs by ReactorNet
Since Reservoirs don't have any equations to solve, there is no reason to add
them to a ReactorNet.
2014-06-03 16:52:00 +00:00
Ray Speth
2d1003271d [Reactor] Replace ReactorNet::m_size with m_start
A small simplification since the offset into the global solution vector is
usually what we're interested in.
2014-06-03 16:51:47 +00:00
Ray Speth
fb588d873b Remove deprecated / unfinished 'spectra' classes 2014-05-30 19:23:37 +00:00
Ray Speth
46a36c11cb Eliminate redundant VCS vector functions
These functions just duplicated features of the standard library.
2014-05-30 19:23:25 +00:00
Ray Speth
c6cefd6df8 Replace IntStarStar with Array2D 2014-05-30 19:23:16 +00:00
Ray Speth
b569b842d0 Replace DoubleStarStar with Array2D 2014-05-30 19:23:03 +00:00
Ray Speth
548b5ca468 Remove cti2ctml binary
Use of cti2ctml binary can be replaced with using ctml_writer.py script
directly.
2014-05-29 18:34:44 +00:00
Ray Speth
f80db6c08d Make function signatures independent of DEBUG_MODE 2014-05-27 02:54:34 +00:00
Ray Speth
ddfc7db080 Make helper functions for pieces of vcs_solve_TP main loop 2014-05-27 02:54:24 +00:00
Ray Speth
ad12f392ce Some cleanup of vcs_solve_TP
Use local variables where possible. Remove unreachable code.
Move repeated code out of if/else blocks. Flatten nested if statements.
2014-05-27 02:54:11 +00:00
Ray Speth
32276b1fda Refactor vcs_solve_TP to eliminate goto
This contains just the changes to the flow control to give the same
behavior as the original implementation. Additional refactoring
still to come.
2014-05-27 02:54:07 +00:00
Ray Speth
40e748a2d1 Set printLvl = loglevel for VCS solver since it doesn't use loglevel 2014-05-27 02:53:47 +00:00
Ray Speth
373e4ae565 Remove goto and manual memory management from MultiPhase::equilibrate 2014-05-27 02:53:42 +00:00
Ray Speth
4b9e4da822 Fix some compiler warnings 2014-05-27 02:53:35 +00:00
Ray Speth
712293e415 Change debug code to avoid ifdefs where possible
Use "if (DEBUG_MODE_ENABLED)" instead of "#ifdef DEBUG_MODE". This makes
it easier to see the flow control logic, and the compiler will optimize
out the always-false conditionals when DEBUG_MODE_ENABLED is 0, so there
isn't any speed penalty.
2014-05-27 02:53:22 +00:00
Ray Speth
7ec4531ae0 Removed debugging code that didn't actually do anything 2014-05-27 02:53:16 +00:00
Ray Speth
6c0cea5ee4 Standardize function used for writing a line of repeated characters 2014-05-27 02:53:06 +00:00
Ray Speth
789574ac80 Remove commented-out code 2014-05-27 02:52:21 +00:00
Ray Speth
4dcdc01fb8 [VCS] Use local variable declarations where possible 2014-05-23 22:47:03 +00:00
Ray Speth
87553767d5 Eliminate 'goto' from 'isDuplicateReaction' 2014-05-21 16:35:14 +00:00
Ray Speth
90a821caf6 Eliminate 'goto' from ChemEquil::estimateEP_Brinkley 2014-05-21 16:35:09 +00:00
Ray Speth
44e7dd91ad [Equil] Eliminate 'mlequ' and 'gaussj' in favor of using LAPACK 2014-05-21 16:35:02 +00:00
Ray Speth
ef781b44e6 Restructure ChemEquil::equilibrate to eliminate 'goto' statements 2014-05-21 16:34:57 +00:00
Ray Speth
08e9d94ad6 [Thermo] Remove unimplemented overrides of getParameters/setParameters 2014-05-21 16:34:39 +00:00
Harry Moffat
675df76b1c Fixed a long standing problem with the combination of storred XML files and duplicator functions.
Now the complete XML file is storred within the ThermPhase object starting with the root node.
This is needed for later processing of kinetics and transport mechanisms when the ThermoPhase
file is duplicated and the original file is deleted.

xml() is now a const function, and still returns the same pointer.
setXMLdata() is a new function will stores the xml data.
2014-05-20 19:02:20 +00:00
Ray Speth
f61747973c [Thermo] Extract common implementations out of PDSS descendants
The descendants either calculate molar properties from nondimensonal properties
or vice versa. Add two derived classes to PDSS to implement these behaviors, and
have the leaf classes derive from whichever one of these makes sense.
2014-05-08 23:01:59 +00:00
Ray Speth
0eeae5d9c0 [Thermo] Remove unnecessary manual memory management from PDSS_Water 2014-05-08 23:01:53 +00:00
Ray Speth
edaef6a0b7 [Thermo] Remove redundant methods of PDSS descendants
The removed methods repeated the implementation of the base class.
2014-05-08 23:01:43 +00:00
Ray Speth
7fff65cecd Remove previously-deprecated 'PrintCtrl' and 'LogPrintCtrl' classes. 2014-05-08 23:01:32 +00:00
Ray Speth
54ded64e4b Miscellaneous whitespace cleanup 2014-05-08 23:01:12 +00:00
Ray Speth
bc0346eae7 Avoid deadlocks in cti to ctml conversions on Windows 2014-05-06 14:39:48 +00:00
Ray Speth
2a9ab96609 Use NotImplementedError instead of 'err' member functions 2014-05-06 14:39:13 +00:00
Ray Speth
8cfac61a83 Use configuration checks to determine names for 'isnan' and 'finite' 2014-05-03 17:39:33 +00:00
John Hewson
b84f19c439 In InterfaceKinetics added some comments and clarified function names.
Formerly getExchangeCurrentQuantities() is now
updateExchangeCurrentQuantities().  This method updates things like
m_StandardConc for computing reaction rates.

Formerly applyExchangeCurrentDensityFormulation() is now
convertExchangeCurrentDensityFormulation().  This method converts
rate expressions from A/m2 to kmol/m2/s.
2014-04-22 22:25:59 +00:00
Harry Moffat
f1863b103a Some changes to make XML sections of liquid transport more orderly, uniform, and processed in
only one place.
2014-04-20 02:12:35 +00:00
Harry Moffat
3df834565b Added more error checking for ill-formed csv files 2014-04-20 01:59:46 +00:00
Harry Moffat
96b01a6c79 Added better error handling for the XML routine.
Added a couple of TODOs
2014-04-19 01:31:21 +00:00
Harry Moffat
c16227a919 Added error handling statement 2014-04-19 01:29:36 +00:00
Harry Moffat
e977eba704 Added initializations for quantities that showed up as UMR's in cantrilbat 2014-04-19 01:20:05 +00:00
Harry Moffat
6e40841d94 Added missing member functions for partial molar quantities 2014-04-18 23:53:38 +00:00
Harry Moffat
dfbeeb374e Added additional checks for badly formed csv files. 2014-04-18 23:43:47 +00:00
Harry Moffat
446b39c877 Fixed error for two line csv files 2014-04-18 16:44:44 +00:00
Ray Speth
b4b97e622a [Thermo] Remove manual memory management from ShomatePoly2 2014-04-14 18:37:36 +00:00
Ray Speth
1df2ed5611 Add a missing #include 2014-04-14 18:37:24 +00:00
Ray Speth
79bbdf3aff [Thermo] Make use of initializers in SpeciesThermoInterpType classes 2014-04-14 18:37:12 +00:00
Ray Speth
588728addc [Equil] Make vcs_MultiPhaseEquil::m_vprob a normal member variable 2014-04-14 18:37:06 +00:00
Ray Speth
818a22be05 [Equil] Make vcs_MultiPhaseEquil::m_vsolvePtr a normal member variable
There is no reason for this to be a pointer.
2014-04-14 18:36:58 +00:00
Ray Speth
fcf7edf694 Implement Sub::name and Sub::formula in the base class
Eliminates the need for redundant implementations in all the derived
classes. Also, make the return value a "const char*" to eliminate the dangerous
cast.
2014-04-14 18:36:32 +00:00
Ray Speth
c887c1b6fb Remove unnecessary calls to parseCompString 2014-04-08 19:39:06 +00:00