Skip to content

[WIP] pyBeam integration into SU2 as a subproject #902

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

Closed
rsanfer wants to merge 33 commits into from
Closed

[WIP] pyBeam integration into SU2 as a subproject #902

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
cdfa986
Add pyBeam as a subproject.
rsanfer Oct 23, 2019
a485c71
Moved folder.
rsanfer Oct 24, 2019
0dd3dd3
Modify FSIInterface file.
rsanfer Oct 24, 2019
abfdcbc
Rename to primal interface.
rsanfer Oct 24, 2019
e3c00ae
Modify FSI_config.py
rsanfer Oct 24, 2019
126558a
Remove unsupported file.
rsanfer Oct 24, 2019
8817151
Rearrange files.
rsanfer Oct 24, 2019
79c7fbe
Modify FSI_Config
rsanfer Oct 24, 2019
3bb4d68
Remove unnecessary folder.
rsanfer Oct 24, 2019
1475024
Add executable python files to run FSI cases with pyBeam.
rsanfer Oct 24, 2019
4404e70
Add interface class that handles adjoint FSI synchronisation and comm…
rsanfer Oct 24, 2019
9ff4c18
Move if statement inside the MainRecording routine.
rsanfer Oct 24, 2019
064bcd3
Add python files to compilation.
rsanfer Oct 24, 2019
ff939ab
Remove some extra outputs.
rsanfer Oct 24, 2019
97652a7
Minor change.
rsanfer Oct 24, 2019
897700c
Add primal and adjoint test cases.
rsanfer Oct 24, 2019
099befd
Merged with develop.
rsanfer Nov 6, 2019
511d370
Merge branch 'develop' into feature_pyBeam
rsanfer Jan 10, 2020
d40062f
Merge branch 'develop' of github.com:su2code/SU2 into feature_pyBeam
rsanfer Jan 16, 2020
f18d2e3
Added files for adjoint FSI test case.
rsanfer Jan 16, 2020
2816406
Added pyBeam to automatic update of git submodules during install.
rsanfer Jan 16, 2020
a168f72
Update pybeam.
rsanfer Jan 16, 2020
a9b8ed6
Minor fix to add convert_to_csv script to path.
rsanfer Jan 16, 2020
161a589
Update subproject to master branch of pyBeam.
rsanfer Jan 16, 2020
1759809
Update meson script to install correct version of pyBeam.
rsanfer Jan 16, 2020
7472dad
Merge branch 'develop' into feature_pyBeam
rsanfer Mar 5, 2020
469bf11
Update solution files.
rsanfer Mar 5, 2020
90b44cf
Reviewed according to suggestions for PR
May 11, 2020
a93a2bf
Merge branch 'develop' into feature_pyBeam
pcarruscag Dec 10, 2020
2dd7d7a
remove large files
pcarruscag Dec 10, 2020
521dfcf
Merge branch 'develop' into feature_pyBeam
pcarruscag Dec 11, 2020
85a0d89
small fixes
pcarruscag Dec 11, 2020
17a5575
fix meson.build
pcarruscag Dec 11, 2020
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: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
[submodule "externals/meson"]
path = externals/meson
url = https://github.com/mesonbuild/meson
[submodule "subprojects/pyBeam"]
path = subprojects/pyBeam
url = https://github.com/pyBeam/pyBeam
19 changes: 9 additions & 10 deletions SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,7 @@ void CDiscAdjSinglezoneDriver::Preprocess(unsigned long TimeIter) {
*--- respect to the conservative variables. Since these derivatives do not change in the steady state case
*--- we only have to record if the current recording is different from the main variables. ---*/

if (RecordingState != MainVariables){

MainRecording();

}
MainRecording();

}

