Mercurial > hg > cfcfd3

changeset 2586:627134cf3c2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
app/pitot: added x3r 560 kg piston driver condition to PITOT
author Chris James (c.james4@uq.edu.au)
date Tue, 11 Jun 2019 17:22:38 +1000
parents 37e069be9b79
children 1a0cb8716c66
files app/pitot/pitot.py app/pitot/pitot_input_utils.py
diffstat 2 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/app/pitot/pitot.py	Fri Jun 07 18:48:32 2019 +1000
+++ b/app/pitot/pitot.py	Tue Jun 11 17:22:38 2019 +1000
@@ -315,7 +315,7 @@
 from pitot_output_utils import *
 from pitot_area_ratio_check import *
 
-VERSION_STRING = "07-Jun-2019"
+VERSION_STRING = "11-Jun-2019"
 
 DEBUG_PITOT = False
 
--- a/app/pitot/pitot_input_utils.py	Fri Jun 07 18:48:32 2019 +1000
+++ b/app/pitot/pitot_input_utils.py	Tue Jun 11 17:22:38 2019 +1000
@@ -1294,6 +1294,20 @@
             if cfg['driver_gas'] == 'He:0.70,Ar:0.30':
                 M['s3s'] = 2.035
                 cfg['M_throat'] = M['s3s']
+
+        elif cfg['piston'] == '560kg-piston-3mm-x3r-full-pressure':
+            # this is just isentropic for now...
+            driver_p = 300.0e3  # driver fill pressure, Pa
+            driver_T = 298.15  # driver temperature, K
+            states['s4i'] = primary_driver_x3[cfg['driver_gas']][0].clone()
+            states['s4i'].set_pT(driver_p, driver_T)
+            cfg['p4'] = 9.0e6  # primary diaphragm nominal rupture pressure, Pa
+            cfg['T4'] = states['s4i'].T * \
+                        (cfg['p4'] / states['s4i'].p) ** (1.0 - (1.0 / states['s4i'].gam))  # K
+            states['s4'] = states['s4i'].clone()
+            if cfg['driver_gas'] == 'He:0.70,Ar:0.30':
+                M['s3s'] = 2.035
+                cfg['M_throat'] = M['s3s']
            
         states['s4'].set_pT(cfg['p4'],cfg['T4'])
         V['s4']=0.0