Skip to content
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.

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

Refactorization of SU2 Grid Deformation for Python #1300

Merged
merged 86 commits into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from 74 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
fc12471
[WIP] Add CDeformationDriver
aa-g May 19, 2021
2643405
Implement RunSolver()
aa-g May 21, 2021
907b5bf
Clean up CDeformationDriver implementation.
aa-g May 25, 2021
b983897
Minor fixes in CDeformationDriver
aa-g May 25, 2021
6facf5b
Add CDiscAdjDeformationDriver
aa-g Jun 1, 2021
bb2c030
Integrate CMeshSolver for mesh deformation based on linear elasticity…
aa-g Jun 22, 2021
29e4521
Merge branch 'develop' into feature_pysu2_DEF
aa-g Jun 22, 2021
c440148
Fix merge 29e45213f1c5c27db241da16665bebad41d20d4f
aa-g Jun 22, 2021
31c969e
Simplify cfd and cfd_ad library links
patelha57 Jun 22, 2021
169be9a
Add marker- and vertex-data getters and setters (+ minor fixes)
aa-g Jun 22, 2021
e818703
Remove nullptr checks, update AD register input code, minor code fixes
patelha57 Jun 22, 2021
fd95931
Remove redundant nullptr in CDeformationDriver
patelha57 Jun 28, 2021
7c77285
Merge develop
aa-g Jan 25, 2022
e6b60d8
Merge branch 'develop' into feature_pysu2_DEF
aa-g Jan 25, 2022
90dbc0d
Merge develop
aa-g Jan 25, 2022
1e2b91f
Updates for PR1300
patelha57 Feb 14, 2022
de94b6d
Introduce dependency of SU2_DOT on SU2_DEF
patelha57 Feb 14, 2022
1c57ad3
[WIP] Small fixes
aa-g Feb 14, 2022
342d3a2
Fix 'unknown module' SWIG warning for CDriverBase
patelha57 Feb 15, 2022
bfb175c
Fix small issues in getters, skip FFD output if not defined
aa-g Feb 16, 2022
1fdb837
Remove some code duplication and fix memory leaks
aa-g Feb 18, 2022
58dd971
Run clang-format on files
patelha57 Feb 20, 2022
d33515a
Merge 'develop' into branch 'feature_pysu2_DEF'
aa-g Feb 21, 2022
976408c
Fix dangling if statement in CDiscAdjDeformationDriver
aa-g Feb 21, 2022
1b4ba30
Fix py_wrapper tests broken by new Python interface
aa-g Mar 3, 2022
4a79c13
Implement overleaded getters/setter
aa-g Mar 7, 2022
fad776d
Adapt Python API to get/set from multi-dimensional arrays
aa-g Mar 7, 2022
5891d3e
Fix small inconsistencies in previous commit
aa-g Mar 7, 2022
59fdd2e
Fix conditional output of FFD information
aa-g Mar 7, 2022
4873aa2
Introduce 'main' Config and Geometry for Python API
aa-g Mar 7, 2022
881965b
Merge branch 'develop' into 'feature_pysu2_DEF'
aa-g Apr 4, 2022
6aa8018
Remove some functions and fix IDs in Get(Marker)?ElementConnectivities
aa-g Apr 4, 2022
3f02476
Fix small inconsistency in naming of Getters/Setters
aa-g Apr 11, 2022
259cf1c
Update CDeformationDriver
patelha57 Dec 9, 2022
44c24a5
Update CDiscAdjDeformationDriver
patelha57 Dec 9, 2022
30ea6c4
Update CDriverBase
patelha57 Dec 9, 2022
bb19bd0
Update SU2_DEF and SU2_DOT
patelha57 Dec 9, 2022
7b545bc
Add vector<unsigned short> template for Python wrapper
patelha57 Dec 9, 2022
8d4974f
Fix compilation error caused by hdf5 static library
patelha57 Dec 9, 2022
6fdb544
Merge 'develop' into 'feature_pysu2_DEF'
patelha57 Dec 9, 2022
23d03ca
Update submodule versions
patelha57 Dec 10, 2022
df160c0
Update CoDiPack submodule version
patelha57 Dec 10, 2022
3a8ddae
Apply clang format to CDriver.hpp
patelha57 Dec 10, 2022
3c3b4a5
Fix copyright dates
patelha57 Dec 10, 2022
23716f3
Add Python support for incompressible and NEMO solvers
patelha57 Dec 10, 2022
cd523cd
Add more boundary conditions for GetMarkerTypes()
patelha57 Dec 10, 2022
3ea9b55
Fix unused variable error in regression tests
patelha57 Dec 11, 2022
2d9720c
Merge remote-tracking branch 'origin/develop' into feature_pysu2_DEF
patelha57 Dec 11, 2022
8aa6a58
Update code documentation blocks in CDriver.hpp
patelha57 Dec 12, 2022
6ca249c
Merge branch 'develop' into feature_pysu2_DEF
WallyMaier Dec 13, 2022
4e5952d
Add error checks for FFD functions, fix FFD read segfault
patelha57 Dec 20, 2022
35eb6ad
Fix missing input argument in CDriverBase.cpp
patelha57 Dec 20, 2022
6a78da5
Merge remote-tracking branch 'origin/develop' into feature_pysu2_DEF
patelha57 Dec 20, 2022
68edc82
Fix FFD read error when there is no geometry file
patelha57 Dec 22, 2022
9ad958c
Update pysu2 function names in FSIInterface.py
patelha57 Dec 22, 2022
3b46ee0
Modify regression workflow
patelha57 Dec 23, 2022
a4450bb
Update pysu2 function names in translating NACA0012 test case
patelha57 Dec 23, 2022
57a7faf
Fix continuous adjoint solver error handling in CDiscAdjDeformationDr…
patelha57 Dec 23, 2022
5c1ec48
Move CDriverBase from Common to SU2_CFD
patelha57 Dec 28, 2022
50a2011
Remove 'drivers' subdirectory from meson build file in Common
patelha57 Dec 28, 2022
3c8f5cd
Remove pysu2 FFD functions from CDriverBase
patelha57 Dec 29, 2022
030030a
Apply clang format to python_wrapper_structure.cpp
patelha57 Dec 29, 2022
bf07e5b
Update SU2 version number
patelha57 Dec 29, 2022
adecd15
Remove ENABLE_MAPS from header files
patelha57 Dec 29, 2022
4353a26
Update function names in CDriverBase, fix variable designations
patelha57 Dec 30, 2022
0c61d0a
Fix maps build error, fix pysu2 dependency
patelha57 Dec 30, 2022
a447ae3
Update function names in FSIInterface.py and Python test cases
patelha57 Dec 30, 2022
93b4ac0
Fix segfault from accessing main_config and main_geometry
patelha57 Dec 30, 2022
bc9893c
Fix attribute error in translating NACA0012 pysu2 test case
patelha57 Dec 30, 2022
db4bce1
Merge 'develop' into 'feature_pysu2_DEF'
patelha57 Dec 31, 2022
c69ed92
Modify regression workflow
patelha57 Jan 4, 2023
531e6e0
Merge 'develop' into 'feature_pysu2_DEF'
patelha57 Jan 5, 2023
abe96de
Fix memory deallocation error in CDeformationDriver
patelha57 Jan 10, 2023
47b1966
Fix continuous adjoint solver errors in CDiscAdjDeformationDriver
patelha57 Jan 11, 2023
3ebd12b
Update CDriver.hpp
patelha57 Jan 11, 2023
b1c5ac6
Merge branch 'develop' into feature_pysu2_DEF
bigfooted Jan 13, 2023
1914164
Merge branch 'develop' into feature_pysu2_DEF
bigfooted Jan 22, 2023
898412c
Merge branch 'develop' into feature_pysu2_DEF
pcarruscag Jan 30, 2023
a9a5527
Merge branch 'develop' into feature_pysu2_DEF
pcarruscag Feb 5, 2023
5f2e268
address boiler plate and return of global indices
pcarruscag Feb 5, 2023
cd1e820
2022 -> 2023
pcarruscag Feb 5, 2023
46fed4f
fix python scripts, remove mesh solver duplication
pcarruscag Feb 6, 2023
c2ec532
Merge branch 'develop' into feature_pysu2_DEF
bigfooted Feb 6, 2023
ee18960
Merge remote-tracking branch 'upstream/develop' into feature_pysu2_DEF
pcarruscag Feb 7, 2023
9965ffb
update version numbers
pcarruscag Feb 7, 2023
5f15454
Merge branch 'feature_pysu2_DEF' of https://github.com/su2code/SU2 in…
pcarruscag Feb 7, 2023
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
1 change: 1 addition & 0 deletions Common/include/geometry/primal_grid/CPrimalGrid.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#include <iostream>
#include <vector>
#include <limits>
patelha57 marked this conversation as resolved.
Show resolved Hide resolved
#include <cstdlib>
#include <limits>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion Common/include/grid_movement/CSurfaceMovement.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ class CSurfaceMovement : public CGridMovement {
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] val_mesh_filename - Name of the grid output file.
*/
void WriteFFDInfo(CSurfaceMovement **surface_movement, CGeometry **geometry, CConfig **config);
void WriteFFDInfo(CSurfaceMovement **surface_movement, CGeometry ****geometry, CConfig **config);

/*!
* \brief Get information about if there is a complete FFDBox definition, or it is necessary to
Expand Down
6 changes: 3 additions & 3 deletions Common/src/grid_movement/CSurfaceMovement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4672,7 +4672,7 @@ void CSurfaceMovement::MergeFFDInfo(CGeometry *geometry, CConfig *config) {

}

void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeometry **geometry, CConfig **config) {
void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeometry ****geometry, CConfig **config) {


unsigned short iOrder, jOrder, kOrder, iFFDBox, iCornerPoints, iParentFFDBox, iChildFFDBox, iZone;
Expand All @@ -4683,13 +4683,13 @@ void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeomet

bool polar = (config[ZONE_0]->GetFFD_CoordSystem() == POLAR);

unsigned short nDim = geometry[ZONE_0]->GetnDim();
unsigned short nDim = geometry[ZONE_0][INST_0][MESH_0]->GetnDim();

for (iZone = 0; iZone < config[ZONE_0]->GetnZone(); iZone++){

/*--- Merge the parallel FFD info ---*/

surface_movement[iZone]->MergeFFDInfo(geometry[iZone], config[iZone]);
surface_movement[iZone]->MergeFFDInfo(geometry[iZone][INST_0][MESH_0], config[iZone]);

if (iZone > 0){

Expand Down
441 changes: 171 additions & 270 deletions SU2_CFD/include/drivers/CDriver.hpp

Large diffs are not rendered by default.

Loading