Skip to content

Support of Launder-Sharma in GUI for master branch #38

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Support of Launder-Sharma in GUI for master branch #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
188e924
GUI: support of Launder-Sharma turbulence model
kikuznetsov Apr 12, 2019
022b8f3
GUI: support of Launder-Sharma turbulence model
kikuznetsov Apr 12, 2019
698a0ac
Merge remote-tracking branch 'upstream/master'
kikuznetsov May 8, 2019
d6ea4a5
Merge remote-tracking branch 'upstream/master'
kikuznetsov May 29, 2019
630d9f4
Merge remote-tracking branch 'upstream/master'
kikuznetsov Jun 9, 2019
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
20 changes: 18 additions & 2 deletions bin/model/TurbulenceModel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def __init__(self, case):
'mixing_length',
'k-epsilon',
'k-epsilon-PL',
'Launder-Sharma',
'Rij-epsilon',
'Rij-SSG',
'Rij-EBRSM',
Expand Down Expand Up @@ -215,7 +216,7 @@ def setTurbulenceModel(self, model_turb):
self.__removeVariablesAndProperties([], 'smagorinsky_constant^2')
self.node_turb.xmlRemoveChild('wall_function')

elif model_turb in ('k-epsilon', 'k-epsilon-PL'):
elif model_turb in ('k-epsilon', 'k-epsilon-PL', 'Launder-Sharma'):
lst = ('k', 'epsilon')
for v in lst:
self.setNewVariable(self.node_turb, v, label=v)
Expand Down Expand Up @@ -480,7 +481,7 @@ def getTurbulenceVariable(self):
model = self.getTurbulenceModel()
nodeList = []

if model in ('k-epsilon','k-epsilon-PL'):
if model in ('k-epsilon','k-epsilon-PL', 'Launder-Sharma'):
nodeList.append(self.node_turb.xmlGetNode('variable', name='k'))
nodeList.append(self.node_turb.xmlGetNode('variable', name='epsilon'))
elif model in ('Rij-epsilon', 'Rij-SSG', 'Rij-EBRSM'):
Expand Down Expand Up @@ -578,6 +579,21 @@ def checkSetkepsilonPL(self):
assert mdl.node_turb == self.xmlNodeFromString(doc),\
'Could not set the linear production k-epsilon turbulence model'

def checkSetLaunderSharma(self):
"""Check whether the k-epsilon turbulence model could be set"""
mdl = TurbulenceModel(self.case)
mdl.setTurbulenceModel('Launder-Sharma')
doc ='''<turbulence model="Launder-Sharma">
<variable label="TurbEner" name="k"/>
<variable label="Dissip" name="epsilon"/>
<property label="TurbVisc" name="turbulent_viscosity"/>
<initialization choice="reference_velocity">
<reference_velocity>1</reference_velocity>
</initialization>
</turbulence>'''
assert mdl.node_turb == self.xmlNodeFromString(doc),\
'Could not set the Launder-Sharma k-epsilon turbulence model'

def checkSetRijepsilon(self):
"""Check whether the Rij-epsilon turbulence model could be set"""
mdl = TurbulenceModel(self.case)
Expand Down
3 changes: 3 additions & 0 deletions gui/Pages/TurbulenceView.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ def __init__(self, parent, case, default):

if default['model'] in ('k-epsilon', 'k-epsilon-PL'):
title = self.tr("Options for k-epsilon model")
elif default['model'] in ('Launder-Sharma'):
title = self.tr("Options for Launder-Sharma k-epsilon model")
elif default['model'] in ('Rij-epsilon', 'Rij-SSG', 'Rij-EBRSM'):
title = self.tr("Options for Rij-epsilon model")
elif default['model'] == 'k-omega-SST':
Expand Down Expand Up @@ -210,6 +212,7 @@ def __init__(self, parent=None, case=None):
self.modelTurbModel.addItem(self.tr("Mixing length"), "mixing_length")
self.modelTurbModel.addItem(self.tr("k-epsilon"), "k-epsilon")
self.modelTurbModel.addItem(self.tr("k-epsilon Linear Production"), "k-epsilon-PL")
self.modelTurbModel.addItem(self.tr("Launder-Sharma"), "Launder-Sharma")
self.modelTurbModel.addItem(self.tr("Rij-epsilon LRR"), "Rij-epsilon")
self.modelTurbModel.addItem(self.tr("Rij-epsilon SSG"), "Rij-SSG")
self.modelTurbModel.addItem(self.tr("Rij-epsilon EBRSM"), "Rij-EBRSM")
Expand Down
5 changes: 5 additions & 0 deletions src/gui/cs_gui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,6 +1571,11 @@ void cs_gui_turb_model(void)
turb_mdl->iturb = 21;
cs_gui_node_get_child_int(tn_t, "wall_function", &iwallf);
cs_gui_node_get_child_status_int(tn_t, "gravity_terms", &(rans_mdl->igrake));
}
else if (cs_gui_strcmp(model, "Launder-Sharma")) {
turb_mdl->iturb = 22;
cs_gui_node_get_child_int(tn_t, "wall_function", &iwallf);
cs_gui_node_get_child_status_int(tn_t, "gravity_terms", &(rans_mdl->igrake));
}
else if (cs_gui_strcmp(model, "Rij-epsilon")) {
turb_mdl->iturb = 30;
Expand Down
3 changes: 2 additions & 1 deletion src/gui/cs_gui_boundary_conditions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,8 @@ void CS_PROCF (uiclim, UICLIM)(const int *idarcy,
return;

if ( cs_gui_strcmp(model, "k-epsilon")
|| cs_gui_strcmp(model, "k-epsilon-PL")) {
|| cs_gui_strcmp(model, "k-epsilon-PL")
|| cs_gui_strcmp(model, "Launder-Sharma")) {

cs_real_t *new_vals = cs_meg_boundary_function("turbulence_ke",
"formula",
Expand Down