Commit graph

2666 commits

Author SHA1 Message Date
Harry Moffat
35e4c9ea45 Turned on Keyword substition in all files. 2009-11-09 23:36:49 +00:00
Harry Moffat
0d6d5642b1 Added keywords property 2009-11-09 22:55:34 +00:00
John Hewson
33cf246c25 LiquidTransportParams.h TransportFactory.cpp
Filled out TransportFactory::getLiquidInteractionsTransportData to
parse interaction parameters.  About 220 lines of XML node extraction
added. 

LiquidTransport.h  LiquidTransport.cpp

Near the end of LiquidTransport::initLiquid, added the copying of
interaction parameters from the LiquidTransportParams object to
members:
+    m_visc_Eij = tr.visc_Eij;
+    m_visc_Sij = tr.visc_Sij;
+    m_lambda_Aij = tr.thermalCond_Aij;
+    m_diff_Dij = tr.diff_Dij;
+    m_radius_Aij = tr.radius_Aij;
Note that the last member was added to allow for hydrodynamic radius
mixing rules.
2009-10-28 04:02:28 +00:00
John Hewson
a4b9fd56c4 Added following members in LiquidTransport.cpp and LiquidTransport.h
associated with transport coefficient mixing properties: 
+    LiquidTranMixingModel m_viscMixModel;
+    LiquidTranMixingModel m_lambdaMixModel;
+    DenseMatrix m_lambda_Aij;
+    LiquidTranMixingModel m_diffMixModel;
+    DenseMatrix m_diff_Dij;
+    LiquidTranMixingModel m_radiusMixModel;

Removed 
-    int m_compositionDepType;
since it is replaced by the above property-dependent model
specifications.


Similarly in LiquidTransportParams.h added following 
+       LiquidTranMixingModel model_viscosity;
+       LiquidTranMixingModel model_thermalCond;
+       DenseMatrix  thermalCond_Aij;
+       LiquidTranMixingModel model_speciesDiffusivity;
+       DenseMatrix  diff_Dij;
+       LiquidTranMixingModel model_hydroradius;

Added some processing of the above variables from the XML file in
LiquidTransport::getLiquidInteractionsTransportData.
2009-10-28 02:30:59 +00:00
John Hewson
cc07e10207 LiquidTransport.cpp
Removed XML node processing of transport model (species interaction part) from
initLiquid().

m_molefracs_tran and m_concentrations are now properly dimensioned and copied.

TransportFactory.cpp

Corrections to XML node processing in getLiquidSpeciesTransportData
and getLiquidSpeciesInteractionData
2009-10-28 01:05:45 +00:00
John Hewson
217a0b4982 Slowly adding species-species transport interactions. 2009-10-24 02:04:06 +00:00
John Hewson
d06773652b Minor changes:
Added examples for transport mixing model XML
Changed "arrhenius" to "Arrhenius" is XML.
2009-10-24 00:57:49 +00:00
John Hewson
9c98965225 Added PDSS_SSVol.cpp to Makefile.in 2009-10-23 22:52:26 +00:00
John Hewson
45c2e077d1 LiquidTransport.h LiquidTransport.cpp
Added methods 
 void getSpeciesHydrodynamicRadius() -- similar to getSpeciesViscosities()
 void updateHydrodynamicRadius_T() -- similar to updateViscosities_T()
 void updateHydrodynamicRadius_C()
Added private members
 bool m_radi_temp_ok;
 bool m_radi_conc_ok;
2009-10-23 22:34:08 +00:00
Harry Moffat
60c9446340 Added corrected doxygen information. 2009-10-23 19:12:45 +00:00
Harry Moffat
c5b90826cb Added a missing function as a shell. 2009-10-23 19:11:14 +00:00
John Hewson
e52797d335 Minor changes to reflect changes in LiquidTransportParams,
LiquidTransportData and TransportParams.  However, the last set of
changes broke AqueosTransport because it uses the same property
coefficient vectors as those now moved to GasTransportParams.
2009-10-23 19:03:02 +00:00
John Hewson
dbef25a481 LiquidTransport.h LiquidTransport.cpp
Changed order of some prototypes in LiquidTransport.h to group public,
protected and private members better.

Renamed methods (consistency with other transport models) like 
virtual void update_temp() 
to
virtual bool update_T()  //note boolean return value

Added method getSpeciesHydrodynamicRadius(doublereal* const radius);
to fill the hydrodynamic radius array.

