Merge branch 'master' into oop

CombustionToolbox · Aug 3, 2024 · ea8ba62 · ea8ba62
2 parents 3909260 + af8d4c4
commit ea8ba62
Show file tree

Hide file tree

Showing 11 changed files with 2,561 additions and 11 deletions.
diff --git a/.github/workflows/submodule_update_parent.yml b/.github/workflows/submodule_update_parent.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with: 
-          repository: AlbertoCuadra/combustion_toolbox_website
+          repository: CombustionToolbox/combustion_toolbox_website
           token: ${{ secrets.CI_TOKEN }}
           submodules: true
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -9,6 +9,7 @@ version: 1.1.1
 doi: 10.5281/zenodo.5554911
 date-released: 2024-08-03
 url: "https://combustion-toolbox-website.readthedocs.io"
+repository-code: "https://github.com/CombustionToolbox/combustion_toolbox"
 abstract:
     "
     [Website](https://combustion-toolbox-website.readthedocs.io)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img alt="Combustion Toolbox" align="left" href="https://combustion-toolbox-website.readthedocs.io" style="border-width:0" src="https://github.com/AlbertoCuadra/combustion_toolbox/blob/master/gui/assets/logo_CT_noversion_matlab.png" width="150"/>
+<img alt="Combustion Toolbox" align="left" href="https://combustion-toolbox-website.readthedocs.io" style="border-width:0" src="https://github.com/AlbertoCuadra/combustion_toolbox/blob/master/gui/assets/logo_CT_noversion_matlab.png" width="115"/>
 
 ## Combustion Toolbox: A MATLAB-GUI based open-source tool for solving gaseous combustion problems
 
@@ -122,13 +122,13 @@ See also the list of [contributors](https://github.com/AlbertoCuadra/combustion_
 }
 
 @phdthesis{cuadra2023_thesis,
-    title            = {Development of a wide-spectrum thermochemical code with application to planar reacting and non-reacting shocks},
-    author           = {Cuadra, A.},
-    year             = 2023,
-    month            = {May},
-    address          = {Madrid, Spain},
-    note             = {Available at \url{http://hdl.handle.net/10016/38179}},
-    school           = {Universidad Carlos III de Madrid},
-    type             = {PhD thesis}
+    title   = {Development of a wide-spectrum thermochemical code with application to planar reacting and non-reacting shocks},
+    author  = {Cuadra, A.},
+    year    = 2023,
+    month   = {May},
+    address = {Madrid, Spain},
+    note    = {Available at \url{http://hdl.handle.net/10016/38179}},
+    school  = {Universidad Carlos III de Madrid},
+    type    = {PhD thesis}
 }
 ```
diff --git a/utils/databases/species_g0.m b/utils/databases/species_g0.m
@@ -36,3 +36,4 @@
     % Compute Gibbs energy [J/mol]
     g0 = g0curve(T);
 end
+
diff --git a/utils/databases/species_h0.m b/utils/databases/species_h0.m
@@ -12,7 +12,7 @@
     %
     % Example:
     %     h0 = species_h0('H2O', 300, DB)
-    
+
     persistent cachedSpecies;
     persistent cachedH0curves;
 

diff --git a/validations/other stuff/tests/carranza2014/humid_air.csv b/validations/other stuff/tests/carranza2014/humid_air.csv
@@ -0,0 +1,19 @@
+Default Dataset,,Dataset 1,,Dataset 2,,Dataset 3,,Dataset 4,,Dataset 5,
+X,Y,X,Y,X,Y,X,Y,X,Y,X,Y
+60.09585397794048,1867.8261397847996,59.99683701159352,1931.839721348435,59.949546477607775,1993.7721915459483,59.980077030340006,2055.7056742854825,60.008293201311105,2086.4123611129858,60.062334015433464,2115.5580456588946
+58.07381720627158,1885.4949980424174,57.922688077269875,1946.385224986836,57.25263598439372,2005.7073618555162,56.16734523054171,2062.4218655074183,54.872255770043374,2088.427319733769,56.32676756085414,2113.4276572477756
+56.25926475948788,1902.646109813556,55.43364763923452,1963.007114795263,53.82960750014017,2020.495538064829,51.758023672268436,2069.6507405057305,48.85436174172686,2091.9921426739206,50.360214234605344,2109.7069028364676
+54.23742085296574,1922.917201063843,52.218624215762425,1984.3035735983035,49.39500132112656,2036.5716677242099,45.74039965515739,2076.8586896356196,42.88834843788899,2095.5576406420864,45.24971214876873,2106.2575096866517
+52.37087196261535,1938.5062980113664,49.00331149457015,2001.69668291234,45.738123846425616,2046.1523403221229,40.96764301432819,2080.4397132480995,37.18158446432691,2097.044727356185,37.285693070548355,2101.730096799017
+50.08954728764132,1957.7331209245174,44.8801053815165,2019.3382025354044,41.9514481279547,2054.430208853667,35.31283691130344,2082.9683681872793,32.148922751722935,2093.8565700476565,31.578543366692745,2098.012717527777
+47.54860683861266,1974.094112405664,41.43094366987683,2031.5238082380413,37.28287723940564,2063.7374951060465,30.384283804920916,2084.465580321583,28.1799316100191,2092.24359060901,23.27724171981719,2092.700247060253
+44.125983371167315,1994.346977899582,36.03646694194972,2046.5465566821017,33.755277272578425,2067.594942690121,24.625484814762785,2083.8702056135326,24.003340424342007,2089.587017861241,15.65042806419328,2087.91699855544
+40.54740914605122,2010.4342455211884,32.50915627284264,2054.3073537551804,29.60514718503691,2071.964736536566,18.24413641737567,2083.526953868585,17.336416604146272,2086.1173738710154,,
+37.435510716552095,2023.1446855044478,28.67048411080503,2061.0232074631094,25.29925920497141,2074.771165503368,13.834159117603408,2081.9082366918224,,,,
+33.597224284808,2035.065005197715,23.949723913542517,2066.1662458992046,21.538003112843555,2076.023342468712,,,,,,
+30.251669730008242,2045.1701745622438,19.98107992910284,2069.2372858473623,17.828608458679668,2077.015971162803,,,,,,
+26.335272913826056,2053.1861322244868,16.038318447358467,2071.527993411726,13.36690472654618,2077.4783653521617,,,,,,
+22.029674231480705,2059.8959106802927,12.718009940269683,2072.2654615166525,,,,,,,,
+18.294609226282958,2064.5313280501136,,,,,,,,,,
+14.507489917974487,2066.8240606985187,,,,,,,,,,
+11.550423628294872,2068.6071471966084,,,,,,,,,,
diff --git a/validations/other stuff/tests/carranza2014/humid_air.fig b/validations/other stuff/tests/carranza2014/humid_air.fig
diff --git a/validations/other stuff/tests/carranza2014/humid_air.mat b/validations/other stuff/tests/carranza2014/humid_air.mat
diff --git a/validations/other stuff/tests/carranza2014/humid_air.pdf b/validations/other stuff/tests/carranza2014/humid_air.pdf
diff --git a/validations/other stuff/tests/carranza2014/humid_air.png b/validations/other stuff/tests/carranza2014/humid_air.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,4 @@
		% Compute Gibbs energy [J/mol]
		g0 = g0curve(T);
		end