Commit graph

1771 commits

Author SHA1 Message Date
Harry Moffat
53d21aaf7e Moved WaterPropsIAPWS inside the Cantera namespace. I can't remember why it wasn't in the first place.
Added a WaterProps object to PDSS_Water. This object will be worked into all of the other objects , and also used within the transport directory.
2009-09-15 17:32:20 +00:00
Harry Moffat
276602af3a Moved the water viscosity calculation to WaterProps.cpp.
Changed calcDensity to be a virtual function started at VPStandardStateTP().
   It's a protected function as well.
   At the VPStandardStateTP level, calcDensity() produces an error when called, because the EOS isn't specified. Derived classes must define this function, supplying the EOS.

WaterPropsIAPW: I added documentation to this routine, defining what functions changes the state of the object.

IdealMolalSoln: I had forgotten to update this object to employ the newer setState_TP() strategy that I had used in VPStandardStateTP().
2009-09-15 15:01:39 +00:00
Harry Moffat
584ec18c6d Started working in Water transport properties. 2009-09-11 23:37:20 +00:00
Harry Moffat
4c0407870f Fixed an error pointed out by Greg Jackson, concerning
ints vs doubles
2009-09-11 23:36:47 +00:00
Harry Moffat
7e6f2a1775 Latest version of the IonsFromNeutral object. Hopefully, this
clears up the linking errors that VC9 was experiencing.
2009-09-10 22:51:40 +00:00
Harry Moffat
8b728ad95c Specified the standard concentration for this
system so that I can do kinetics with the ThermoPhase object.
For molten salts, we're going with a standard concentration
of 1.0, until there is an argument otherwise. This means
that the kinetics objects, homogeneous and heterogeneous,
 will treat the molten salts as unitless.
2009-09-02 22:45:21 +00:00
Harry Moffat
bf97d0f90a Added the concept of a reference mole fraction vector.
This is a vector that is a baseline "safe" mole fraction
vector that can be applied anywhere. I was running into problems
with specifying this for molten salts, because just setting
the first component to a mole fraction of 1 causes
charge imbalance.

M    thermo/ThermoPhase.h
M    thermo/ThermoPhase.cpp
2009-09-02 22:03:46 +00:00
Harry Moffat
f7e48f0068 Updates for thermoFactory.
IonsFromNeutralMolecule needs special handling.
2009-09-02 19:20:22 +00:00
Harry Moffat
95b94a7a57 Added IonsFromNeutraVPSSTP to the ThermoFactory. 2009-09-02 19:03:26 +00:00
Harry Moffat
06276fba6d Added a new thermo object in.
IonsFromNeutralVPSSTP : This is initially used for molten salts.
        Molten salt thermo is treated via the neutral molecule
        molten salt expressions. However, ions migrate by themselves.
        therefore, you must treat ions within the transport equations.
        This thermophase object treats the ions as species, and is
        made to be consistent with the neutral molecules thermophase
        object that is used to express the non-ideal thermodynamics
        of the molten salt solution. Currently, MargulesVPSSTP
        is used for this as the LiKCl system is parameterized using
        this excess Gibbs free energy formulation.

    MargulesVPSSTP
        Various upgrades and fillers. It now reads and is initiated
        from the input file.

    setState_TP(), setTemperature(), and setPressure() within 
    VPStandardStateTP() formulations
        There was some circular logic, previously. Now setTemperature() and setPressure()
        are subserviant to setState_TP(). Basically, it doesn't make
        sense to calculate the standard state without first getting
        both the temperature and pressure (not just one and then the other)
        before you calculate the standard state for VPStandardStateTP derivatives.
        Think about the water EOS, which is a real fluid. You don't want
        to be trying to calculate the standard state within the enveloppe where
        neither gas nor liquid is stable.

     PseudoBinaryVPSSTP
        Deprecated.
