Skip to content

Commit 396e8d5

Browse files
pcarruscagpcarruscag
committed
Merge remote-tracking branch 'upstream/develop' into hybrid_parallel_incomp
2 parents dec8abf + 5c53093 commit 396e8d5

13 files changed

Lines changed: 171 additions & 93 deletions

File tree

‎Common/src/CConfig.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3377,7 +3377,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
33773377
if ((TimeMarching == TIME_STEPPING ||
33783378
TimeMarching == DT_STEPPING_1ST ||
33793379
TimeMarching == DT_STEPPING_2ND) && !Time_Domain){
3380-
SU2_MPI::Error("TIME_DOMAIN must be set to YES if UNSTEADY_SIMULATION is "
3380+
SU2_MPI::Error("TIME_DOMAIN must be set to YES if TIME_MARCHING is "
33813381
"TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER or DUAL_TIME_STEPPING-2ND_ORDER", CURRENT_FUNCTION);
33823382
}
33833383

@@ -6285,7 +6285,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
62856285
if (TimeMarching == DT_STEPPING_2ND) cout << "Unsteady simulation, dual time stepping strategy (second order in time)."<< endl;
62866286
if (Unst_CFL != 0.0) cout << "Time step computed by the code. Unsteady CFL number: " << Unst_CFL <<"."<< endl;
62876287
else cout << "Unsteady time step provided by the user (s): "<< Delta_UnstTime << "." << endl;
6288-
cout << "Total number of internal Dual Time iterations: "<< InnerIter <<"." << endl;
62896288
break;
62906289
}
62916290
}

‎Common/src/geometry/CGeometry.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2520,7 +2520,7 @@ void CGeometry::UpdateGeometry(CGeometry **geometry_container, CConfig *config)
25202520

25212521
geometry_container[MESH_0]->InitiateComms(geometry_container[MESH_0], config, COORDINATES);
25222522
geometry_container[MESH_0]->CompleteComms(geometry_container[MESH_0], config, COORDINATES);
2523-
if (config->GetGrid_Movement() || config->GetDynamic_Grid()){
2523+
if (config->GetDynamic_Grid()){
25242524
geometry_container[MESH_0]->InitiateComms(geometry_container[MESH_0], config, GRID_VELOCITY);
25252525
geometry_container[MESH_0]->CompleteComms(geometry_container[MESH_0], config, GRID_VELOCITY);
25262526
}
@@ -3961,4 +3961,3 @@ void CGeometry::ComputeWallDistance(const CConfig* const* config_container, CGeo
39613961
}
39623962
}
39633963
}
3964-

‎SU2_CFD/src/output/CAdjFlowIncOutput.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void CAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
372372
/// END_GROUP
373373

