Added Pitzer Object
This commit is contained in:
parent
4ca64eaccf
commit
6aa9287438
7 changed files with 7898 additions and 8 deletions
5265
Cantera/src/thermo/HMWSoln.cpp
Normal file
5265
Cantera/src/thermo/HMWSoln.cpp
Normal file
File diff suppressed because it is too large
Load diff
1492
Cantera/src/thermo/HMWSoln.h
Normal file
1492
Cantera/src/thermo/HMWSoln.h
Normal file
File diff suppressed because it is too large
Load diff
1130
Cantera/src/thermo/HMWSoln_input.cpp
Normal file
1130
Cantera/src/thermo/HMWSoln_input.cpp
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -779,7 +779,7 @@ namespace Cantera {
|
|||
*/
|
||||
|
||||
/**
|
||||
* Initialization routine for an IdealMolalSoln phase:
|
||||
* Initialization routine for an IdealMolalSoln phase.
|
||||
*
|
||||
* This is a virtual routine. This routine will call initThermo()
|
||||
* for the parent class as well.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,11 @@
|
|||
* solution assumes that all molality-based activity
|
||||
* coefficients are equal to one.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copywrite (2006) Sandia Corporation. Under the terms of
|
||||
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
|
||||
* U.S. Government retains certain rights in this software.
|
||||
*/
|
||||
/*
|
||||
* $Author$
|
||||
* $Date$
|
||||
|
|
|
|||
|
|
@ -26,13 +26,14 @@ ELECTRO_OBJ = SingleSpeciesTP.o StoichSubstanceSSTP.o \
|
|||
MolalityVPSSTP.o VPStandardStateTP.o \
|
||||
IdealSolidSolnPhase.o IdealMolalSoln.o \
|
||||
WaterPropsIAPWSphi.o WaterPropsIAPWS.o WaterProps.o \
|
||||
PDSS.o WaterPDSS.o WaterTP.o
|
||||
PDSS.o WaterPDSS.o WaterTP.o \
|
||||
HMWSoln.o HMWSoln_input.o
|
||||
|
||||
ELECTRO_H = SingleSpeciesTP.h StoichSubstanceSSTP.h \
|
||||
MolalityVPSSTP.h VPStandardStateTP.h \
|
||||
IdealSolidSolnPhase.h IdealMolalSoln.h \
|
||||
WaterPropsIAPWSphi.h WaterPropsIAPWS.h WaterProps.h \
|
||||
PDSS.h WaterPDSS.h WaterTP.h
|
||||
PDSS.h WaterPDSS.h WaterTP.h HMWSoln.h electrolytes.h
|
||||
endif
|
||||
ifeq ($(do_issp),1)
|
||||
ISSP_OBJ = IdealSolidSolnPhase.o
|
||||
|
|
|
|||
|
|
@ -8,14 +8,12 @@
|
|||
* calculating liquid electrolyte thermodynamics.
|
||||
*/
|
||||
/*
|
||||
* Copywrite (2005) Sandia Corporation. Under the terms of
|
||||
* Copywrite (2006) Sandia Corporation. Under the terms of
|
||||
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
|
||||
* U.S. Government retains certain rights in this software.
|
||||
*/
|
||||
/*
|
||||
* $Author$
|
||||
* $Date$
|
||||
* $Revision$
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CT_MOLALITYVPSSTP_H
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue