Skip to content

Commit 0b7fdb0

Browse files
bigfootedbigfooted
authored
Merge branch 'develop' into feature_lookuptable
2 parents 9bb027f + da4c75d commit 0b7fdb0

File tree

9 files changed

+46
-14
lines changed

9 files changed

+46
-14
lines changed

‎Common/include/geometry/dual_grid/CPoint.hpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class CPoint {
7070
su2vector<bool> Boundary; /*!< \brief To see if a point belong to the boundary (including MPI). */
7171
su2vector<bool> PhysicalBoundary; /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
7272
su2vector<bool> SolidBoundary; /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
73+
su2vector<bool> ViscousBoundary; /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
7374
su2vector<bool> PeriodicBoundary; /*!< \brief To see if a point belongs to a periodic boundary (without including MPI). */
7475

7576
su2activematrix Coord; /*!< \brief vector with the coordinates of the node. */
@@ -351,6 +352,20 @@ class CPoint {
351352
*/
352353
inline bool GetSolidBoundary(unsigned long iPoint) const { return SolidBoundary(iPoint); }
353354

355+
/*!
356+
* \brief Set if a point belong to the boundary.
357+
* \param[in] iPoint - Index of the point.
358+
* \param[in] boundary - <code>TRUE</code> if the point belong to the physical boundary; otherwise <code>FALSE</code>.
359+
*/
360+
inline void SetViscousBoundary(unsigned long iPoint, bool boundary) { ViscousBoundary(iPoint) = boundary; }
361+
362+
/*!
363+
* \brief Provides information about if a point belong to the physical boundaries (without MPI).
364+
* \param[in] iPoint - Index of the point.
365+
* \return <code>TRUE</code> if the point belong to the boundary; otherwise <code>FALSE</code>.
366+
*/
367+
inline bool GetViscousBoundary(unsigned long iPoint) const { return ViscousBoundary(iPoint); }
368+
354369
/*!
355370
* \brief Set if a point belongs to a periodic boundary.
356371
* \param[in] iPoint - Index of the point.

‎Common/src/geometry/CPhysicalGeometry.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3660,6 +3660,9 @@ void CPhysicalGeometry::SetBoundaries(CConfig *config) {
36603660
if (config->GetSolid_Wall(iMarker))
36613661
nodes->SetSolidBoundary(Point_Surface, true);
36623662

3663+
if (config->GetViscous_Wall(iMarker))
3664+
nodes->SetViscousBoundary(Point_Surface, true);
3665+
36633666
if (config->GetMarker_All_KindBC(iMarker) == PERIODIC_BOUNDARY)
36643667
nodes->SetPeriodicBoundary(Point_Surface, true);
36653668
}
@@ -4853,6 +4856,7 @@ void CPhysicalGeometry::SetRCM_Ordering(CConfig *config) {
48534856
nodes->ResetBoundary(iPoint);
48544857
nodes->SetPhysicalBoundary(iPoint, false);
48554858
nodes->SetSolidBoundary(iPoint, false);
4859+
nodes->SetViscousBoundary(iPoint, false);
48564860
nodes->SetPeriodicBoundary(iPoint, false);
48574861
nodes->SetDomain(iPoint, true);
48584862
}
@@ -4909,6 +4913,9 @@ void CPhysicalGeometry::SetRCM_Ordering(CConfig *config) {
49094913
if (config->GetSolid_Wall(iMarker))
49104914
nodes->SetSolidBoundary(InvResult[iPoint], true);
49114915

4916+
if (config->GetViscous_Wall(iMarker) )
4917+
nodes->SetViscousBoundary(InvResult[iPoint], true);
4918+
49124919
if (config->GetMarker_All_KindBC(iMarker) == PERIODIC_BOUNDARY)
49134920
nodes->SetPeriodicBoundary(InvResult[iPoint], true);
49144921
}

‎Common/src/geometry/dual_grid/CPoint.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ void CPoint::FullAllocation(unsigned short imesh, const CConfig *config) {
9595
Domain.resize(npoint) = true;
9696
Boundary.resize(npoint) = false;
9797
SolidBoundary.resize(npoint) = false;
98+
ViscousBoundary.resize(npoint) = false;
9899
PhysicalBoundary.resize(npoint) = false;
99100
PeriodicBoundary.resize(npoint) = false;
100101

‎SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput* output, CIntegration**** integr
116116

117117
/*--- Load solution timestep n ---*/
118118

119-
LoadUnsteady_Solution(geometry, solver, config, iInst, iZone, Direct_Iter);
119+
LoadUnsteady_Solution(geometry, solver, config, iZone, iInst, Direct_Iter);
120120

121121
if (config[iZone]->GetDeform_Mesh()) {
122122
solvers0[MESH_SOL]->LoadRestart(geometries, solver[iZone][iInst], config[iZone], Direct_Iter, true);
@@ -147,9 +147,9 @@ void CDiscAdjFluidIteration::Preprocess(COutput* output, CIntegration**** integr
147147

148148
/*--- Load solution timestep n-1 | n-2 for DualTimestepping 1st | 2nd order ---*/
149149
if (dual_time_1st) {
150-
LoadUnsteady_Solution(geometry, solver, config, iInst, iZone, Direct_Iter - 1);
150+
LoadUnsteady_Solution(geometry, solver, config, iZone, iInst, Direct_Iter - 1);
151151
} else {
152-
LoadUnsteady_Solution(geometry, solver, config, iInst, iZone, Direct_Iter - 2);
152+
LoadUnsteady_Solution(geometry, solver, config, iZone, iInst, Direct_Iter - 2);
153153

154154
/*--- Set volumes into correct containers ---*/
155155
if (config[iZone]->GetDynamic_Grid()) {

‎SU2_CFD/src/solvers/CIncEulerSolver.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2310,6 +2310,15 @@ void CIncEulerSolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container,
23102310
break;
23112311
}
23122312

2313+
/*--- check if the inlet node is shared with a viscous wall ---*/
2314+
if (geometry->nodes->GetViscousBoundary(iPoint)) {
2315+
/*--- match the velocity and pressure for the viscous wall---*/
2316+
for (iDim = 0; iDim < nDim; iDim++)
2317+
V_inlet[iDim+prim_idx.Velocity()] = nodes->GetVelocity(iPoint,iDim);
2318+
/* pressure obtained from interior */
2319+
V_inlet[prim_idx.Pressure()] = nodes->GetPressure(iPoint);
2320+
}
2321+
23132322
/*--- Access density at the node. This is either constant by
23142323
construction, or will be set fixed implicitly by the temperature
23152324
and equation of state. ---*/

‎TestCases/hybrid_regression.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ def main():
384384
inc_lam_bend.cfg_dir = "incomp_navierstokes/bend"
385385
inc_lam_bend.cfg_file = "lam_bend.cfg"
386386
inc_lam_bend.test_iter = 10
387-
inc_lam_bend.test_vals = [-3.436191, -3.098014, -0.017338, -0.193981]
387+
inc_lam_bend.test_vals = [-3.437996, -3.086189, -0.015600, 1.142212]
388388
test_list.append(inc_lam_bend)
389389

390390
############################
@@ -633,7 +633,7 @@ def main():
633633
slinc_steady.cfg_dir = "sliding_interface/incompressible_steady"
634634
slinc_steady.cfg_file = "config.cfg"
635635
slinc_steady.test_iter = 19
636-
slinc_steady.test_vals = [19.000000, -1.800401, -2.114687]
636+
slinc_steady.test_vals = [19.000000, -1.799803, -2.128200]
637637
slinc_steady.multizone = True
638638
test_list.append(slinc_steady)
639639

‎TestCases/parallel_regression.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ def main():
524524
inc_lam_bend.cfg_dir = "incomp_navierstokes/bend"
525525
inc_lam_bend.cfg_file = "lam_bend.cfg"
526526
inc_lam_bend.test_iter = 10
527-
inc_lam_bend.test_vals = [-3.446599, -3.089644, -0.022793, -0.194320]
527+
inc_lam_bend.test_vals = [-3.447746, -3.085237, -0.020816, 1.147373]
528528
inc_lam_bend.su2_exec = "mpirun -n 2 SU2_CFD"
529529
inc_lam_bend.timeout = 1600
530530
inc_lam_bend.tol = 0.00001
@@ -546,7 +546,7 @@ def main():
546546
inc_heatTransfer_BC.cfg_dir = "incomp_navierstokes/streamwise_periodic/chtPinArray_2d"
547547
inc_heatTransfer_BC.cfg_file = "BC_HeatTransfer.cfg"
548548
inc_heatTransfer_BC.test_iter = 50
549-
inc_heatTransfer_BC.test_vals = [-8.242458, -7.340502, -7.407009, -0.152357, -1.6675e+03] #last 7 lines
549+
inc_heatTransfer_BC.test_vals = [-8.242651, -7.341179, -7.407346, -0.152603, -1667.300000] #last 5 lines
550550
inc_heatTransfer_BC.su2_exec = "mpirun -n 2 SU2_CFD"
551551
inc_heatTransfer_BC.timeout = 1600
552552
inc_heatTransfer_BC.tol = 0.00001
@@ -1267,7 +1267,7 @@ def main():
12671267
slinc_steady.cfg_dir = "sliding_interface/incompressible_steady"
12681268
slinc_steady.cfg_file = "config.cfg"
12691269
slinc_steady.test_iter = 19
1270-
slinc_steady.test_vals = [19.000000, -1.803326, -2.097400] #last 4 columns
1270+
slinc_steady.test_vals = [19.000000, -1.803732, -2.108492] #last 3 columns
12711271
slinc_steady.su2_exec = "SU2_CFD"
12721272
slinc_steady.timeout = 100
12731273
slinc_steady.tol = 0.00002
@@ -1614,7 +1614,7 @@ def main():
16141614
species2_primitiveVenturi.cfg_dir = "species_transport/venturi_primitive_3species"
16151615
species2_primitiveVenturi.cfg_file = "species2_primitiveVenturi.cfg"
16161616
species2_primitiveVenturi.test_iter = 50
1617-
species2_primitiveVenturi.test_vals = [-5.957517, -5.187476, -5.037298, -5.851420, -1.511976, -6.046002, 5, -0.808614, 5 , -2.351161, 5, -0.247992, 0.000092, 0.000090, 0.000002, 0.000000]
1617+
species2_primitiveVenturi.test_vals = [-5.955472, -5.194868, -5.040170, -5.861356, -1.514787, -6.044817, 5.000000, -0.841155, 5.000000, -2.343846, 5.000000, -0.257718, 0.000089, 0.000088, 0.000001, 0.000000]
16181618
species2_primitiveVenturi.su2_exec = "mpirun -n 2 SU2_CFD"
16191619
species2_primitiveVenturi.timeout = 1600
16201620
species2_primitiveVenturi.new_output = True
@@ -1627,7 +1627,7 @@ def main():
16271627
species3_primitiveVenturi_inletFile.cfg_dir = "species_transport/venturi_primitive_3species"
16281628
species3_primitiveVenturi_inletFile.cfg_file = "species3_primitiveVenturi_inletFile.cfg"
16291629
species3_primitiveVenturi_inletFile.test_iter = 50
1630-
species3_primitiveVenturi_inletFile.test_vals = [-6.028145, -5.258104, -5.107927, -5.922051, -1.582604, -6.314220, -6.431771, 5, -0.808615, 5, -2.351160, 5, -0.288300]
1630+
species3_primitiveVenturi_inletFile.test_vals = [-6.026100, -5.265495, -5.110799, -5.931985, -1.585414, -6.311820, -6.434690, 5.000000, -0.841163, 5.000000, -2.343847, 5.000000, -0.295673]
16311631
species3_primitiveVenturi_inletFile.su2_exec = "mpirun -n 2 SU2_CFD"
16321632
species3_primitiveVenturi_inletFile.timeout = 1600
16331633
species3_primitiveVenturi_inletFile.new_output = True

‎TestCases/serial_regression.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ def main():
529529
inc_lam_bend.cfg_dir = "incomp_navierstokes/bend"
530530
inc_lam_bend.cfg_file = "lam_bend.cfg"
531531
inc_lam_bend.test_iter = 10
532-
inc_lam_bend.test_vals = [-3.450879, -3.083720, -0.020699, -0.168420] #last 4 columns
532+
inc_lam_bend.test_vals = [-3.455147, -3.082194, -0.018579, 1.169947] #last 4 columns
533533
inc_lam_bend.su2_exec = "SU2_CFD"
534534
inc_lam_bend.timeout = 1600
535535
inc_lam_bend.tol = 0.00001
@@ -1291,7 +1291,7 @@ def main():
12911291
slinc_steady.cfg_dir = "sliding_interface/incompressible_steady"
12921292
slinc_steady.cfg_file = "config.cfg"
12931293
slinc_steady.test_iter = 19
1294-
slinc_steady.test_vals = [19.000000, -1.803326, -2.097400] #last 3 columns
1294+
slinc_steady.test_vals = [19.000000, -1.803732, -2.108492] #last 3 columns
12951295
slinc_steady.su2_exec = "SU2_CFD"
12961296
slinc_steady.timeout = 100
12971297
slinc_steady.tol = 0.00001

‎TestCases/tutorials.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def main():
100100
species3_primitiveVenturi.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport"
101101
species3_primitiveVenturi.cfg_file = "species3_primitiveVenturi.cfg"
102102
species3_primitiveVenturi.test_iter = 50
103-
species3_primitiveVenturi.test_vals = [-6.028145, -5.258104, -5.107927, -5.922051, -1.582604, -6.314220, -6.431771, 5, -0.808615, 5, -2.351160, 5, -0.288300, 1.645644, 0.499064, 0.601230, 0.545351]
103+
species3_primitiveVenturi.test_vals = [-6.026100, -5.265495, -5.110799, -5.931985, -1.585414, -6.311820, -6.434690, 5, -0.841163, 5, -2.343847, 5, -0.295673, 1.645199, 0.498941, 0.600911, 0.545347]
104104
species3_primitiveVenturi.su2_exec = "mpirun -n 2 SU2_CFD"
105105
species3_primitiveVenturi.timeout = 1600
106106
species3_primitiveVenturi.new_output = True
@@ -113,7 +113,7 @@ def main():
113113
DAspecies3_primitiveVenturi.cfg_dir = "../Tutorials/incompressible_flow/Inc_Species_Transport"
114114
DAspecies3_primitiveVenturi.cfg_file = "DAspecies3_primitiveVenturi.cfg"
115115
DAspecies3_primitiveVenturi.test_iter = 50
116-
DAspecies3_primitiveVenturi.test_vals = [-8.519150, -7.786969, -7.774848, -7.474167, -12.127149, -12.262476, -11.456643]
116+
DAspecies3_primitiveVenturi.test_vals = [-8.528880, -7.799682, -7.783516, -7.482532, -12.140123, -12.250169, -11.455523]
117117
DAspecies3_primitiveVenturi.su2_exec = "mpirun -n 2 SU2_CFD_AD"
118118
DAspecies3_primitiveVenturi.timeout = 1600
119119
DAspecies3_primitiveVenturi.new_output = True

0 commit comments

Comments
 (0)