From 265223347e02079e8d68d907efad15abe3e587c9 Mon Sep 17 00:00:00 2001 From: Alberto Cuadra Lara Date: Wed, 6 Apr 2022 15:19:31 +0200 Subject: [PATCH] Solve: error read_cea --- .../CEA/Data/Shocks/airNASA_incident_shocks_ionization4.out | 2 +- .../CEA/Data/Shocks/airNASA_incident_shocks_ionization5.out | 2 +- .../CEA/Data/Shocks/airNASA_incident_shocks_ionization6.out | 2 +- Validations/Functions/read_CEA.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization4.out b/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization4.out index 214600f1..eefb9f34 100644 --- a/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization4.out +++ b/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization4.out @@ -54,7 +54,7 @@ U2, M/SEC 376.93 388.94 400.33 412.40 427.10 446.61 472.65 503.32 P, BAR 71.521 84.934 100.90 119.85 142.27 168.61 199.54 235.97 T, K 3031.03 3400.54 3788.33 4197.94 4644.19 5152.94 5761.45 6475.29 - RHO, KG/CU M 8.1949 0 8.6284 0 9.1081 0 9.6075 0 1.0082 1 1.0476 1 1.0756 1 1.0975 1 + RHO, KG/CU M 8.1949 0 8.6284 0 9.1081 0 9.6075 0 1.0082e1 1.0476e1 1.0756e1 1.0975e1 H, KJ/KG 3464.29 4097.94 4847.19 5733.36 6780.95 8014.22 9469.27 11185.4 U, KJ/KG 2591.54 3113.58 3739.43 4485.91 5369.76 6404.74 7614.10 9035.30 G, KJ/KG -21855.5 -24809.9 -27957.1 -31336.6 -35091.2 -39473.8 -44856.9 -51334.1 diff --git a/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization5.out b/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization5.out index 297090ad..e3a0b48b 100644 --- a/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization5.out +++ b/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization5.out @@ -54,7 +54,7 @@ U2, M/SEC 532.40 557.00 579.11 601.78 627.58 659.07 699.38 753.19 P, BAR 279.31 331.05 392.48 465.41 551.48 653.02 772.68 912.87 T, K 7225.97 7948.13 8635.80 9314.07 10009.63 10759.37 11618.18 12684.76 - RHO, KG/CU M 1.1274 1 1.1710 1 1.2238 1 1.2797 1 1.3333 1 1.3796 1 1.4128 1 1.4255 1 + RHO, KG/CU M 1.1274e1 1.1710e1 1.2238e1 1.2797e1 1.3333e1 1.3796e1 1.4128e1 1.4255e1 H, KJ/KG 13215.1 15617.7 18453.2 21808.2 25763.8 30434.8 35954.5 42458.1 U, KJ/KG 10737.7 12790.7 15246.0 18171.4 21627.7 25701.3 30485.4 36054.3 G, KJ/KG -58280.9 -65066.5 -71628.4 -78224.2 -85153.9 -92855.6-102022.0-113952.4 diff --git a/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization6.out b/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization6.out index 507778fd..fe3aa121 100644 --- a/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization6.out +++ b/Validations/CEA/Data/Shocks/airNASA_incident_shocks_ionization6.out @@ -53,7 +53,7 @@ U2, M/SEC 828.50 931.63 1049.22 P, BAR 1076.31 1266.64 1490.43 T, K 14163.11 16309.87 18931.71 - RHO, KG/CU M 1.4081 1 1.3606 1 1.3128 1 + RHO, KG/CU M 1.4081e1 1.3606e1 1.3128e1 H, KJ/KG 50115.4 59143.1 69800.6 U, KJ/KG 42471.4 49833.9 58447.9 G, KJ/KG -131408.7-158117.8-192043.2 diff --git a/Validations/Functions/read_CEA.m b/Validations/Functions/read_CEA.m index 61544134..b37f1830 100644 --- a/Validations/Functions/read_CEA.m +++ b/Validations/Functions/read_CEA.m @@ -86,7 +86,7 @@ tline = fgetl(fid); tline = fgetl(fid); tline = fgetl(fid); tline = fgetl(fid); num = regexp(tline, '\d'); data.rho2rho1(i, :) = sscanf(tline(num(3)-1:num(end)),'%f')'; tline = fgetl(fid); - if contains(tline, 'V2') + if contains(tline, 'U5+') num = regexp(tline, '\d'); data.u2(i, :) = sscanf(tline(num(3):num(end)),'%f'); tline = fgetl(fid); num = regexp(tline, '\d'); data.v_shock(i, :) = sscanf(tline(num(2):num(end)),'%f'); tline = fgetl(fid); data.v_shock(i, :) = data.v_shock(i, :) - data.u2(i, :);