Added protected member vectors to hold information on
temperature-dependent species transport properties:
(1) model enumeration like  
vector<LiquidTR_Model> m_viscTempDepType_Ns;
(2) coefficients of temperature-dependent properties like
vector<Coeff_T_>  m_coeffVisc_Ns;  
These replace sets of variables like m_visc_A, m_visc_n, m_visc_Tact.
These are filled in LiquidTransport::initLiquid using
LiquidTransportData vector held within LiquidTransportParams

Species thermal conductivity variables now use "lambda" instead of
"cond" for simplicity.

Still need to work on species-species interactions.  Variables like
int m_compositionDepType will need to be replaced by property-specific
(i.e. viscosity, thermal conductivity) variables.  

Major changes to LiquidTransport::initLiquid(LiquidTransportParams&
tr)
- starting to bring in species-species interactions, but not there
yet.  
- complete rewrite of filling temperture-dependent property variables.
- added hydrodynamic radius and species diffusivity property parsing.
- 

LiquidTransport::thermalConductivity() now uses mass-fraction weighted
mixing rule.  Generality will follow.

LiquidTransport::updateViscosity
LiquidTransport::updateCond_T() hava been updated to use new
temperture-dependent property coefficients (m_lambdaTempDepType_Ns and
m_coeffLambda_Ns).

LiquidTransport::updateDiff() now computes Stefan-Maxwell interaction
parameters (D_ij) using Stokes-Einstein reltion.
2009-10-23 18:59:18 +00:00
John Hewson
2492db9750 TransportParams.h, LiquidTransportParams.h, LiquidTransportData.h
Moved temperature fits polynomials for viscosity, conductivity,
diffusivity from TransportParams to GasTransportParams.

Defined mixing model enumeration for liquid species-species
interactions in LiquidTransportParams
  enum LiquidTranMixingModel {
    LTR_MIXMODEL_NOTSET=-1,
    LTR_MIXMODEL_SOLVENT, 
    LTR_MIXMODEL_MOLEFRACS,
    LTR_MIXMODEL_MASSFRACS,
    LTR_MIXMODEL_LOG_MOLEFRACS,
    LTR_PAIRWISE_INTERACTIONS
  };

Removed species Arrhenius parameters from LiquidTransportParams.
These are now held in LiquidTransportData obejcts which are stored as
a vector in LiquidTransportParams

In LiquidTransportData, the hydrodynamic radius now holds coefficients
for temperature dependent models instead of just a constant value.
Also changed enumeration for polynomial from LTR_MODEL_COEFF to
LTR_MODEL_POLY.
2009-10-23 18:30:21 +00:00
John Hewson
d641b8f492 TransportFactory.h, TransportFactory.cpp
TransportFactory::setupLiquidTransport:

