Skip to content

Commit e94bb0c

Browse files
bigfootedbigfooted
committed
remove wall species options again
1 parent 98c7a4c commit e94bb0c

File tree

5 files changed

+3
-122
lines changed

5 files changed

+3
-122
lines changed

‎Common/include/CConfig.hpp‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,6 @@ class CConfig {
620620
INLET_TYPE Kind_Inlet;
621621
INLET_TYPE *Kind_Inc_Inlet;
622622

623-
//WALL_SPECIES_TYPE **Wall_SpeciesType;
624-
unsigned short **Wall_SpeciesType;
625623
INC_OUTLET_TYPE *Kind_Inc_Outlet;
626624
unsigned short nWall_Types; /*!< \brief Number of wall treatment types listed. */
627625
unsigned short nInc_Inlet; /*!< \brief Number of inlet boundary treatment types listed. */
@@ -1347,12 +1345,6 @@ class CConfig {
13471345
void addInletOption(const string& name, unsigned short & nMarker_Inlet, string * & Marker_Inlet,
13481346
su2double* & Ttotal, su2double* & Ptotal, su2double** & FlowDir);
13491347

1350-
void addWallSpeciesOption(const string& name, unsigned short & nMarker_Wall_Species, string * & Marker_Wall_Species,
1351-
su2double** & wall_species_val, unsigned short & nSpecies_per_Wall);
1352-
void addWallSpeciesType(const string& name, unsigned short & nMarker_Wall_Species, string * & Marker_Wall_Species,
1353-
// WALL_SPECIES_TYPE** & wall_species_type, unsigned short & nSpecies_per_Wall);
1354-
unsigned short** & wall_species_type, unsigned short & nSpecies_per_Wall);
1355-
13561348
void addInletSpeciesOption(const string& name, unsigned short & nMarker_Inlet_Species, string * & Marker_Inlet_Species,
13571349
su2double** & inlet_species_val, unsigned short & nSpecies_per_Inlet);
13581350

@@ -4971,13 +4963,6 @@ class CConfig {
49714963
*/
49724964
INLET_TYPE GetKind_Inc_Inlet(const string& val_marker) const;
49734965

4974-
/*!
4975-
* \brief Get the type of incompressible inlet from the list.
4976-
* \return Kind of the incompressible inlet.
4977-
*/
4978-
// WALL_SPECIES_TYPE* GetKind_Wall_Species(const string& val_marker) const;
4979-
//unsigned short* GetKind_Wall_Species(const string& val_marker) const;
4980-
49814966
/*!
49824967
* \brief Get the total number of types in Kind_Inc_Inlet list
49834968
* \return Total number of types in Kind_Inc_Inlet list
@@ -6849,20 +6834,6 @@ class CConfig {
68496834
*/
68506835
const su2double* GetInlet_SpeciesVal(const string& val_index) const;
68516836

6852-
/*!
6853-
* \brief Get the species values at a wall boundary
6854-
* \param[in] val_index - Index corresponding to the wall boundary.
6855-
* \return The wall species values.
6856-
*/
6857-
const su2double* GetWall_SpeciesVal(const string& val_index) const;
6858-
/*!
6859-
* \brief Get the species values at a wall boundary
6860-
* \param[in] val_index - Index corresponding to the wall boundary.
6861-
* \return The wall species values.
6862-
*/
6863-
//const WALL_SPECIES_TYPE* GetWall_SpeciesType(const string& val_index) const;
6864-
const unsigned short* GetWall_SpeciesType(const string& val_index) const;
6865-
68666837
/*!
68676838
* \brief Get the turbulent properties values at an inlet boundary
68686839
* \param[in] val_index - Index corresponding to the inlet boundary.

‎Common/include/option_structure.hpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,20 +1961,6 @@ static const MapType<std::string, INLET_TYPE> Inlet_Map = {
19611961
MakePair("PRESSURE_INLET", INLET_TYPE::PRESSURE_INLET)
19621962
};
19631963

1964-
1965-
/*!
1966-
* \brief Types species wall boundary treatments
1967-
*/
1968-
enum class WALL_SPECIES_TYPE {
1969-
FLUX, /*!< \brief User specifies total pressure, total temperature, and flow direction. */
1970-
VALUE, /*!< \brief User specifies density and velocity (mass flow). */
1971-
};
1972-
1973-
static const MapType<std::string, WALL_SPECIES_TYPE> Wall_Species_Map = {
1974-
MakePair("FLUX", WALL_SPECIES_TYPE::FLUX)
1975-
MakePair("VALUE", WALL_SPECIES_TYPE::VALUE)
1976-
};
1977-
19781964
/*!
19791965
* \brief Types outlet boundary treatments
19801966
*/

‎Common/src/CConfig.cpp‎

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -495,30 +495,6 @@ void CConfig::addInletSpeciesOption(const string& name, unsigned short & nMarker
495495
option_map.insert(pair<string, COptionBase *>(name, val));
496496
}
497497

498-
void CConfig::addWallSpeciesOption(const string& name, unsigned short & nMarker_Wall_Species,
499-
string * & Marker_Wall_Species, su2double** & wall_species_val,
500-
unsigned short & nSpecies_per_Wall) {
501-
assert(option_map.find(name) == option_map.end());
502-
all_options.insert(pair<string, bool>(name, true));
503-
504-
COptionBase* val = new COptionStringValuesList<su2double*>(name, nMarker_Wall_Species, Marker_Wall_Species,
505-
wall_species_val, nSpecies_per_Wall);
506-
option_map.insert(pair<string, COptionBase *>(name, val));
507-
}
508-
509-
void CConfig::addWallSpeciesType(const string& name, unsigned short & nMarker_Wall_Species,
510-
//string * & Marker_Wall_Species, WALL_SPECIES_TYPE** & wall_species_type,
511-
string * & Marker_Wall_Species, unsigned short** & wall_species_type,
512-
unsigned short & nSpecies_per_Wall) {
513-
assert(option_map.find(name) == option_map.end());
514-
all_options.insert(pair<string, bool>(name, true));
515-
516-
//COptionBase* val = new COptionStringValuesList<<static_cast>(unsigned short)WALL_SPECIES_TYPE*>(name, nMarker_Wall_Species, Marker_Wall_Species,
517-
COptionBase* val = new COptionStringValuesList<unsigned short*>(name, nMarker_Wall_Species, Marker_Wall_Species,
518-
wall_species_type, nSpecies_per_Wall);
519-
option_map.insert(pair<string, COptionBase *>(name, val));
520-
}
521-
522498
void CConfig::addInletTurbOption(const string& name, unsigned short& nMarker_Inlet_Turb, string*& Marker_Inlet_Turb,
523499
su2double**& Turb_Properties_val, unsigned short& nTurb_Properties) {
524500
assert(option_map.find(name) == option_map.end());
@@ -1598,7 +1574,7 @@ void CConfig::SetConfig_Options() {
15981574
addEnumOption("INLET_TYPE", Kind_Inlet, Inlet_Map, INLET_TYPE::TOTAL_CONDITIONS);
15991575
/*!\brief INC_INLET_TYPE \n DESCRIPTION: List of inlet types for incompressible flows. List length must match number of inlet markers. Options: VELOCITY_INLET, PRESSURE_INLET, INPUT_FILE. \ingroup Config*/
16001576
addEnumListOption("INC_INLET_TYPE", nInc_Inlet, Kind_Inc_Inlet, Inlet_Map);
1601-
1577+
16021578

16031579
addBoolOption("SPECIFIED_INLET_PROFILE", Inlet_From_File, false);
16041580
/*!\brief INLET_FILENAME \n DESCRIPTION: Input file for a specified inlet profile (w/ extension) \n DEFAULT: inlet.dat \ingroup Config*/
@@ -1619,10 +1595,6 @@ void CConfig::SetConfig_Options() {
16191595
/*!\brief MARKER_INLET_SPECIES \n DESCRIPTION: Inlet Species boundary marker(s) with the following format
16201596
Inlet Species: (inlet_marker, Species1, Species2, ..., SpeciesN-1, inlet_marker2, Species1, Species2, ...) */
16211597
addInletSpeciesOption("MARKER_INLET_SPECIES",nMarker_Inlet_Species, Marker_Inlet_Species, Inlet_SpeciesVal, nSpecies_per_Inlet);
1622-
addWallSpeciesOption("MARKER_WALL_SPECIES" ,nMarker_Wall_Species , Marker_Wall_Species , Wall_SpeciesVal , nSpecies_per_Wall);
1623-
addWallSpeciesType("WALL_SPECIES_TYPE" ,nMarker_Wall_Species , Marker_Wall_Species , Wall_SpeciesType , nSpecies_per_Wall);
1624-
1625-
16261598
/*!\brief MARKER_INLET_TURBULENT \n DESCRIPTION: Inlet Turbulence boundary marker(s) with the following format
16271599
Inlet Turbulent: (inlet_marker, TurbulentIntensity1, ViscosityRatio1, inlet_marker2, TurbulentIntensity2,
16281600
ViscosityRatio2, ...) */
@@ -9079,15 +9051,6 @@ INLET_TYPE CConfig::GetKind_Inc_Inlet(const string& val_marker) const {
90799051
return Kind_Inc_Inlet[iMarker_Inlet];
90809052
}
90819053

9082-
9083-
//WALL_SPECIES_TYPE* CConfig::GetKind_Wall_Species(const string& val_marker) const {
9084-
// unsigned short * CConfig::GetKind_Wall_Species(const string& val_marker) const {
9085-
// unsigned short iMarker_Wall_Species;
9086-
// for (iMarker_Wall_Species = 0; iMarker_Wall_Species < nMarker_Wall_Species; iMarker_Wall_Species++)
9087-
// if (Marker_Wall_Species[iMarker_Wall_Species] == val_marker) break;
9088-
// return Wall_SpeciesType[iMarker_Wall_Species];
9089-
// }
9090-
90919054
INC_OUTLET_TYPE CConfig::GetKind_Inc_Outlet(const string& val_marker) const {
90929055
unsigned short iMarker_Outlet;
90939056
for (iMarker_Outlet = 0; iMarker_Outlet < nMarker_Outlet; iMarker_Outlet++)
@@ -9151,20 +9114,6 @@ const su2double* CConfig::GetInlet_SpeciesVal(const string& val_marker) const {
91519114
return Inlet_SpeciesVal[iMarker_Inlet_Species];
91529115
}
91539116

9154-
const su2double* CConfig::GetWall_SpeciesVal(const string& val_marker) const {
9155-
unsigned short iMarker_Wall_Species;
9156-
for (iMarker_Wall_Species = 0; iMarker_Wall_Species < nMarker_Wall_Species; iMarker_Wall_Species++)
9157-
if (Marker_Wall_Species[iMarker_Wall_Species] == val_marker) break;
9158-
return Wall_SpeciesVal[iMarker_Wall_Species];
9159-
}
9160-
//const WALL_SPECIES_TYPE* CConfig::GetWall_SpeciesType(const string& val_marker) const {
9161-
const unsigned short* CConfig::GetWall_SpeciesType(const string& val_marker) const {
9162-
unsigned short iMarker_Wall_Species;
9163-
for (iMarker_Wall_Species = 0; iMarker_Wall_Species < nMarker_Wall_Species; iMarker_Wall_Species++)
9164-
if (Marker_Wall_Species[iMarker_Wall_Species] == val_marker) break;
9165-
return Wall_SpeciesType[iMarker_Wall_Species];
9166-
}
9167-
91689117
const su2double* CConfig::GetInlet_TurbVal(const string& val_marker) const {
91699118
/*--- If Turbulent Inlet is not provided for the marker, return free stream values. ---*/
91709119
for (auto iMarker = 0u; iMarker < nMarker_Inlet_Turb; iMarker++) {

‎SU2_CFD/src/solvers/CSpeciesSolver.cpp‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -466,27 +466,7 @@ void CSpeciesSolver::BC_Isothermal_Wall_Generic(CGeometry* geometry, CSolver** s
466466
string Marker_Tag = config->GetMarker_All_TagBound(val_marker);
467467
/*--- Loop over all the vertices on this boundary marker ---*/
468468
const su2double* InletSpecies = config->GetInlet_SpeciesVal("inlet") ;
469-
cout << "inlet = " << InletSpecies[0] << " " << InletSpecies[1] << endl;
470-
471-
const su2double* WallSpecies = config->GetWall_SpeciesVal("wall_side") ;
472-
cout << "wall = " << WallSpecies[0] <<" " << WallSpecies[1] << endl;
473-
474-
const short unsigned int* wallspeciestype = config->GetWall_SpeciesType(Marker_Tag);
475-
cout << "type = "<<(wallspeciestype[0]) << " " << wallspeciestype[1] << endl;
476-
// switch (config->GetWall_SpeciesType(Marker_Tag)[0]) {
477-
// /*--- incompressible conditions ---*/
478-
479-
// //case WALL_SPECIES_TYPE::FLUX:
480-
// case 0:
481-
// cout << "flux" << endl;
482-
// break;
483-
// //case WALL_SPECIES_TYPE::VALUE:
484-
// case 1:
485-
// cout << "value" << endl;
486-
// break;
487-
// default:
488-
// break;
489-
// }
469+
490470
}
491471

492472

‎TestCases/py_wrapper/psi.cfg‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RESTART_SOL= YES
2020
MGLEVEL= 0
2121
%
2222

23-
% temperature and density
23+
% temperature and density
2424
FREESTREAM_TEMPERATURE = 673
2525
FREESTREAM_DENSITY = 2.55
2626
% ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------%
@@ -74,12 +74,7 @@ INC_INLET_DAMPING= 0.01
7474
MARKER_INLET= ( inlet, 673, 40.0, 1.0, 0.0, 0.0)
7575
MARKER_INLET_TURBULENT = (inlet, 0.10, 15)
7676

77-
7877
MARKER_INLET_SPECIES= (inlet, 0.0, 400.0)
79-
%WALL_SPECIES_TYPE = wall_side, FLUX, VALUE, wall_pipe, FLUX, VALUE,wall_out, FLUX, VALUE,wall_top, FLUX, VALUE
80-
WALL_SPECIES_TYPE = wall_side, 0 , 1 , wall_pipe, 0 , 1 ,wall_out 0 , 1 , wall_top 0 , 1
81-
MARKER_WALL_SPECIES= wall_side, 0.0, 300.0, wall_pipe, 0.0, 400.0, wall_out, 0.0, 500.0, wall_top, 0.0, 300.0
82-
8378
%
8479
INC_OUTLET_TYPE= PRESSURE_OUTLET
8580
INC_OUTLET_DAMPING= 0.01

0 commit comments

Comments
 (0)