2009-09-02 17:17:52 +00:00
Harry Moffat
6d13695c54 Changed the default CANTERA_BIN value 2009-08-22 23:08:36 +00:00
Harry Moffat
f5bd34e5bf Added an input file to the install 2009-08-22 22:58:47 +00:00
Harry Moffat
438bf6f787 Made sure some executables had $(CANTERA_BIN) as the path name to find the executables. 2009-08-22 22:54:38 +00:00
Harry Moffat
b93bd3bb2f Fixed an error in Cantera.mak that appears just for macs.
added a couple more files to the install procedure that were missing.
2009-08-22 22:47:38 +00:00
Harry Moffat
9d742a14c4 Changed the ordering within the Makefile. This was causing make install
to fail on the mac.
2009-08-22 19:50:17 +00:00
Harry Moffat
6d903bd549 Changed the interface to use an enum quantity. Our namespace is getting
full, and using enums will help us not step on ourselves.
2009-08-19 14:34:22 +00:00
Harry Moffat
ba5852f786 Moved some data to protected status 2009-08-19 14:33:06 +00:00
Harry Moffat
4340e7089e Changed some defines into const variables and put them
within the Cantera namespace. This is needed to 
avoid namespace issues. For example the define BAND interfered
with an mpi variable of the same name.
2009-08-17 01:39:19 +00:00
Harry Moffat
d27a1bc9c5 Added a file that was left out. 2009-08-17 01:35:43 +00:00
Harry Moffat
0c624e5286 Made the data protected in this file.
This is a fairly obvious change to help with modularity.
2009-08-15 17:18:59 +00:00
Harry Moffat
0445c5ec59 Added ifdef's around DATA_PTR. 2009-08-11 20:13:50 +00:00
Harry Moffat
38c73aa215 Added guards against predefinitions of AssertThrows 2009-08-11 18:38:48 +00:00
Harry Moffat
84c3f38e55 Fixed several serious errors in the top makefile, that
caused a make on a clean system to fail.
2009-08-06 23:10:24 +00:00
Harry Moffat
2ea3b45195 Updated the blesssed state. 2009-08-02 15:34:10 +00:00
Harry Moffat
755318323d Took out a warning message on vc++ 2009-08-01 01:34:07 +00:00
Harry Moffat
138c818431 added an ignore pragma 2009-08-01 01:33:27 +00:00
Harry Moffat
36f5c99d3a Took out a few warnings. 2009-08-01 01:32:46 +00:00
Harry Moffat
bcd2e0a4df Took out unneeded redirect 2009-08-01 01:13:06 +00:00
Harry Moffat
2f3245caff Put the flamespeed test in last place, since it takes so long. 2009-08-01 01:11:36 +00:00
Harry Moffat
a5228797bf Changes for VC++ compatibility 2009-08-01 01:06:22 +00:00
Harry Moffat
e88adcab71 Changes to get it to pass on VC++ 2009-08-01 01:01:11 +00:00
Harry Moffat
0f419a7a7a Fixed an error that showed up in the flamespeed demo.
The error was in the file Sim1D:setFixedTemperature().
The error involved an array overwrite.
2009-07-31 23:53:34 +00:00
Harry Moffat
3e268b5d93 ignore list maintenance. 2009-07-29 15:20:54 +00:00
Harry Moffat
e1690cfb9c ignore list maintenance. 2009-07-29 15:03:30 +00:00
Harry Moffat
3ad74e7d04 Maintaining ignore information 2009-07-29 15:00:29 +00:00
Harry Moffat
d28b2badcc Maintaining ignore information. 2009-07-29 14:58:15 +00:00
Harry Moffat
65612bd4ad More ignore work. 2009-07-29 14:53:51 +00:00
Harry Moffat
3b8093388b Working on the ignore stuff 2009-07-29 14:47:05 +00:00
Harry Moffat
86ea2414d9 Took out .cvsignore file 2009-07-28 16:26:53 +00:00
Harry Moffat
a6a8f6e45b Delete .cvsignore 2009-07-27 23:46:16 +00:00
Harry Moffat
70647c85ed Initial Import 2009-07-27 23:17:19 +00:00
Harry Moffat
8f2f058358 putting problematic test at the back 2009-07-24 02:07:38 +00:00
Harry Moffat
a5490bdf98 A fiew extra reblessings. 2009-07-24 02:06:14 +00:00
Harry Moffat
5262bc22a4 Added LCXX_END_LIBS to calc 2009-07-24 01:59:22 +00:00
Harry Moffat
a826141bd8 Reblessed solution 2009-07-24 01:52:02 +00:00
Harry Moffat
b0ef079eda Rebaselined the test suite to the new standard config 2009-07-24 01:47:44 +00:00
Harry Moffat
4656d79f66 Rebaselined results 2009-07-24 01:33:23 +00:00
Harry Moffat
6a84be7a2d Reblessed file 2009-07-24 01:12:49 +00:00
Harry Moffat
f614fcbc8b reblesse file 2009-07-24 01:11:22 +00:00
Harry Moffat
d6ebf7b799 Added a compiler option that gets utilized for solaris 2009-07-23 23:24:22 +00:00