research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Thermo] Fix updating state of PDSS_IonsFromNeutral objects

Browse source 
Setting T and P now updates the state of the underlying "neutral
molecule phase".

Also removed the unimplemented setState_TR method.
This commit is contained in:
Ray Speth 2019-03-06 18:17:48 -05:00
parent bdc81684b1
commit d6d91f4d98
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/cantera/thermo/PDSS_IonsFromNeutral.h
View file

@ -80,7 +80,6 @@ public:
//! @{
virtual void setState_TP(doublereal temp, doublereal pres);
virtual void setState_TR(doublereal temp, doublereal rho);
//! @}
//! @name Initialization of the Object

5
src/thermo/PDSS_IonsFromNeutral.cpp
View file

@ -214,12 +214,9 @@ doublereal PDSS_IonsFromNeutral::molarVolume_ref() const
void PDSS_IonsFromNeutral::setState_TP(doublereal temp, doublereal pres)
{
neutralMoleculePhase_->setState_TP(temp, pres);
m_pres = pres;
m_temp = temp;
}
void PDSS_IonsFromNeutral::setState_TR(doublereal temp, doublereal rho)
{
}
}

4
test/thermo/phaseConstructors.cpp
View file

@ -111,7 +111,7 @@ TEST(IonsFromNeutralConstructor, fromXML)
// Values for regression testing only -- no reference values known for comparison
EXPECT_NEAR(p->density(), 1984.3225978174073, 1e-6);
EXPECT_NEAR(p->enthalpy_mass(), -8035317241137.971, 1e-1);
EXPECT_NEAR(p->enthalpy_mass(), -14737778.668383721, 1e-6);
EXPECT_NEAR(mu[0], -4.66404010e+08, 1e1);
EXPECT_NEAR(mu[1], -2.88157298e+06, 1e-1);
}
@ -150,7 +150,7 @@ TEST(IonsFromNeutralConstructor, fromScratch)
// Values for regression testing only -- same as XML test
EXPECT_NEAR(p.density(), 1984.3225978174073, 1e-6);
EXPECT_NEAR(p.enthalpy_mass(), -8035317241137.971, 1e-1);
EXPECT_NEAR(p.enthalpy_mass(), -14737778.668383721, 1e-6);
EXPECT_NEAR(mu[0], -4.66404010e+08, 1e1);
EXPECT_NEAR(mu[1], -2.88157298e+06, 1e-1);
}