Skip to content

Small update of the python fsi interface #1148

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

Merged
Nicola-Fonzi merged 33 commits into from
Jan 27, 2021
Merged

Small update of the python fsi interface #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
db79055
Introduced more general treatment of forcing
Dec 20, 2020
f522bb5
Small bug in for statement
Dec 21, 2020
aa2eb23
Small bug with variable name
Dec 21, 2020
4ebf81b
Fixing switch statement
Dec 21, 2020
3a8044a
Introduced blended step
Dec 21, 2020
97247db
Introduced compute_polar_modes.py
Dec 21, 2020
2f63738
Small bug with time
Dec 22, 2020
a1e4a50
Removed and installed compute_polar_modes
Dec 22, 2020
3bb57d0
Added comment, later to be removed
Dec 22, 2020
61a38c1
Couple of modifications related to old treatment of iterations
Dec 27, 2020
76f1971
Removed unrequired output
Dec 27, 2020
2d97cfb
Test case for regression
Dec 29, 2020
15ddc06
Merge remote-tracking branch 'upstream/develop' into publish
Dec 29, 2020
ab36f35
Modifications for code factor
Dec 29, 2020
9b94b0d
Removed unrequired file
Dec 29, 2020
0a4b679
Removed unrequired meson line
Dec 29, 2020
d6a10d7
Corrected headers
Dec 29, 2020
b741878
Removed unrequired options
Dec 29, 2020
0b38cd0
Better handling of errors
Dec 29, 2020
97f43e1
Improved output
Dec 29, 2020
c999648
Merge branch 'develop' into publish
Nicola-Fonzi Jan 4, 2021
a2a10c6
Merge branch 'develop' into publish
Nicola-Fonzi Jan 8, 2021
35cec33
Debug ParMETIS
Jan 12, 2021
80f2188
Debug ParMETIS 2
Jan 12, 2021
ab406ac
Removed Debug
Jan 12, 2021
eff5051
Merge branch 'develop' into publish
Nicola-Fonzi Jan 15, 2021
1f2eb89
Merge branch 'develop' into publish
Nicola-Fonzi Jan 25, 2021
1892518
Removed py_su2_nastran test case
Jan 25, 2021
9459d39
Grid velocities printed also for deform_mesh case
Jan 25, 2021
defcfe7
Fixed restart and applied defaults
Jan 25, 2021
f3c2ef6
Grid velocities for compressible case output
Jan 25, 2021
72f1ff6
Better handling of multiple imposed motions
Jan 25, 2021
407af27
Merge branch 'develop' into publish
Nicola-Fonzi Jan 27, 2021
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
3 changes: 1 addition & 2 deletions Common/src/CConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3377,7 +3377,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
if ((TimeMarching == TIME_STEPPING ||
TimeMarching == DT_STEPPING_1ST ||
TimeMarching == DT_STEPPING_2ND) && !Time_Domain){
SU2_MPI::Error("TIME_DOMAIN must be set to YES if UNSTEADY_SIMULATION is "
SU2_MPI::Error("TIME_DOMAIN must be set to YES if TIME_MARCHING is "
"TIME_STEPPING, DUAL_TIME_STEPPING-1ST_ORDER or DUAL_TIME_STEPPING-2ND_ORDER", CURRENT_FUNCTION);
}

Expand Down Expand Up @@ -6285,7 +6285,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
if (TimeMarching == DT_STEPPING_2ND) cout << "Unsteady simulation, dual time stepping strategy (second order in time)."<< endl;
if (Unst_CFL != 0.0) cout << "Time step computed by the code. Unsteady CFL number: " << Unst_CFL <<"."<< endl;
else cout << "Unsteady time step provided by the user (s): "<< Delta_UnstTime << "." << endl;
cout << "Total number of internal Dual Time iterations: "<< InnerIter <<"." << endl;
Copy link
Member

@pcarruscag pcarruscag Dec 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this output not relevant?

Copy link
Contributor Author

@Nicola-Fonzi Nicola-Fonzi Dec 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is redundant as the number of inner iterations are displayed in any case. Plus, the number of inner iterations is actually nInnerIter, thus that output always display Total number of internal Dual Time iterations: 0
Is it maybe a legacy of old implementations?

break;
}
}
Expand Down
3 changes: 1 addition & 2 deletions Common/src/geometry/CGeometry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2520,7 +2520,7 @@ void CGeometry::UpdateGeometry(CGeometry **geometry_container, CConfig *config)

geometry_container[MESH_0]->InitiateComms(geometry_container[MESH_0], config, COORDINATES);
geometry_container[MESH_0]->CompleteComms(geometry_container[MESH_0], config, COORDINATES);
if (config->GetGrid_Movement() || config->GetDynamic_Grid()){
if (config->GetDynamic_Grid()){
geometry_container[MESH_0]->InitiateComms(geometry_container[MESH_0], config, GRID_VELOCITY);
geometry_container[MESH_0]->CompleteComms(geometry_container[MESH_0], config, GRID_VELOCITY);
}
Expand Down Expand Up @@ -3961,4 +3961,3 @@ void CGeometry::ComputeWallDistance(const CConfig* const* config_container, CGeo
}
}
}

