Skip to content
Snippets Groups Projects
Commit e476b7a3 authored by Adrien Crovato's avatar Adrien Crovato
Browse files

Merge branch 'adri' into feat/xsonic

parents 08e282ee a311999e
No related branches found
No related tags found
1 merge request!3Version 1.2
Pipeline #21958 passed
Hide whitespace changes
Inline Side-by-side
sdpm/src/sdpmSolver.cpp
+ 1
− 5
View file @ e476b7a3
...@@ -63,7 +63,6 @@ Solver::Solver(Problem &pbl) : _pbl(pbl), _cl(0), _cd(0), _cs(0), _cm(0) ...@@ -63,7 +63,6 @@ Solver::Solver(Problem &pbl) : _pbl(pbl), _cl(0), _cd(0), _cs(0), _cm(0)
_B.resize(nf, sdpmMatrixXcd::Zero(_nP, _nP)); _B.resize(nf, sdpmMatrixXcd::Zero(_nP, _nP));
// Set up variables // Set up variables
_phi.resize(ne, 0.);
_tau.resize(ne, 0.); _tau.resize(ne, 0.);
_mu.resize(ne, 0.); _mu.resize(ne, 0.);
_u.resize(ne, sdpmVector3d::Zero()); _u.resize(ne, sdpmVector3d::Zero());
...@@ -326,7 +325,6 @@ void Solver::save(GmshExport const &writer, std::string const &suffix) ...@@ -326,7 +325,6 @@ void Solver::save(GmshExport const &writer, std::string const &suffix)
// set up results // set up results
Results results; Results results;
// steady // steady
results.scalarsAtElems["phi"] = &_phi;
results.scalarsAtElems["mu"] = &_mu; results.scalarsAtElems["mu"] = &_mu;
results.scalarsAtElems["tau"] = &_tau; results.scalarsAtElems["tau"] = &_tau;
results.vectorsAtElems["u"] = &_u; results.vectorsAtElems["u"] = &_u;
...@@ -407,8 +405,7 @@ void Solver::save(GmshExport const &writer, std::string const &suffix) ...@@ -407,8 +405,7 @@ void Solver::save(GmshExport const &writer, std::string const &suffix)
*/ */
void Solver::post(sdpmVectorXd const &etau, sdpmVectorXd const &emu) void Solver::post(sdpmVectorXd const &etau, sdpmVectorXd const &emu)
{ {
// Store source and doublet strength and compute perturbation potential on elements // Store source and doublet strength on elements
sdpmVectorXd ephi = -_A0 * emu - _B0 * etau;
std::vector<Body *> bodies = _pbl.getBodies(); std::vector<Body *> bodies = _pbl.getBodies();
for (auto body : bodies) for (auto body : bodies)
{ {
...@@ -418,7 +415,6 @@ void Solver::post(sdpmVectorXd const &etau, sdpmVectorXd const &emu) ...@@ -418,7 +415,6 @@ void Solver::post(sdpmVectorXd const &etau, sdpmVectorXd const &emu)
int i = _rows[e]; int i = _rows[e];
_tau[id] = etau(i); _tau[id] = etau(i);
_mu[id] = emu(i); _mu[id] = emu(i);
_phi[id] = ephi(i);
} }
} }
......
sdpm/src/sdpmSolver.h
+ 1
− 2
View file @ e476b7a3
...@@ -46,9 +46,8 @@ protected: ...@@ -46,9 +46,8 @@ protected:
private: private:
// Solution // Solution
std::vector<sdpmDouble> _phi; ///< perturbation potential
std::vector<sdpmDouble> _tau; ///< source strength std::vector<sdpmDouble> _tau; ///< source strength
std::vector<sdpmDouble> _mu; ///< doublet strength std::vector<sdpmDouble> _mu; ///< doublet strength (perturbation potential)
std::vector<sdpmVector3d> _u; ///< steady velocity std::vector<sdpmVector3d> _u; ///< steady velocity
std::vector<sdpmDouble> _cp; ///< steady pressure coefficient std::vector<sdpmDouble> _cp; ///< steady pressure coefficient
std::vector<std::vector<std::vector<sdpmVector3d>>> _u1Re; ///< real part of unsteady first harmonic velocity std::vector<std::vector<std::vector<sdpmVector3d>>> _u1Re; ///< real part of unsteady first harmonic velocity
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment