Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update: read data CEA and minor updates #484

Merged
merged 1 commit into from
Apr 25, 2022
Merged

Update: read data CEA and minor updates #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Validations/Functions/data_CEA.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
data_nasa = read_CEA(filename{j});
try
% PROPERTIES
mix.p = data_nasa.P; % [bar]
mix.T = data_nasa.T; % [K]
mix.rho = data_nasa.rho; % [kg/m3]
mix.h = data_nasa.H; % [kJ/kg]
mix.e = data_nasa.U; % [kJ/kg]
mix.S = data_nasa.S; % [kJ/kg-K]
mix.g = data_nasa.G; % [kJ/kg]
mix.cP = data_nasa.cp; % [kJ/kg-K]
mix.gamma_s = data_nasa.gamma_s; % [-]
mix.cV = data_nasa.cp ./ mix.gamma_s; % [kJ/kg-K]
mix.DhT = data_nasa.cp .* (data_nasa.T-298.15); % [kJ/kg]
mix.p = data_nasa.P(:, end)'; % [bar]
mix.T = data_nasa.T(:, end)'; % [K]
mix.rho = data_nasa.rho(:, end)'; % [kg/m3]
mix.h = data_nasa.H(:, end)'; % [kJ/kg]
mix.e = data_nasa.U(:, end)'; % [kJ/kg]
mix.S = data_nasa.S(:, end)'; % [kJ/kg-K]
mix.g = data_nasa.G(:, end)'; % [kJ/kg]
mix.cP = data_nasa.cp(:, end)'; % [kJ/kg-K]
mix.gamma_s = data_nasa.gamma_s(:, end)'; % [-]
mix.cV = data_nasa.cp(:, end)' ./ mix.gamma_s; % [kJ/kg-K]
mix.DhT = data_nasa.cp(:, end)' .* (data_nasa.T(:, end)' - 298.15); % [kJ/kg]
if isfield(data_nasa, 'dVdp_T')
mix.dVdp_T = data_nasa.dVdp_T; % [-]
mix.dVdT_p = data_nasa.dVdT_p; % [-]
mix.dVdp_T = data_nasa.dVdp_T(:, end)'; % [-]
mix.dVdT_p = data_nasa.dVdT_p(:, end)'; % [-]
end
if isfield(data_nasa,'rho2rho1')
try % reflected
Expand All @@ -53,7 +53,7 @@
for t = 1:NS
for k = length(data_nasa.X(i).mole):-1:1
if strcmpi(data_nasa.X(i).mole{k, 1}, species{t})
mix.Xi(t, i) = data_nasa.X(i).mole{k, 2};
mix.Xi(t, i) = data_nasa.X(i).mole{k, 2}(end);
end
end
end
Expand Down
8 changes: 7 additions & 1 deletion Validations/Functions/plot_molar_fractions_validation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@
if FLAG_Y_AXIS
xlim(axes, [min(results1.(varname_x)), max(results1.(varname_x))])
ylim(axes, [mintol_display, 1])
xlabel(axes, 'Equivalence ratio, $\phi$','FontSize',config.fontsize,'interpreter','latex');
if strcmpi(varname_x, 'phi')
xlabel(axes, 'Equivalence ratio, $\phi$','FontSize',config.fontsize,'interpreter','latex');
elseif strcmpi(varname_x, 'OF')
xlabel(axes, 'Mixture ratio, $O/F$','FontSize',config.fontsize,'interpreter','latex');
end
ylabel(axes, 'Molar fraction, $X_i$','FontSize',config.fontsize,'interpreter','latex');
else
xlim(axes, [mintol_display, 1])
Expand Down Expand Up @@ -128,6 +132,8 @@
function dataname = get_dataname(var)
if strcmpi(var, 'phi')
dataname = 'PD.phi.value';
elseif strcmpi(var, 'OF')
dataname = 'PS.strR';
else
dataname = 'PS.strP';
end
Expand Down
Loading