Mercurial > hg > cfcfd3
changeset 2578:4b054874569c
app/pitot: added 20%He/80%Ne (by volume) as standard test gas
for Daisy
| author | Chris James (c.james4@uq.edu.au) |
|---|---|
| date | Sat, 12 Jan 2019 16:18:56 +1000 |
| parents | 4ee2a3a3105d |
| children | e962723600a6 |
| files | app/pitot/pitot.py app/pitot/pitot_input_utils.py |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/app/pitot/pitot.py Fri Jan 11 06:50:49 2019 +1000 +++ b/app/pitot/pitot.py Sat Jan 12 16:18:56 2019 +1000 @@ -288,6 +288,7 @@ of slightly non-ideal driver compression 08-Mar-2017: A couple of small changes to where outputs are made to help me with the updates to the test_pitot.py program that I have been doing. + 12-Jan-2019: Added 80%Ne test gas to default test gases for Daisy... """ #--------------------- intro stuff -------------------------------------- @@ -314,7 +315,7 @@ from pitot_output_utils import * from pitot_area_ratio_check import * -VERSION_STRING = "15-Aug-2018" +VERSION_STRING = "12-Jan-2019" DEBUG_PITOT = False
--- a/app/pitot/pitot_input_utils.py Fri Jan 11 06:50:49 2019 +1000 +++ b/app/pitot/pitot_input_utils.py Sat Jan 12 16:18:56 2019 +1000 @@ -108,6 +108,10 @@ elif gasName.lower() == 'gasgiant_h240ne' or gasName.lower() == 'gasgiant_h2_40ne': return Gas(reactants={'H2':0.6, 'Ne':0.4}, inputUnits='moles', with_ions=True, outputUnits=outputUnits),{'gam':1.5,'R':1443.2} + elif gasName.lower() == 'gasgiant_h280ne' or gasName.lower() == 'gasgiant_h2_80ne': + #composition used by Charlotte Higgins + return Gas(reactants={'H2':0.2, 'Ne':0.80}, inputUnits='moles', with_ions=True, + outputUnits=outputUnits),{'gam':1.5,'R':547.8} elif gasName.lower() == 'gasgiant_h285ne' or gasName.lower() == 'gasgiant_h2_85ne': #composition used by Charlotte Higgins return Gas(reactants={'H2':0.15, 'Ne':0.85}, inputUnits='moles', with_ions=True,