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.

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

Flamelet approach for premixed flames #1917

Merged
merged 326 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
326 commits
Select commit Hold shift + click to select a range
0d43542
fix the values of the SOLVER_TYPE
bigfooted Dec 15, 2022
2ab79dd
Add trapezoidal map size to screen output.
danielmayer Dec 16, 2022
5681bd2
Fix build issue.
danielmayer Dec 16, 2022
ab10802
Fix build issue (again).
danielmayer Dec 16, 2022
84dd221
Remove "Y-" and "Y_" from species names.
danielmayer Dec 20, 2022
a70d649
fix axisymmetry + flamelet combination
bigfooted Dec 20, 2022
83a517f
Merge branch 'develop' into feature_new_flamelet
bigfooted Dec 20, 2022
d0f6c4d
Merge branch 'develop' into feature_new_flamelet
bigfooted Dec 20, 2022
f0243ea
Merge remote-tracking branch 'github/feature_new_flamelet' into featu…
danielmayer Dec 20, 2022
3baac1b
Rename reactants to user scalars; Let user specify scalar source name…
danielmayer Dec 22, 2022
e4be9d0
fix bug in source term name index
bigfooted Dec 23, 2022
8b9396e
Merge branch 'develop' into feature_new_flamelet
bigfooted Dec 23, 2022
5a6df41
Merge branch 'develop' into feature_new_flamelet
bigfooted Dec 25, 2022
77e30b2
Merge branch 'develop' into feature_new_flamelet
bigfooted Dec 29, 2022
b138e9a
Fixed build error and implemented Daniels comments on user-defined sc…
EvertBunschoten Jan 3, 2023
ddea89e
Fixed warning from github-code-scanning
EvertBunschoten Jan 3, 2023
19e2699
Implemented density calculation according to ideal gas law in flamele…
EvertBunschoten Jan 3, 2023
b0596d3
Implemented density calculation according to ideal gas law in flamele…
EvertBunschoten Jan 3, 2023
ab92d8f
t revert 19e26994dad480e94d7f0d97b9d6905c3fe117a1Revert "Implemented …
bigfooted Jan 3, 2023
99c95d3
Revert "Implemented density calculation according to ideal gas law in…
bigfooted Jan 3, 2023
18941c2
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 3, 2023
797b74e
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 9, 2023
c1448f6
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 13, 2023
d91d7c6
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 13, 2023
003cac5
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 15, 2023
acfd796
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 16, 2023
8001d90
activate species variance for flamelet
bigfooted Jan 20, 2023
4548e5b
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 20, 2023
67141d9
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 23, 2023
b1fdd9a
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 26, 2023
2586536
do not check sum of species for flamelet
bigfooted Jan 30, 2023
d6838c5
small update
bigfooted Jan 31, 2023
90b81ce
Merge branch 'develop' into feature_new_flamelet
bigfooted Jan 31, 2023
6b4a95e
Merge branch 'feature_new_flamelet' of https://github.com/su2code/su2…
bigfooted Feb 1, 2023
4f2a44c
Merge branch 'develop' into feature_new_flamelet
danielmayer Feb 1, 2023
dcb3575
Enable flamelet user scalars as objectives; streamline flamelet scala…
danielmayer Feb 2, 2023
ae0102a
Fix compilation warning
danielmayer Feb 2, 2023
cff0b25
fix adjoint bug in invers lookup routine
bigfooted Feb 2, 2023
53fd442
fix adjoint bug
bigfooted Feb 2, 2023
3bc7337
remove unused variables
bigfooted Feb 3, 2023
a8b2dac
cleanup
bigfooted Feb 3, 2023
37cefd7
fix conflicts
bigfooted Feb 6, 2023
df48114
cleanup
bigfooted Feb 7, 2023
dc72edd
fix build errors
bigfooted Feb 7, 2023
fec12c0
remove cout
bigfooted Feb 8, 2023
6590154
change version nr
bigfooted Feb 9, 2023
36a6b1e
Merge branch 'develop' into feature_new_flamelet
bigfooted Feb 9, 2023
37eaa82
fix merge bug, activate regression case
bigfooted Feb 9, 2023
a2d4900
fix m variable hiding
bigfooted Feb 9, 2023
0c99250
rename regression config
bigfooted Feb 9, 2023
6724eaa
change residual output list for testcase
bigfooted Feb 10, 2023
92a6113
update regression
bigfooted Feb 10, 2023
89b2cda
merge develop
bigfooted Feb 11, 2023
19617f4
cleanup species_diffusion
bigfooted Feb 12, 2023
525ee9d
initialize nSpecies and nScalars
bigfooted Feb 17, 2023
d04b429
merge with develop, comment python wrapper additions
bigfooted Feb 17, 2023
cf8cebe
add python wrapper stuff
bigfooted Feb 17, 2023
b48b1ea
Merge branch 'develop' into feature_new_flamelet
bigfooted Feb 20, 2023
e65302e
Add flamelet adjoint regression test.
danielmayer Feb 21, 2023
0d46842
Merge remote-tracking branch 'origin/feature_new_flamelet' into featu…
danielmayer Feb 21, 2023
dd6eb79
Use file copies instead of symlinks to fix regression tests. Rename s…
danielmayer Feb 22, 2023
233fe28
Merge branch 'develop' into feature_new_flamelet
danielmayer Feb 22, 2023
5fd59db
Enable flamelet model in combination with CHT model.
danielmayer Feb 24, 2023
41c1724
Add regression test for flamelet model plus CHT model.
danielmayer Feb 24, 2023
cf641c3
update axisymmetric source term
bigfooted Feb 24, 2023
851550e
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Feb 28, 2023
bfb3307
update comments
bigfooted Feb 28, 2023
d72b1dc
update config_template
bigfooted Feb 28, 2023
c8d91b7
chanremove initialization pywrapper
bigfooted Mar 2, 2023
86c7933
merge develop
bigfooted Mar 2, 2023
74293cb
merge w. develop
bigfooted Mar 2, 2023
b5ba7a8
merge develop
bigfooted Mar 2, 2023
b60c8d4
merge develop
bigfooted Mar 2, 2023
4d80b0d
Add flamelet scalar to adjoint output to enable optimization.
danielmayer Mar 3, 2023
de3da92
Add regression test for adjoint flamelet model plus CHT model.
danielmayer Mar 3, 2023
cee227c
Fix regression test (change residual comparison to file comparison).
danielmayer Mar 3, 2023
7cd4fbb
Fix regression tests by replacing binary reference files with ASCII r…
danielmayer Mar 4, 2023
8d6af1b
change regression
bigfooted Mar 7, 2023
8301aa8
Replace verification of restart files with verification of gradient f…
danielmayer Mar 7, 2023
aec1a98
Merge remote-tracking branch 'origin/feature_new_flamelet' into featu…
danielmayer Mar 7, 2023
d39b0c7
Add tolerance for file comparison in regression testing.
danielmayer Mar 8, 2023
62c2f41
Adjust tolerance for AD regression tests.
danielmayer Mar 8, 2023
8e19356
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 8, 2023
9edcf0b
Merge branch 'develop' into feature_new_flamelet
danielmayer Mar 8, 2023
07acbf8
Switch regression test comparison from residuals to restart files.
danielmayer Mar 9, 2023
2e42685
Merge remote-tracking branch 'origin/feature_new_flamelet' into featu…
danielmayer Mar 9, 2023
7fb9a9b
Merge Develop.
danielmayer Mar 10, 2023
a80e642
Adjust tolerance for adjoint regression tests.
danielmayer Mar 10, 2023
2d9d0cb
Fix reporting of maximum delta in reg test; Adjust tolerance of adjoi…
danielmayer Mar 10, 2023
560ff05
update bc profile writer, small cleanup
bigfooted Mar 13, 2023
d038169
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Mar 13, 2023
4fb7722
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 13, 2023
f4f3886
fix convertvariablesymbolstoindices
bigfooted Mar 13, 2023
f773b02
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Mar 13, 2023
97c1d70
fix convertvariablesymbolstoindices
bigfooted Mar 13, 2023
b2fc739
axisymmetric testcase flamelet
bigfooted Mar 13, 2023
2213804
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Mar 13, 2023
61e7224
add axisymmetric regression
bigfooted Mar 13, 2023
077a24f
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Mar 13, 2023
5e52073
comment unused code and add axisym case to regression
bigfooted Mar 13, 2023
b3ef48c
update readme.md
bigfooted Mar 13, 2023
5902386
remove commented code
bigfooted Mar 13, 2023
d99c9ef
Remove unused import from Testcase.py.
danielmayer Mar 13, 2023
cb3c348
Merge remote-tracking branch 'origin/feature_new_flamelet' into featu…
danielmayer Mar 13, 2023
2ac59f3
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 14, 2023
f562cbd
Update Common/include/CConfig.hpp
bigfooted Mar 15, 2023
63f8ca8
Update SU2_CFD/include/numerics/species/species_sources.hpp
bigfooted Mar 15, 2023
e3a0233
Update Common/include/option_structure.hpp
bigfooted Mar 15, 2023
e16a680
implement suggested changes
bigfooted Mar 15, 2023
ed6404e
implement more suggested changes
bigfooted Mar 15, 2023
70e0b8a
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 16, 2023
d866d6b
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 17, 2023
e51ebbf
change naming and fix custom flamelet
bigfooted Mar 17, 2023
2611da5
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Mar 17, 2023
1d16551
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 17, 2023
7770247
merge with develop
bigfooted Mar 20, 2023
3e08c13
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 22, 2023
45bf0a5
remove setnscalars getnscalars setncontrolvars
bigfooted Mar 22, 2023
4708749
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Mar 22, 2023
f3ffef4
fix solver issue
bigfooted Mar 22, 2023
e2a3585
Update Common/src/CConfig.cpp
bigfooted Mar 23, 2023
7098888
Update SU2_CFD/src/fluid/CFluidFlamelet.cpp
bigfooted Mar 23, 2023
ca4222c
implement review suggestions
bigfooted Mar 23, 2023
d38e175
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Mar 23, 2023
812db80
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 24, 2023
3514d9a
Update SU2_CFD/src/fluid/CFluidFlamelet.cpp
bigfooted Mar 24, 2023
ac1aefc
Update SU2_CFD/src/fluid/CFluidFlamelet.cpp
bigfooted Mar 24, 2023
9ece118
Update SU2_CFD/src/fluid/CFluidFlamelet.cpp
bigfooted Mar 24, 2023
cb8719f
Update SU2_CFD/include/solvers/CSolver.hpp
bigfooted Mar 24, 2023
345f35b
implement review suggestions and remove ntablemisses
bigfooted Mar 24, 2023
9810e39
implement more review suggestions
bigfooted Mar 24, 2023
28b2723
Merge branch 'develop' into feature_new_flamelet
bigfooted Mar 24, 2023
29862d7
change to const
bigfooted Mar 29, 2023
3bf68ca
implement some more review suggestions
bigfooted Mar 30, 2023
7c9c947
merge with develop
bigfooted Mar 30, 2023
1b55418
more review suggestions
bigfooted Mar 30, 2023
fe30f5d
remove commented code
bigfooted Mar 30, 2023
ff2b235
move function together
bigfooted Mar 30, 2023
751ebfe
merge with develop, fix conflict
bigfooted Mar 30, 2023
7091df7
remove unused variable
bigfooted Mar 30, 2023
6017d7e
Merge branch 'develop' into feature_new_flamelet
bigfooted Apr 3, 2023
e68accd
Merge branch 'develop' into feature_new_flamelet
bigfooted Apr 5, 2023
b14bb2f
Merge branch 'develop' into feature_new_flamelet
bigfooted Apr 9, 2023
01e80f6
rewrite outputs
bigfooted Apr 12, 2023
2ab0c80
merge develop
bigfooted Apr 12, 2023
0be3e8e
merge develop fix
bigfooted Apr 12, 2023
3ed7b78
Merge branch 'develop' into feature_new_flamelet
bigfooted Apr 12, 2023
cff43d3
added eddy_viscosity again
bigfooted Apr 12, 2023
026518a
update regression test
bigfooted Apr 13, 2023
f8753e7
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Apr 13, 2023
1aa5d5c
merge develop
bigfooted Apr 21, 2023
a263e27
cfix pass-by-reference bug
bigfooted Apr 23, 2023
9c2d267
merge develop
bigfooted Apr 25, 2023
52d6ccc
modify flame_init and update solution of planar and axi after tempera…
bigfooted Apr 25, 2023
e7ecf47
update flamelet cht case
bigfooted Apr 26, 2023
b5caa29
modify cht case
bigfooted Apr 26, 2023
24b352c
ad and dot testcase
bigfooted Apr 26, 2023
8a40994
change cfl for ad case
bigfooted Apr 26, 2023
9ded5e1
add tolerance for cht regression
bigfooted Apr 27, 2023
a4e7bb5
merge develop
bigfooted May 8, 2023
e09f367
add tol_percent to cht regression
bigfooted May 8, 2023
f661e0d
change cht testcase tolerance
bigfooted May 9, 2023
f32eee7
use abs tolerance
bigfooted May 9, 2023
fb58837
use abs tolerance
bigfooted May 9, 2023
853c941
use abs tolerance
bigfooted May 9, 2023
ca33245
add tmodify cht ad and dot regression
bigfooted May 10, 2023
f596d61
switch to ascii files
bigfooted May 10, 2023
5b12e59
update cht ad and dot testcase
bigfooted May 10, 2023
a904e94
add else statement to testcase.py
bigfooted May 11, 2023
f1217e1
add else statement to testcase.py
bigfooted May 11, 2023
3ec536e
add merge cht bc with isothermal
bigfooted May 12, 2023
7911f85
remove strange flamelet block in cincnsvariable.cpp
bigfooted May 12, 2023
ca46447
remove strange flamelet block in cincnsvariable.cpp
bigfooted May 12, 2023
80e997d
restore cincnsvariable to original
bigfooted May 12, 2023
3618b4c
change ndim+1 to indices.temperature
bigfooted May 12, 2023
cf36a9e
fix cht initialization bug
bigfooted May 15, 2023
a29e022
Adapt variable naming from develop branch in file comparison of regre…
danielmayer May 15, 2023
d6c5d5f
Merge branch 'develop' into feature_new_flamelet
danielmayer May 15, 2023
15f9709
remove derived outlet for flamelet
bigfooted May 16, 2023
8aa1eb1
remove unused variables
bigfooted May 16, 2023
ce6b99b
remove setscalarlookups from fluidflamelet
bigfooted May 16, 2023
fc50bec
implement code review suggestions
bigfooted May 16, 2023
deb0bb4
implechange lut variable lookup
bigfooted May 16, 2023
1a6d817
fix solverfactory
bigfooted May 17, 2023
b1e01f2
removremove comments, replace vector of pointers
bigfooted May 17, 2023
55ed421
fix auxfluidmodel entry
bigfooted May 17, 2023
a357f6f
remove sources from fluidmodel
bigfooted May 18, 2023
10e6c0e
small cleanup of speciesflameletsolver
bigfooted May 18, 2023
63ad495
remove source_residual for flamelet
bigfooted May 18, 2023
9c8b59c
revert
bigfooted May 18, 2023
868bcae
Update SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp
bigfooted May 18, 2023
1807f72
clean species and flamelet init
bigfooted May 18, 2023
6a1e9a4
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted May 18, 2023
1133302
clean BC_Inlet
bigfooted May 18, 2023
f07f2d1
some small cleanup
bigfooted May 18, 2023
9949cb1
remove unused variable
bigfooted May 19, 2023
c312ab0
Merge branch 'develop' into feature_new_flamelet
bigfooted May 21, 2023
24c33a4
Merge branch 'develop' into feature_new_flamelet
bigfooted May 23, 2023
c9eb29f
comment solution update in primvar
bigfooted May 23, 2023
04038d1
added solution update from LUT in primvar
bigfooted May 24, 2023
efab30e
switch to custom objectives
bigfooted May 30, 2023
459098f
change SPECIES_USE_STRONG_BC to MARKER_SPECIES_STRONG_BC
bigfooted May 30, 2023
d1da0bb
syntax error
bigfooted May 30, 2023
8d3fe45
spaces
bigfooted May 30, 2023
f0c1e8a
modify species BC
bigfooted May 30, 2023
5affce7
update testcase strong bc
bigfooted May 31, 2023
ecb81cc
refer to tutorials branch
bigfooted May 31, 2023
3df74f2
update CHT testcase config
bigfooted May 31, 2023
8e0a440
update AD regression
bigfooted May 31, 2023
3aa5f01
Merge branch 'develop' into feature_new_flamelet
Cristopher-Morales May 31, 2023
3e6e438
update AD regression
bigfooted May 31, 2023
a07b15e
update cht_ad tolerance
bigfooted May 31, 2023
72ddb9e
update cht_ad tolerance
bigfooted May 31, 2023
87e9f2e
update cht_ad testcase
bigfooted Jun 1, 2023
64e2e61
update AD regression
bigfooted Jun 1, 2023
7cd588d
Apply suggestions from code review
pcarruscag Jun 5, 2023
6a956c9
Merge branch 'develop' into feature_new_flamelet
Cristopher-Morales Jun 5, 2023
c76a781
Update Common/include/CConfig.hpp
pcarruscag Jun 5, 2023
e6d8d0c
Merge branch 'develop' into feature_new_flamelet
Cristopher-Morales Jun 5, 2023
fac096a
Update SU2_CFD/src/output/CFlowOutput.cpp
bigfooted Jun 5, 2023
230dc97
Update SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp
bigfooted Jun 5, 2023
841222f
Update SU2_CFD/src/drivers/CDriver.cpp
bigfooted Jun 5, 2023
481d7fe
Update SU2_CFD/src/output/CFlowOutput.cpp
bigfooted Jun 5, 2023
84765db
Update SU2_CFD/src/output/CFlowOutput.cpp
bigfooted Jun 5, 2023
3ac99fb
Update SU2_CFD/include/fluid/CFluidFlamelet.hpp
bigfooted Jun 5, 2023
83c9ae7
Update SU2_CFD/src/output/CFlowOutput.cpp
bigfooted Jun 5, 2023
e7bece6
Update SU2_CFD/include/fluid/CFluidFlamelet.hpp
bigfooted Jun 5, 2023
2884087
Update SU2_CFD/include/solvers/CSpeciesSolver.hpp
bigfooted Jun 5, 2023
57a9cd5
implement review suggestions
bigfooted Jun 5, 2023
3f2058a
Update SU2_CFD/include/solvers/CSpeciesSolver.hpp
bigfooted Jun 5, 2023
185215a
implement more review suggestions
bigfooted Jun 5, 2023
0a62f64
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Jun 5, 2023
666df7d
implement more review suggestions
bigfooted Jun 5, 2023
fe5c50a
implement more review suggestions
bigfooted Jun 5, 2023
3a8274e
Update SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp
pcarruscag Jun 5, 2023
a5cbb28
Update SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp
pcarruscag Jun 5, 2023
12d2c8d
Update SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp
pcarruscag Jun 5, 2023
5624bab
implement more review suggestions
bigfooted Jun 5, 2023
bf7add4
Merge branch 'feature_new_flamelet' of https://github.com/su2code/SU2…
bigfooted Jun 5, 2023
c67599d
revert to ndim+6
bigfooted Jun 5, 2023
7beb545
add override
bigfooted Jun 5, 2023
ba84bf8
Update SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp
bigfooted Jun 5, 2023
7f0fe80
Apply suggestions from code review
pcarruscag Jun 6, 2023
18afe44
Apply suggestions from code review
pcarruscag Jun 6, 2023
4442f3d
Update Common/include/CConfig.hpp
pcarruscag Jun 6, 2023
c8c08fb
Merge branch 'develop' into feature_new_flamelet
bigfooted Jun 7, 2023
7415a42
remove dead code
bigfooted Jun 7, 2023
7958985
remove unused variable
bigfooted Jun 7, 2023
f1fb3dd
switch regressions to develop
bigfooted Jun 7, 2023
81d71cd
Dummy change to re-run tests
pcarruscag Jun 7, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
with:
# -t <Tutorials-branch> -c <Testcases-branch>
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
args: -b ${{github.ref}} -t feature_new_flamelet -c feature_new_flamelet -s ${{matrix.testscript}}
- name: Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
with:
Expand Down
83 changes: 82 additions & 1 deletion Common/include/CConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@ class CConfig {
nMarker_PyCustom, /*!< \brief Number of markers that are customizable in Python. */
nMarker_DV, /*!< \brief Number of markers affected by the design variables. */
nMarker_WallFunctions, /*!< \brief Number of markers for which wall functions must be applied. */
nMarker_StrongBC, /*!< \brief Number of markers for which a strong BC must be applied. */
nMarker_SobolevBC; /*!< \brief Number of markers treaded in the gradient problem. */
string *Marker_Monitoring, /*!< \brief Markers to monitor. */
*Marker_Designing, /*!< \brief Markers to design. */
Expand All @@ -708,6 +709,7 @@ class CConfig {
*Marker_PyCustom, /*!< \brief Markers that are customizable in Python. */
*Marker_DV, /*!< \brief Markers affected by the design variables. */
*Marker_WallFunctions, /*!< \brief Markers for which wall functions must be applied. */
*Marker_StrongBC, /*!< \brief Markers for which a strong BC must be applied. */
*Marker_SobolevBC; /*!< \brief Markers in the gradient solver */

unsigned short nConfig_Files; /*!< \brief Number of config files for multiphysics problems. */
Expand Down Expand Up @@ -1179,7 +1181,7 @@ class CConfig {
unsigned short maxBasisDim, /*!< \brief Maximum number of POD basis dimensions. */
rom_save_freq; /*!< \brief Frequency of unsteady time steps to save. */

unsigned short nSpecies; /*!< \brief Number of transported species equations (for NEMO and species transport)*/
unsigned short nSpecies = 0; /*!< \brief Number of transported species equations (for NEMO and species transport)*/

/* other NEMO configure options*/
unsigned short nSpecies_Cat_Wall, /*!< \brief No. of species for a catalytic wall. */
Expand Down Expand Up @@ -1210,6 +1212,23 @@ class CConfig {
su2double* Species_Init; /*!< \brief Initial uniform value for scalar transport. */
unsigned short nSpecies_Init; /*!< \brief Number of entries of SPECIES_INIT */

/*--- Additional flamelet solver options ---*/
su2double flame_init[8]; /*!< \brief Initial solution parameters for flamelet solver.*/

/*--- lookup table ---*/
unsigned short n_scalars = 0; /*!< \brief Number of transported scalars for flamelet LUT approach. */
unsigned short n_lookups = 0; /*!< \brief Number of lookup variables, for visualization only. */
unsigned short n_table_sources = 0; /*!< \brief Number of transported scalar source terms for LUT. */
unsigned short n_user_scalars = 0; /*!< \brief Number of user defined (auxiliary) scalar transport equations. */
unsigned short n_user_sources = 0; /*!< \brief Number of source terms for user defined (auxiliary) scalar transport equations. */
unsigned short n_control_vars = 0; /*!< \brief Number of controlling variables (independent variables) for the LUT. */

vector<string> table_scalar_names; /*!< \brief Names of transported scalar variables. */
string* table_lookup_names; /*!< \brief Names of LUT variables. */
string file_name_lut; /*!< \brief Filename of the LUT. */
string* user_scalar_names; /*!< \brief Names of the user defined (auxiliary) transported scalars .*/
string* user_source_names; /*!< \brief Names of the source terms for the user defined transported scalars. */

/*!
* \brief Set the default values of config options not set in the config file using another config object.
* \param config - Config object to use the default values from.
Expand Down Expand Up @@ -2101,6 +2120,61 @@ class CConfig {
*/
bool GetSpecies_StrongBC() const { return Species_StrongBC; }

/*!
* \brief Get the flame initialization.
* (x1,x2,x3) = flame offset.
* (x4,x5,x6) = flame normal, separating unburnt from burnt.
* (x7) = flame thickness, the length from unburnt to burnt conditions.
* (x8) = flame burnt thickness, the length to stay at burnt conditions.
* \return Flame initialization for the flamelet model.
*/
const su2double* GetFlameInit() const { return flame_init; }

/*!
* \brief Get the number of control variables for flamelet model.
*/
unsigned short GetNControlVars() const { return n_control_vars; }

/*!
* \brief Get the number of total transported scalars for flamelet model.
*/
unsigned short GetNScalars() const { return n_scalars; }

/*!
* \brief Get the number of user scalars for flamelet model.
*/
unsigned short GetNUserScalars() const { return n_user_scalars; }

/*!
* \brief Get the name of the user scalar.
*/
const string& GetUserScalarName(unsigned short i_user_scalar) const {
if(n_user_scalars > 0) return user_scalar_names[i_user_scalar]; else return "NONE";
}

/*!
* \brief Get the name of the user scalar source term.
*/
const string& GetUserSourceName(unsigned short i_user_source) const {
if(n_user_sources > 0) return user_source_names[i_user_source]; else return "NONE";
pcarruscag marked this conversation as resolved.
Show resolved Hide resolved
}

/*!
* \brief Get the number of transported scalars for combustion.
*/
unsigned short GetNLookups() const { return n_lookups; }

/*!
* \brief Get the name of the variable that we want to retrieve from the lookup table.
*/
const string& GetLUTLookupName(unsigned short i_lookup) const { return table_lookup_names[i_lookup]; }

/*!
* \brief Get the file name of the look up table.
* \return File name of the look up table.
*/
const string& GetFileNameLUT() const { return file_name_lut; }

/*!
* \brief Get the Young's modulus of elasticity.
* \return Value of the Young's modulus of elasticity.
Expand Down Expand Up @@ -9305,6 +9379,13 @@ class CConfig {
*/
su2double GetWall_Emissivity(const string& val_index) const;

/*!
* \brief Get if boundary is strong or weak.
* \param[in] val_index - Index corresponding to the boundary.
* \return true if strong BC.
*/
bool GetMarker_StrongBC(const string& val_index) const;

/*!
* \brief Get the value of the CFL condition for radiation solvers.
* \return Value of the CFL condition for radiation solvers.
Expand Down
Loading