Mercurial > hg > cfcfd3
changeset 2569:821c44f2393e
app/pitot: added state 3 to condition builder output
like the title says. we had never wanted this before, but Matt
Thompson is doing driver work and wants to compare a2 to a3 so I
added it
| author | Chris James <c.james4@uq.edu.au> |
|---|---|
| date | Wed, 25 Apr 2018 00:55:22 +1000 |
| parents | b215560c5eed |
| children | 82e2c5bd9a7d |
| files | app/pitot/pitot.py app/pitot/pitot_condition_builder.py |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/app/pitot/pitot.py Wed Mar 21 09:19:01 2018 +1000 +++ b/app/pitot/pitot.py Wed Apr 25 00:55:22 2018 +1000 @@ -314,7 +314,7 @@ from pitot_output_utils import * from pitot_area_ratio_check import * -VERSION_STRING = "5-Mar-2018" +VERSION_STRING = "24-Apr-2018" DEBUG_PITOT = False
--- a/app/pitot/pitot_condition_builder.py Wed Mar 21 09:19:01 2018 +1000 +++ b/app/pitot/pitot_condition_builder.py Wed Apr 25 00:55:22 2018 +1000 @@ -10,7 +10,7 @@ """ -VERSION_STRING = "5-Mar-2018" +VERSION_STRING = "24-Apr-2018" import sys @@ -247,7 +247,7 @@ statesd2_reflected_list = ['Vr-sd','Mr-sd','psd2r','Tsd2r','rhosd2r','Vsd2r','Msd2r', 'asd2r', 'gammasd2r', 'Rsd2r'] full_list += statesd2_reflected_list - state2_list = ['p2','T2','rho2','V2','M2', 'a2', 'gamma2', 'R2', 'Vs1 - V2', 'Ht2'] + state2_list = ['p2','T2','rho2','V2','M2', 'a2', 'gamma2', 'R2', 'Vs1 - V2', 'Ht2', 'p3','T3','rho3','V3','M3', 'a3'] full_list += state2_list @@ -959,6 +959,13 @@ results['Ht2'].append(cfg['Ht2']/10**6) else: results['Ht2'].append('did not solve') + + results['p3'].append(states['s3'].p) + results['T3'].append(states['s3'].T) + results['rho3'].append(states['s3'].rho) + results['V3'].append(V['s3']) + results['M3'].append(M['s3']) + results['a3'].append(states['s3'].a) if cfg['rs_out_of_st']: results['Vr-st'].append(cfg['Vr-st'])