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.

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

Move FEM files #1001

Merged
merged 4 commits into from
May 25, 2020
Merged

Move FEM files #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a00bce2
move inline functions
pcarruscag May 24, 2020
c152fa3
move files
pcarruscag May 24, 2020
7dd940d
Merge branch 'develop' into move_fem_files
vdweide May 24, 2020
9c1aec0
Merge remote-tracking branch 'upstream/develop' into move_fem_files
pcarruscag May 25, 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
6 changes: 3 additions & 3 deletions Common/include/fem_cgns_elements.hpp → Common/include/fem/fem_cgns_elements.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* SU2 Project Website: https://su2code.github.io
*
* The SU2 Project is maintained by the SU2 Foundation
* The SU2 Project is maintained by the SU2 Foundation
* (http://su2foundation.org)
*
* Copyright 2012-2020, SU2 Contributors (cf. AUTHORS.md)
Expand All @@ -29,13 +29,13 @@

#pragma once

#include "./mpi_structure.hpp"
#include "../mpi_structure.hpp"

#ifdef HAVE_CGNS
#include "cgnslib.h"
#endif

#include "geometry/primal_grid/CPrimalGridFEM.hpp"
#include "../geometry/primal_grid/CPrimalGridFEM.hpp"

/* Forward declaration of CBoundaryFace to avoid problems. */
class CBoundaryFace;
Expand Down
23 changes: 5 additions & 18 deletions ...n/include/fem_gauss_jacobi_quadrature.hpp → ...clude/fem/fem_gauss_jacobi_quadrature.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SU2 Project Website: https://su2code.github.io
*
* The SU2 Project is maintained by the SU2 Foundation
* The SU2 Project is maintained by the SU2 Foundation
* (http://su2foundation.org)
*
* Copyright 2012-2020, SU2 Contributors (cf. AUTHORS.md)
Expand Down Expand Up @@ -63,16 +63,16 @@ Subject: Gauss-Jacobi Quadrature Code
Dear John,

I am the lead developer for the open-source SU2 suite, which is primarily for
computational fluid dynamics, but also for solving other PDE systems
computational fluid dynamics, but also for solving other PDE systems
(http://su2.stanford.edu, https://github.com/su2code/SU2). Over the past few months,
we have been working on a new high-order discontinuous Galerkin fluid solver within
the codebase, led by Prof. Edwin van der Weide at the University of Twente (cc’d).

We found your attached code to be very helpful in resolving some issues with integration
for our pyramid elements, and we would really like to reuse the implementation if possible.
First, we would like to check if this is ok with you personally, and ask how we can
First, we would like to check if this is ok with you personally, and ask how we can
properly attribute your work in the code? Second, we are curious just what version of the
GNU LGPL license you are using to make sure that we don’t have any licensing issues.
GNU LGPL license you are using to make sure that we don’t have any licensing issues.
For SU2, we are using GNU LGPL v2.1.

Thanks for the time and take care,
Expand All @@ -86,7 +86,7 @@ Tom
#include <cstdlib>
#include <vector>

#include "CConfig.hpp"
#include "../CConfig.hpp"

using namespace std;

Expand All @@ -99,17 +99,6 @@ using namespace std;
*/
class CGaussJacobiQuadrature {
public:

/*!
* \brief Constructor of the class, nothing to be done.
*/
CGaussJacobiQuadrature();

/*!
* \brief Destructor of the class, nothing to be done.
*/
~CGaussJacobiQuadrature();

/*!
* \brief Function, which serves as the API to compute the integration points
and weights.
Expand Down Expand Up @@ -186,5 +175,3 @@ class CGaussJacobiQuadrature {
void sgqf(int nt, const passivedouble aj[], passivedouble bj[], passivedouble zemu, passivedouble t[],
passivedouble wts[]);
};

#include "fem_gauss_jacobi_quadrature.inl"
Loading