Mercurial > hg > cfcfd3

changeset 2594:c7fdabc8c6ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
app/pitot: added stuff to get test time for X3
author Chris James (c.james4@uq.edu.au)
date Tue, 29 Oct 2019 11:32:33 +1000
parents 7c8b83c0fb26
children 52ad264b6c49
files app/pitot/pitot.py app/pitot/pitot_flow_functions.py
diffstat 2 files changed, 23 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/app/pitot/pitot.py	Thu Sep 12 23:50:02 2019 +1000
+++ b/app/pitot/pitot.py	Tue Oct 29 11:32:33 2019 +1000
@@ -315,7 +315,7 @@
 from pitot_output_utils import *
 from pitot_area_ratio_check import *
 
-VERSION_STRING = "12-Sep-2019"
+VERSION_STRING = "28-Oct-2019"
 
 DEBUG_PITOT = False
 
--- a/app/pitot/pitot_flow_functions.py	Thu Sep 12 23:50:02 2019 +1000
+++ b/app/pitot/pitot_flow_functions.py	Tue Oct 29 11:32:33 2019 +1000
@@ -2400,18 +2400,29 @@
     
     cfg['calculate_test_time'] = False #defaults to false unless we have enough info to calculate it
     
-    if cfg['facility'] == 'x2' and cfg['tunnel_mode'] == 'expansion-tube':
-        #a few different tunnel scenarios give different lengths
-        #all the distances are taken from my L1D run file, written by David Gildfind
-        #0m is the primary diaphragm burst location
+    if cfg['facility'] in ['x2','x3'] and cfg['tunnel_mode'] == 'expansion-tube':
+
         cfg['calculate_test_time'] = True
-        secondary_diaphragm_location = 3.418 #m
-        tertiary_diaphragm_location = 5.976 #m
-        
-        if cfg['nozzle']:
-            tube_exit = 8.585 #m (i.e. entrance to nozzle)
-        else:
-            tube_exit = 8.979 #m (i.e. entrance to test section)
+
+        if cfg['facility'] == 'x2':
+
+            # a few different tunnel scenarios give different lengths
+            # all the distances are taken from my L1D run file, written by David Gildfind
+            # 0m is the primary diaphragm burst location
+
+            secondary_diaphragm_location = 3.418 #m
+            tertiary_diaphragm_location = 5.976 #m
+
+            if cfg['nozzle']:
+                tube_exit = 8.585 #m (i.e. entrance to nozzle)
+            else:
+                tube_exit = 8.979 #m (i.e. entrance to test section)
+
+        elif cfg['facility'] == 'x3':
+            # let's assume long shock tube with new shortened values...
+
+            secondary_diaphragm_location = 22.0 #m
+            tube_exit = 35.0 #m
         
         t_start = 0.0 #time of primary diaphragm burst
     
@@ -2431,7 +2442,6 @@
             t_cs_st = t_inc_shock_sd + l_shock_tube/V['s3']
             t_cs_at = t_inc_shock_st + l_acc_tube/V['s7']
 
-        
         else: #so we're going straight from primary driver to shock tube now
             #calculate some lengths
             l_shock_tube = secondary_diaphragm_location