Removed "transport_database" argument since this can equally well be
pulled from thermo object also passed.  The "transport_databse" is now
called species_database (since it holds the vector of species nodes.  

The method getLiquidTransportData is renamed to
getLiquidSpeciesTransportData to reflect the fact that it just parses
the species node parts of the transport data.  

A new XML_Node, called phase_database and corresponding to the phase,
is defined.  If this has a child "transport" node, this node is passed
to the new method. 
    void TransportFactory::getLiquidInteractionsTransportData(
	const XML_Node &transportNode,  
	XML_Node& log, 
	const std::vector<std::string>& names, 
	LiquidTransportParams& tr);
This method, largely unfilled, will parse models for species-species
interactions in the liquid phase.  

TransportFactory::getLiquidSpeciesTransportData

Largely minor changes to the parsing of the species transport
properties, but allow all temperature dependence models for
hydrodynamic radius just for generality.  

LiquidTransportData objects are now pushed directly onto
LiquidTransportParams instead of filling members of
LiquidTransportParams. Removed most of the unit conversion and will
rely largely on the parser unit conversions.  Need to be careful
here, especially with the hydrodynamic radius which will likely be
given in Angstroms and not meters.
2009-10-23 18:23:15 +00:00
Harry Moffat
4776ef8f8d Added all of the files in the transport directory. 2009-10-21 15:10:27 +00:00
Harry Moffat
6de5cb2e99 Doxygen update - Still lots to do here. 2009-10-21 15:09:55 +00:00
Harry Moffat
23732968c6 doxygen warning messages removed. 2009-10-21 14:26:07 +00:00
Harry Moffat
d5b74320ac Doxygen updates
Started to document new PDSS formulations
2009-10-21 01:02:44 +00:00
Harry Moffat
70ea5d84d2 Added files in ther thermo directory 2009-10-21 01:02:02 +00:00
Harry Moffat
ea7f850830 Adding in more files. 2009-10-21 00:53:56 +00:00
Harry Moffat
f38d72ddf9 Added new files. 2009-10-21 00:11:16 +00:00
Harry Moffat
e64a381754 Doxygen update. 2009-10-21 00:10:48 +00:00
Harry Moffat
60c4b40d32 Bug fixes to the PDSS_SSVol object. 2009-10-20 23:46:29 +00:00
Harry Moffat
48261703d4 Added the object PDSS_SSVol. This has more functionality than PDSS_ConstVol in that there are a range of models for fitting the standard state volume.
Removed executable flags.
 removed the function pdssType.
2009-10-20 22:26:24 +00:00
Harry Moffat
c9ff753168 Added documentation for the save() function for domains.
Made the save function for domains use a const solution vector.
2009-10-15 21:52:32 +00:00
Harry Moffat
686fb46591 Added back in a clear 2009-10-13 01:57:50 +00:00
Harry Moffat
0cafca6aaf First problem with SimpleTransport is done. Nominally, this object
is in working order.
2009-10-13 01:42:59 +00:00
Harry Moffat
9593d2996e Another update aimed at getting a SimpleTransport model up and running.
SimpleTransport now can read its XML file.
2009-10-13 00:27:48 +00:00
Harry Moffat
3b4401a77d Added into Transport Factory an option to read the phase XML file
and implement the transport manager listed there.
2009-10-12 14:13:10 +00:00
Harry Moffat
a258cdf083 Added an xml storage section to importPhase(). Note this represents a
long standing bug in some ThermoPhase implementations, where the
xml tree was not being storred for the phase node in some cases.
2009-10-11 21:38:42 +00:00
Harry Moffat
d503c55864 Added a clear() function to the xml object. This will wipe
out the current level and everything below it.
2009-10-11 21:34:06 +00:00
Harry Moffat
5fd13d3591 Took out default parameters for some of the transport initialization
routines. It makes no sense to call these things if you don't have
a ThermoPhase already created.
2009-10-11 20:46:57 +00:00
Harry Moffat
4ee4b4891f Added a missing function to AqueousTransport 2009-10-11 19:20:11 +00:00
Harry Moffat
787fd3778e More work on the SimpleTransport object. Nominally, the object is
finished. But, it needs testing.
2009-10-10 21:54:55 +00:00
Harry Moffat
c1d59a912b Got most of the way towards creating a new transport Object SimpleTransport
that obeys the simplest formulas possible.
2009-10-10 04:23:04 +00:00
Harry Moffat
636c63482b Took executable bits off 2009-10-02 21:10:26 +00:00
Harry Moffat
825d909875 Took executable bit off of the file. 2009-10-02 21:09:12 +00:00
Harry Moffat
ff82509600 Test commit with small functionality. 2009-10-02 21:08:16 +00:00
Harry Moffat
431f167c0f Changed the method model() to be a const function.
Moved Transport methods back into the file TransportBase.cpp
Defined err() functions for LiquidTransport object so that
the code will link again.
2009-09-28 16:09:58 +00:00
Harry Moffat
fd245bb194 Merging changes from the trunk into the change branch. 2009-09-26 01:55:27 +00:00
Harry Moffat
95c685dbe7 Merged changes from Revision_1.8 into the main trunk 2009-09-26 01:53:39 +00:00
Harry Moffat
c0e84560a1 Added ignore entries for doxygen stuff. 2009-09-26 01:22:22 +00:00
Harry Moffat
844b3cdce8 Doxygen update 2009-09-26 01:15:38 +00:00
Harry Moffat
f1d0698194 Doxygen updates - beating down the warnings. 2009-09-26 01:13:01 +00:00
Harry Moffat
f61308fe1d Doxygen changes -> beating down the warning messages 2009-09-25 23:23:05 +00:00
Harry Moffat
aa12b47ccc Doxygen updates -> filling in missing parameters. 2009-09-25 21:07:41 +00:00
Harry Moffat
e6e872b1e3 Doxygen update 2009-09-25 20:39:19 +00:00
Harry Moffat
5f7e88a634 Added missing doxygen documentation 2009-09-25 20:15:28 +00:00
Harry Moffat
26fb3aec3b Updating this directory 2009-09-25 18:41:20 +00:00