Update: sample for CT v1.1.0

CombustionToolbox · Sep 3, 2024 · 4c95542 · 4c95542
1 parent 1146e50
commit 4c95542
Show file tree

Hide file tree

Showing 29 changed files with 147,049 additions and 128,054 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+# macOS
+*.DS_Store
diff --git a/README.md b/README.md
diff --git a/sample/input/example_1.m b/sample/input/example_1.m
@@ -1,22 +1,35 @@
-% Initialize
-self = App('Soot formation extended');
-
-% Initial conditions
-self = set_prop(self, 'TR', 300, 'pR', 1, 'phi', 0.5:0.01:4);
-self.PD.S_Fuel = {'C2H2_acetylene'};
-self.PD.S_Oxidizer = {'N2', 'O2'};
-self.PD.ratio_oxidizers_O2 = [79, 21] ./ 21;
-
-% Additional inputs (depends of the problem selected)
-self = set_prop(self, 'pP', self.PD.pR.value); 
-
-% Solve problem
-self = solve_problem(self, 'HP');
-
-% Miscellaneous
-self.Misc.display_species = {'CO2', 'CO', 'H2O', 'H2', 'O2', 'N2',...
-                             'HCN', 'H', 'OH', 'O', 'CN', 'NH3', 'CH4', 'C2H4',...
-                             'CH3', 'NO', 'HCO', 'NH2', 'NH', 'N', 'CH', 'Cbgrb'};
-
-% Display output (plots)
-post_results(self);
+% Import packages
+import combustiontoolbox.databases.NasaDatabase
+import combustiontoolbox.core.*
+import combustiontoolbox.equilibrium.*
+
+% Get Nasa database
+DB = NasaDatabase();
+
+% Define chemical system
+system = ChemicalSystem(DB, 'soot formation extended');
+
+% Initialize mixture
+mix = Mixture(system);
+
+% Define chemical state
+set(mix, {'C2H2_acetylene'}, 'fuel', 1);
+set(mix, {'N2', 'O2'}, 'oxidizer', [79, 21] / 21);
+
+% Define properties
+mixArray = setProperties(mix, 'T', 300, 'p', 1, 'equivalenceRatio', 0.5:0.01:4);
+
+% Initialize solver
+solver = EquilibriumSolver('problemType', 'HP');
+
+% Solve problem
+solver.solveArray(mixArray);
+
+% Set displaySpecies
+displaySpecies = {'CO2', 'CO', 'H2O', 'H2', 'O2', 'N2',...
+                  'HCN','H','OH','O','CN','NH3','CH4','C2H4','CH3',...
+                  'NO','HCO','NH2','NH','N','CH','Cbgrb'};
+solver.plotConfig.displaySpecies = displaySpecies;
+
+% Generate report
+report(solver, mixArray);
diff --git a/sample/input/example_1_gui/gui_1_labels.svg b/sample/input/example_1_gui/gui_1_labels.svg
diff --git a/sample/input/example_1_gui/gui_2_labels.svg b/sample/input/example_1_gui/gui_2_labels.svg
diff --git a/sample/input/example_1_gui/gui_34_vertical_labels.svg b/sample/input/example_1_gui/gui_34_vertical_labels.svg
diff --git a/sample/input/example_1_gui/gui_cuadra2024_labels_1.svg b/sample/input/example_1_gui/gui_cuadra2024_labels_1.svg
diff --git a/sample/input/example_2.m b/sample/input/example_2.m
@@ -1,2 +1,2 @@
-% Example 2
+% Example 2
 run_validation_TP_CEA_6()
diff --git a/sample/input/example_3.m b/sample/input/example_3.m
@@ -1,2 +1,2 @@
-% Example 3
+% Example 3
 run_validation_SHOCK_POLAR_SDToolbox_2()
diff --git a/sample/output/example_1/example_1_molar_composition.fig b/sample/output/example_1/example_1_molar_composition.fig
diff --git a/sample/output/example_1/example_1_molar_composition.svg b/sample/output/example_1/example_1_molar_composition.svg
diff --git a/sample/output/example_1/example_1_properties.fig b/sample/output/example_1/example_1_properties.fig
diff --git a/sample/output/example_1/example_1_properties.svg b/sample/output/example_1/example_1_properties.svg
diff --git a/sample/output/example_1_gui/gui_2_labels.svg b/sample/output/example_1_gui/gui_2_labels.svg
diff --git a/sample/output/example_1_gui/gui_3_labels.svg b/sample/output/example_1_gui/gui_3_labels.svg
diff --git a/sample/output/example_1_gui/gui_4_labels.svg b/sample/output/example_1_gui/gui_4_labels.svg