3 changes: 1 addition & 2 deletions SU2_CFD/src/output/CAdjFlowIncOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ void CAdjFlowIncOutput::SetVolumeOutputFields(CConfig *config){
/// END_GROUP

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

}

6 changes: 3 additions & 3 deletions SU2_CFD/src/output/CFlowCompOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOu
requestedVolumeFields.emplace_back("COORDINATES");
requestedVolumeFields.emplace_back("SOLUTION");
requestedVolumeFields.emplace_back("PRIMITIVE");
if (config->GetGrid_Movement()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
if (config->GetDynamic_Grid()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
nRequestedVolumeFields = requestedVolumeFields.size();
}

Expand Down Expand Up @@ -315,7 +315,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
}

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

if (config->GetGrid_Movement()){
if (config->GetDynamic_Grid()){
SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel(iPoint)[0]);
SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel(iPoint)[1]);
if (nDim == 3)
Expand Down
6 changes: 3 additions & 3 deletions SU2_CFD/src/output/CFlowIncOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
requestedVolumeFields.emplace_back("COORDINATES");
requestedVolumeFields.emplace_back("SOLUTION");
requestedVolumeFields.emplace_back("PRIMITIVE");
if (config->GetGrid_Movement()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
if (config->GetDynamic_Grid()) requestedVolumeFields.emplace_back("GRID_VELOCITY");
nRequestedVolumeFields = requestedVolumeFields.size();
}

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

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

if (config->GetGrid_Movement()){
if (config->GetDynamic_Grid()){
SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel(iPoint)[0]);
SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel(iPoint)[1]);
if (nDim == 3)
Expand Down
4 changes: 2 additions & 2 deletions SU2_CFD/src/output/CNEMOCompOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ void CNEMOCompOutput::SetVolumeOutputFields(CConfig *config){
AddVolumeOutput("MASSFRAC_" + std::to_string(iSpecies), "MassFrac_" + std::to_string(iSpecies), "AUXILIARY", "MassFrac_" + std::to_string(iSpecies));

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

if (config->GetGrid_Movement()){
if (config->GetDynamic_Grid()){
SetVolumeOutputValue("GRID_VELOCITY-X", iPoint, Node_Geo->GetGridVel(iPoint)[0]);
SetVolumeOutputValue("GRID_VELOCITY-Y", iPoint, Node_Geo->GetGridVel(iPoint)[1]);
if (nDim == 3)
Expand Down
10 changes: 4 additions & 6 deletions SU2_PY/FSI_tools/FSIInterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1924,10 +1924,6 @@ def UnsteadyFSI(self,FSI_config, FluidSolver, SolidSolver):
#If restart
if FSI_config['RESTART_SOL'] == 'YES':
TimeIterTreshold = -1
self.MPIPrint("Reading the modal amplitudes at time n-1")
if myid in self.solidSolverProcessors:
SolidSolver.setRestart('nM1')
SolidSolver.setRestart('n')
self.getSolidInterfaceDisplacement(SolidSolver)
self.displacementPredictor(FSI_config, SolidSolver, deltaT)
# We need now to update the solution because both restarter functions (solid and fluid)
Expand Down Expand Up @@ -1956,7 +1952,8 @@ def UnsteadyFSI(self,FSI_config, FluidSolver, SolidSolver):

if TimeIter > TimeIterTreshold:
NbFSIIter = NbFSIIterMax
self.MPIPrint('\n*************** Enter Block Gauss Seidel (BGS) method for strong coupling FSI on time iteration {} ***************'.format(TimeIter))
self.MPIPrint("\n")
self.MPIPrint(" Enter Block Gauss Seidel (BGS) method for strong coupling FSI on time iteration {} ".format(TimeIter).center(80,"*"))
else:
NbFSIIter = 1

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

self.MPIPrint('Setting initial deformed mesh')
if myid in self.solidSolverProcessors:
Expand Down
6 changes: 6 additions & 0 deletions SU2_PY/FSI_tools/FSI_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def __init__(self,FileName):
self.ConfigFileName = FileName
self._ConfigContent = {}
self.readConfig()
self.applyDefaults()

def __str__(self):
tempString = str()
Expand Down Expand Up @@ -119,3 +120,8 @@ def readConfig(self):
if case():
print(this_param + " is an invalid option !")
break

def applyDefaults(self):
if self._ConfigContent["CSD_SOLVER"] == "IMPOSED":
self._ConfigContent["AITKEN_RELAX"] = "STATIC"
self._ConfigContent["AITKEN_PARAM"] = 1.0
Loading