Mercurial > hg > cfcfd3

changeset 2588:23f78eeddb57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
app/pitot: changed name of X3 driver, added unit_Re to condition builder changed the name of Andreas' driver so that it no longer mentions the diaphragm thickness, good idea from him and added unit_Re to the default condition builder output after I added it to PITOT the other week
author Chris James (c.james4@uq.edu.au)
date Sat, 29 Jun 2019 15:40:09 +1000
parents 1a0cb8716c66
children c478daf16dcb
files app/pitot/pitot.py app/pitot/pitot_condition_builder.py app/pitot/pitot_input_utils.py
diffstat 3 files changed, 23 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/app/pitot/pitot.py	Tue Jun 11 19:28:59 2019 +1000
+++ b/app/pitot/pitot.py	Sat Jun 29 15:40:09 2019 +1000
@@ -315,7 +315,7 @@
 from pitot_output_utils import *
 from pitot_area_ratio_check import *
 
-VERSION_STRING = "11-Jun-2019"
+VERSION_STRING = "29-Jun-2019"
 
 DEBUG_PITOT = False
 
--- a/app/pitot/pitot_condition_builder.py	Tue Jun 11 19:28:59 2019 +1000
+++ b/app/pitot/pitot_condition_builder.py	Sat Jun 29 15:40:09 2019 +1000
@@ -280,12 +280,18 @@
         full_list += store_electron_concentration_list
         
     if cfg['calculate_scaling_information']:
-        calculate_scaling_information_freestream_list = ['freestream_mu', 'freestream_rhoL', 'freestream_pL', 'freestream_Re', 'freestream_Kn']
+        calculate_scaling_information_freestream_list = ['freestream_mu', 'freestream_rhoL', 'freestream_pL','freestream_unit_Re', 'freestream_Re', 'freestream_Kn']
         full_list += calculate_scaling_information_freestream_list
         
         if cfg['shock_over_model']:
-            calculate_scaling_information_normal_shock_list = ['s10e_mu', 's10e_rhoL', 's10e_pL', 's10e_Re', 's10e_Kn']
-            full_list += calculate_scaling_information_normal_shock_list    
+            calculate_scaling_information_normal_shock_list = ['s10e_mu', 's10e_rhoL', 's10e_pL', 's10e_unit_Re', 's10e_Re', 's10e_Kn']
+            full_list += calculate_scaling_information_normal_shock_list
+    else:
+        # just do unit Reynolds numbers instead, which PITOT outputs now...
+        full_list += ['freestream_unit_Re']
+
+        if cfg['shock_over_model']:
+            full_list += ['s10e_unit_Re']
             
     if cfg['store_mole_fractions']:
         
@@ -1097,17 +1103,25 @@
     if cfg['calculate_scaling_information']:
         results['freestream_mu'].append(states[cfg['test_section_state']].mu)        
         results['freestream_rhoL'].append(cfg['rho_l_product_freestream'])
-        results['freestream_pL'].append(cfg['pressure_l_product_freestream'])  
+        results['freestream_pL'].append(cfg['pressure_l_product_freestream'])
+        results['freestream_unit_Re'].append(cfg['unit_reynolds_number_freestream'])
         results['freestream_Re'].append(cfg['reynolds_number_freestream']) 
         results['freestream_Kn'].append(cfg['knudsen_number_freestream'])          
         
         if cfg['shock_over_model']:
             results['s10e_mu'].append(states['s10e'].mu) 
             results['s10e_rhoL'].append(cfg['rho_l_product_state10e'])
-            results['s10e_pL'].append(cfg['pressure_l_product_state10e'])  
+            results['s10e_pL'].append(cfg['pressure_l_product_state10e'])
+            results['s10e_unit_Re'].append(cfg['unit_reynolds_number_state10e'])
             results['s10e_Re'].append(cfg['reynolds_number_state10e']) 
-            results['s10e_Kn'].append(cfg['knudsen_number_state10e']) 
-            
+            results['s10e_Kn'].append(cfg['knudsen_number_state10e'])
+    else:
+        results['freestream_unit_Re'].append(cfg['unit_reynolds_number_freestream'])
+
+        if cfg['shock_over_model']:
+            results['s10e_unit_Re'].append(cfg['unit_reynolds_number_state10e'])
+
+
     if cfg['store_mole_fractions']:
         # we have to add more columns here based on the test gas...
         if cfg['test_gas'] in ['n2_o2', 'N2_O2', 'N2-O2', 'n2-o2', 'air-cfd-with-ions', 'air-N2-O2', 'air_N2_O2', 'air_n2_o2', 'air-n2-o2']:
--- a/app/pitot/pitot_input_utils.py	Tue Jun 11 19:28:59 2019 +1000
+++ b/app/pitot/pitot_input_utils.py	Sat Jun 29 15:40:09 2019 +1000
@@ -1266,7 +1266,7 @@
                 M['s3s'] = 3.08
                 cfg['M_throat'] = M['s3s']
 
-        elif cfg['piston'] == 'lwp-3mm-andreas':
+        elif cfg['piston'] == 'lwp-28-MPa-pure-helium-isentropic':
             # this is just isentropic for now...
             driver_p = 46.0e3 #driver fill pressure, Pa
             driver_T = 298.15 #driver temperature, K