Expand Down Expand Up @@ -536,14 +532,17 @@ void CDiscAdjSinglezoneDriver::Print_DirectResidual(unsigned short kind_recordin

void CDiscAdjSinglezoneDriver::MainRecording(){

/*--- SetRecording stores the computational graph on one iteration of the direct problem. Calling it with NONE
* as argument ensures that all information from a previous recording is removed. ---*/
if (RecordingState != MainVariables){

SetRecording(NONE);
/*--- SetRecording stores the computational graph on one iteration of the direct problem. Calling it with NONE
* as argument ensures that all information from a previous recording is removed. ---*/

/*--- Store the computational graph of one direct iteration with the conservative variables as input. ---*/
SetRecording(NONE);

SetRecording(MainVariables);
/*--- Store the computational graph of one direct iteration with the conservative variables as input. ---*/

SetRecording(MainVariables);
}

}

Expand Down
29 changes: 5 additions & 24 deletions SU2_CFD/src/solvers/CMeshSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,45 +645,26 @@ void CMeshSolver::SetBoundaryDisplacements(CGeometry *geometry, CNumerics *numer

unsigned short iMarker;

/*--- Impose zero displacements of all non-moving surfaces (also at nodes in multiple moving/non-moving boundaries). ---*/
/*--- Exceptions: symmetry plane, the receive boundaries and periodic boundaries should get a different treatment. ---*/
/*--- Impose zero displacements of all non-moving surfaces that are not MARKER_DEFORM_SYM_PLANE. ---*/
for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
if ((config->GetMarker_All_Deform_Mesh(iMarker) == NO) &&
(config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == NO) &&
(config->GetMarker_All_Moving(iMarker) == NO) &&
(config->GetMarker_All_KindBC(iMarker) != SYMMETRY_PLANE) &&
(config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE) &&
(config->GetMarker_All_KindBC(iMarker) != PERIODIC_BOUNDARY)) {
(config->GetMarker_All_KindBC(iMarker) != INTERNAL_BOUNDARY) &&
(config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE)) {

BC_Clamped(geometry, numerics, config, iMarker);
}
}

/*--- Symmetry plane is clamped, for now. ---*/
for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
if ((config->GetMarker_All_Deform_Mesh(iMarker) == NO) &&
(config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == NO) &&
(config->GetMarker_All_Moving(iMarker) == NO) &&
(config->GetMarker_All_KindBC(iMarker) == SYMMETRY_PLANE)) {

BC_Clamped(geometry, numerics, config, iMarker);
}
}


/*--- Impose displacement boundary conditions. ---*/
/*--- Impose displacement boundary conditions and symmetry. ---*/
for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
if ((config->GetMarker_All_Deform_Mesh(iMarker) == YES) ||
(config->GetMarker_All_Moving(iMarker) == YES)) {

BC_Deforming(geometry, numerics, config, iMarker);
}
}


/*--- Symmetry deform plane is not clamped ---*/
for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
if (config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == YES) {
else if (config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == YES) {

BC_Sym_Plane(geometry, numerics, config, iMarker);
}
Expand Down
18 changes: 4 additions & 14 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 @@ -5,22 +5,12 @@
# \authors Nicola Fonzi, Vittorio Cavalieri based on the work of David Thomas
# \version 7.0.8 "Blackbird"
#
# The current SU2 release has been coordinated by the
# SU2 International Developers Society <www.su2devsociety.org>
# with selected contributions from the open-source community.
# SU2 Project Website: https://su2code.github.io
#
# The main research teams contributing to the current release are:
# - Prof. Juan J. Alonso's group at Stanford University.
# - Prof. Piero Colonna's group at Delft University of Technology.
# - Prof. Nicolas R. Gauger's group at Kaiserslautern University of Technology.
# - Prof. Alberto Guardone's group at Polytechnic University of Milan.
# - Prof. Rafael Palacios' group at Imperial College London.
# - Prof. Vincent Terrapon's group at the University of Liege.
# - Prof. Edwin van der Weide's group at the University of Twente.
# - Lab. of New Concepts in Aeronautics at Tech. Institute of Aeronautics.
# The SU2 Project is maintained by the SU2 Foundation
# (http://su2foundation.org)
#
# Copyright 2012-2020, Francisco D. Palacios, Thomas D. Economon,
# Tim Albring, and the SU2 contributors.
# Copyright 2012-2020, SU2 Contributors (cf. AUTHORS.md)
#
# SU2 is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand Down
Loading