Commit graph

2600 commits

Author SHA1 Message Date
John Hewson
ecfc9a71f5 Changed MixTransport::init(TransportParams& tr) to
MixTransport::initGas( GasTransportParams& tr )
2009-09-19 00:26:33 +00:00
John Hewson
00c36ac250 Split the TransportParams class into three entities. The base class
of the same name holds core components including the thermo object,
XML nodes, species names and molecular weights.  

A derived class GasTransportParams holds
kinetic-theory-of-gases-related parameters.  

LiquidTransportParams in LiquidTransportParams.h now derives from
TransportParams class. Removed kinetic-theory-of-gases-related
parameters.
2009-09-19 00:25:57 +00:00
John Hewson
eaeefd4f47 Added forward declarations references to
class LiquidTransportParams;

Changed the init(TransportParams& tr) method to 
initLiquid( LiquidTransportParams& tr ) 

Removed a number of gas-related transport parameters from the
init/initLiquid() method including m_poly, m_diam, m_eps, m_alpha

In AqueousTransport.cpp there was a method to return a struct to a
GasTransportData.  This now returns LiquidTransportData struct, but is
not yet working.

In LiquidTransport.cpp removed all references to m_polytempvec, a
vector of 5 entries of the form
-    m_polytempvec[0] = 1.0;
-    m_polytempvec[1] = m_logt;
-    m_polytempvec[2] = m_logt*m_logt;
-    m_polytempvec[3] = m_logt*m_logt*m_logt;
-    m_polytempvec[4] = m_logt*m_logt*m_logt*m_logt;
We might want these back soon.  This allowed up to comment out the
code in the methods that evaluate the temperature dependence of the
viscosity, thermal conductivity and diffusivity using polynomials in
these variables.  --This line, and those below, will be ignored--

M    AqueousTransport.h
M    LiquidTransport.h
M    AqueousTransport.cpp
M    LiquidTransport.cpp
2009-09-19 00:24:47 +00:00
John Hewson
53e1c8fd78 Added method getSpeciesFluxesES(int ndim,
const doublereal* grad_T, 
				  int ldx, 
				  const doublereal* grad_X,
				  int ldf, 
				  const doublereal* grad_Phi,
				  doublereal* fluxes) 
after passing electrostatic potentialgradient as well as the rest of
the gradients.  

Added initGas( GasTransportParams& tr ) and 
initLiquid( LiquidTransportParams& tr ) because of the different
TranportParams subclasses.  There might be a better way to do this.
2009-09-19 00:21:46 +00:00
John Hewson
904dd218f1 Creating a change branch of Cantera for development of molten salt phase transport. 2009-09-18 23:02:59 +00:00
Harry Moffat
fc3c2630a3 Fleshing out liquid transport 2009-09-16 22:04:16 +00:00
Harry Moffat
ce79948739 Starting to rough in aqueous transport. 2009-09-16 19:57:45 +00:00
Harry Moffat
2bd7816b65 Added in a model for the thermal conductivity of pure water
at all T and P.
Added in a test for the new model.
2009-09-16 02:13:43 +00:00
Harry Moffat
5009a3817f Added a viscosity model into WaterTransport.cpp for pure water
Added a test problem for the viscosity model.
Updated WaterSSTP object to support the use of WaterTransport 
with the object.
2009-09-15 21:46:44 +00:00
Harry Moffat
5d50aeef0e Modified the test for the current development work. 2009-09-15 17:33:49 +00:00
Harry Moffat
b4ea13ebd6 Modified the test for the current developement work. 2009-09-15 17:33:13 +00:00
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
8b9bdcfdce Added ignore items 2009-09-15 14:53:24 +00:00
Harry Moffat
910f319223 Adding a single test 2009-09-11 23:42:03 +00:00
Harry Moffat
645658819a Added this directory 2009-09-11 23:41:24 +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
08cef98a9b Added ignore files. 2009-08-28 23:12:53 +00:00
Harry Moffat
3b7c9e2388 Added an example of cantera on a mac.
Python is enabled
   matlab is not enabled. -> don't have it.
2009-08-22 23:10:44 +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
060c73d5ad Fixed an error in the mac build. Mac was special cased out of compiling lapack and blas.
Took that out.

Added more ignore files.
2009-08-22 22:14:19 +00:00
Harry Moffat
56c6a578e5 Fixed an error from a previous commit. 2009-08-22 21:18:16 +00:00
Harry Moffat
a1be078db2 Took out setting the PYTHONPATH to null on one statement in finish-install.
This sometimes caused a bus error on the Mac.
I'm not sure that I've fixed or understood this error.
2009-08-22 21:16:26 +00:00
Harry Moffat
77afab8f54 Fixed an error in the Makefile on the mac 2009-08-22 20:36:25 +00:00
Harry Moffat
32086af0f3 Fixed an error in the makefile 2009-08-22 20:35:27 +00:00
Harry Moffat
9920095864 Fixed an error in the Makefile that occurs for macs 2009-08-22 20:15:29 +00:00
Harry Moffat
173e5dff9c Fixed an error that appeared in the Makefile on the mac 2009-08-22 20:12:25 +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
5136b40395 Replaced home directory with ${HOME} variable. 2009-08-07 01:10:11 +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
71976d7d0f Added Sandia to the copywrite statement.
More ignore file maintenance.
2009-08-01 02:45:30 +00:00
Harry Moffat
755318323d Took out a warning message on vc++ 2009-08-01 01:34:07 +00:00