From 6c3fdb7963a9d2c9f92f2e13a742aaa5ff755f7d Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 16 Jun 2014 22:00:46 +0000 Subject: [PATCH] [Matlab/Samples] Remove duplicate examples 'ignite2.m' was essentially a duplicate of 'ignite.m' 'ignite3.m' was essentially a duplicate of 'ignite_uv.m' --- samples/matlab/ignite2.m | 106 --------------------------------------- samples/matlab/ignite3.m | 40 --------------- 2 files changed, 146 deletions(-) delete mode 100644 samples/matlab/ignite2.m delete mode 100644 samples/matlab/ignite3.m diff --git a/samples/matlab/ignite2.m b/samples/matlab/ignite2.m deleted file mode 100644 index dfbb58855..000000000 --- a/samples/matlab/ignite2.m +++ /dev/null @@ -1,106 +0,0 @@ -function ignite2(g) -% IGNITE2 Zero-dimensional kinetics: adiabatic, constant volume. -% -% This example illustrates how to use function 'reactor_ode' for -% zero-dimensional kinetics simulations with arbitrary heat flux -% and volume vs. time. Here a constant-volume, adiabatic simulation -% is conducted by setting vdot and q to zero. -% - -help ignite2 - -if nargin == 1 & isa(g,'GasMix') - gas = g; -else - gas = IdealGasMix('gri30.xml'); -end - -nsp = nSpecies(gas); - -% set the initial conditions - -set(gas,'T',1001.0,'P',oneatm,'X','H2:2,O2:1,N2:4'); - -y0 = [intEnergy_mass(gas) - 1.0/density(gas) - massFractions(gas)]; - -time_interval = [0 0.001]; -options = odeset('RelTol',1.e-5,'AbsTol',1.e-12,'Stats','on'); - -t0 = cputime; -out = ode15s(@reactor_ode,time_interval,y0,options,gas,@vdot,@area,@heatflux); -disp(['CPU time = ' num2str(cputime - t0)]); - -plotdata = output(out,gas); - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% the functions below may be defined arbitrarily to set the reactor -% boundary conditions - the rate of change of volume, the heat -% flux, and the area. - - -% Rate of change of volume. Any arbirtrary function may be implemented. -% Input arguments: -% t time -% vol volume -% gas ideal gas object - -function v = vdot(t, vol, gas) -v = 0.0; %constant volume -%v = 1.e11 * (pressure(gas) - 101325.0); % holds pressure very - % close to 1 atm - -% heat flux (W/m^2). -function q = heatflux(t, gas) -q = 0.0; % adiabatic - - -% surface area. Used only to compute heat transfer. -function a = area(t,vol) -a = 1.0; - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Since the solution variables used by the 'reactor' function are -% not necessarily those desired for output, this function is called -% after the integration is complete to generate the desired -% outputs. - -function pv = output(s, gas) -times = s.x; -soln = s.y; -[m n] = size(times); -pv = zeros(nSpecies(gas) + 4, n); - -set(gas,'T',1001.0,'P',oneatm); - -for j = 1:n - ss = soln(:,j); - y = ss(3:end); - mass = sum(y); - u_mass = ss(1)/mass; - v_mass = ss(2)/mass; - setMassFractions(gas, y); - setState_UV(gas, [u_mass v_mass]); - - pv(1,j) = times(j); - pv(2,j) = temperature(gas); - pv(3,j) = density(gas); - pv(4,j) = pressure(gas); - pv(5:end,j) = y; -end - -% plot the temperature and OH mole fractions. -figure(1); -plot(pv(1,:),pv(2,:)); -xlabel('time'); -ylabel('Temperature'); -title(['Final T = ' num2str(pv(2,end)) ' K']); - -figure(2); -ioh = speciesIndex(gas,'OH'); -plot(pv(1,:),pv(4+ioh,:)); -xlabel('time'); -ylabel('Mass Fraction'); -title('OH Mass Fraction'); diff --git a/samples/matlab/ignite3.m b/samples/matlab/ignite3.m deleted file mode 100644 index 770049084..000000000 --- a/samples/matlab/ignite3.m +++ /dev/null @@ -1,40 +0,0 @@ -function ignite3(gas) -% IGNITE3 Solves the same ignition problem as 'ignite', except -% that the volume is held fixed, and function conuv is used -% instead of reactor. -% - -help ignite3 - -if nargin == 0 | ~isa(gas,'GasMix') - gas = idealgasmix('gri30.xml'); -end - -mw = molecularWeights(gas); -nsp = nSpecies(gas); -set(gas,'T',1001.0,'P',oneatm,'X','H2:2,O2:1,N2:4'); - -y0 = [temperature(gas) - massFractions(gas)]; -tel = [0 0.001]; -options = odeset('RelTol',1.e-5,'AbsTol',1.e-12,'Stats','on'); -t0 = cputime; -out = ode15s(@conuv,tel,y0,options,gas,mw); -disp(['CPU time = ' num2str(cputime - t0)]); - -if nargout == 0 - % plot the temperature and OH mass fractions. - figure(1); - plot(out.x,out.y(1,:)); - xlabel('time'); - ylabel('Temperature'); - title(['Final T = ' num2str(out.y(1,end)) ' K']); - - figure(2); - ioh = speciesIndex(gas,'OH'); - plot(out.x,out.y(1+ioh,:)); - xlabel('time'); - ylabel('Mass Fraction'); - title('OH Mass Fraction'); - -end