374374
// Grid velocity
375-
if (config->GetGrid_Movement()){
375+
if (config->GetDynamic_Grid()){
376376
AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY", "x-component of the grid velocity vector");
377377
AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY", "y-component of the grid velocity vector");
378378
if (nDim == 3 )
@@ -537,4 +537,3 @@ bool CAdjFlowIncOutput::SetUpdate_Averages(CConfig *config){
537537
// return (config->GetUnsteady_Simulation() != STEADY && !dualtime);
538538

539539
}
540-

‎SU2_CFD/src/output/CFlowCompOutput.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOu
5858
requestedVolumeFields.emplace_back("COORDINATES");
5959
requestedVolumeFields.emplace_back("SOLUTION");
6060
requestedVolumeFields.emplace_back("PRIMITIVE");
61-
if (config->GetGrid_Movement()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
61+
if (config->GetDynamic_Grid()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
6262
nRequestedVolumeFields = requestedVolumeFields.size();
6363
}
6464

@@ -315,7 +315,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
315315
}
316316

317317
// Grid velocity
318-
if (config->GetGrid_Movement()){
318+
if (config->GetDynamic_Grid()){
319319
AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY", "x-component of the grid velocity vector");
320320
AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY", "y-component of the grid velocity vector");
321321
if (nDim == 3 )
@@ -469,7 +469,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
469469
break;
470470
}
471471

472-
if (config->GetGrid_Movement()){
472+
if (config->GetDynamic_Grid()){
473473
SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel(iPoint)[0]);
474474
SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel(iPoint)[1]);
475475
if (nDim == 3)

‎SU2_CFD/src/output/CFlowIncOutput.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
6060
requestedVolumeFields.emplace_back("COORDINATES");
6161
requestedVolumeFields.emplace_back("SOLUTION");
6262
requestedVolumeFields.emplace_back("PRIMITIVE");
63-
if (config->GetGrid_Movement()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
63+
if (config->GetDynamic_Grid()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
6464
nRequestedVolumeFields = requestedVolumeFields.size();
6565
}
6666

@@ -383,7 +383,7 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
383383
AddVolumeOutput("P1-RAD", "Radiative_Energy(P1)", "SOLUTION", "Radiative Energy");
384384

385385
// Grid velocity
386-
if (config->GetGrid_Movement()){
386+
if (config->GetDynamic_Grid()){
387387
AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY", "x-component of the grid velocity vector");
388388
AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY", "y-component of the grid velocity vector");
389389
if (nDim == 3 )
@@ -537,7 +537,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
537537
SetVolumeOutputValue("P1-RAD", iPoint, Node_Rad->GetSolution(iPoint,0));
538538
}
539539

540-
if (config->GetGrid_Movement()){
540+
if (config->GetDynamic_Grid()){
541541
SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel(iPoint)[0]);
542542
SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel(iPoint)[1]);
543543
if (nDim == 3)

‎SU2_CFD/src/output/CNEMOCompOutput.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ void CNEMOCompOutput::SetVolumeOutputFields(CConfig *config){
328328
AddVolumeOutput("MASSFRAC_" + std::to_string(iSpecies), "MassFrac_" + std::to_string(iSpecies), "AUXILIARY", "MassFrac_" + std::to_string(iSpecies));
329329

330330
// Grid velocity
331-
if (config->GetGrid_Movement()){
331+
if (config->GetDynamic_Grid()){
332332
AddVolumeOutput("GRID_VELOCITY-X", "Grid_Velocity_x", "GRID_VELOCITY", "x-component of the grid velocity vector");
333333
AddVolumeOutput("GRID_VELOCITY-Y", "Grid_Velocity_y", "GRID_VELOCITY", "y-component of the grid velocity vector");
334334
if (nDim == 3 )
@@ -471,7 +471,7 @@ void CNEMOCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
471471
break;
472472
}
473473

474-
if (config->GetGrid_Movement()){
474+
if (config->GetDynamic_Grid()){
475475
SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel(iPoint)[0]);
476476
SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel(iPoint)[1]);
477477
if (nDim == 3)

‎SU2_PY/FSI_tools/FSIInterface.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,10 +1924,6 @@ def UnsteadyFSI(self,FSI_config, FluidSolver, SolidSolver):
19241924
#If restart
19251925
if FSI_config['RESTART_SOL'] == 'YES':
19261926
TimeIterTreshold = -1
1927-
self.MPIPrint("Reading the modal amplitudes at time n-1")
1928-
if myid in self.solidSolverProcessors:
1929-
SolidSolver.setRestart('nM1')
1930-
SolidSolver.setRestart('n')
19311927
self.getSolidInterfaceDisplacement(SolidSolver)
19321928
self.displacementPredictor(FSI_config, SolidSolver, deltaT)
19331929
# We need now to update the solution because both restarter functions (solid and fluid)
@@ -1956,7 +1952,8 @@ def UnsteadyFSI(self,FSI_config, FluidSolver, SolidSolver):
19561952

19571953
if TimeIter > TimeIterTreshold:
19581954
NbFSIIter = NbFSIIterMax
1959-
self.MPIPrint('\n*************** Enter Block Gauss Seidel (BGS) method for strong coupling FSI on time iteration {} ***************'.format(TimeIter))
1955+
self.MPIPrint("\n")
1956+
self.MPIPrint(" Enter Block Gauss Seidel (BGS) method for strong coupling FSI on time iteration {} ".format(TimeIter).center(80,"*"))
19601957
else:
19611958
NbFSIIter = 1
19621959

@@ -2069,7 +2066,8 @@ def SteadyFSI(self, FSI_config,FluidSolver, SolidSolver):
20692066
self.MPIPrint('\n********************************')
20702067
self.MPIPrint('* Begin steady FSI computation *')
20712068
self.MPIPrint('********************************\n')
2072-
self.MPIPrint('\n*************** Enter Block Gauss Seidel (BGS) method for strong coupling FSI ***************')
2069+
self.MPIPrint("\n")
2070+
self.MPIPrint(" Enter Block Gauss Seidel (BGS) method for strong coupling FSI ".center(80,"*"))
20732071

20742072
self.MPIPrint('Setting initial deformed mesh')
20752073
if myid in self.solidSolverProcessors:

‎SU2_PY/FSI_tools/FSI_config.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def __init__(self,FileName):
5656
self.ConfigFileName = FileName
5757
self._ConfigContent = {}
5858
self.readConfig()
59+
self.applyDefaults()
5960

6061
def __str__(self):
6162
tempString = str()
@@ -119,3 +120,8 @@ def readConfig(self):
119120
if case():
120121
print(this_param + " is an invalid option !")
121122
break
123+
124+
def applyDefaults(self):
125+
if self._ConfigContent["CSD_SOLVER"] == "IMPOSED":
126+
self._ConfigContent["AITKEN_RELAX"] = "STATIC"
127+
self._ConfigContent["AITKEN_PARAM"] = 1.0

0 commit comments

Comments
 (0)