Skip to content
Snippets Groups Projects
Commit 74fd9bbc authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix compile

parent c34663e3
No related branches found
No related tags found
No related merge requests found
...@@ -97,9 +97,9 @@ void elasticitySolver::exportKb() ...@@ -97,9 +97,9 @@ void elasticitySolver::exportKb()
void elasticitySolver::solve() void elasticitySolver::solve()
{ {
//linearSystemFull<double> *lsys = new linearSystemFull<double>; //linearSystemFull<double> *lsys = new linearSystemFull<double>;
#if defined(HAVE_TAUCS) #if defined(HAVE_TAUCS)
linearSystemCSRTaucs<double> *lsys = new linearSystemCSRTaucs<double>; linearSystemCSRTaucs<double> *lsys = new linearSystemCSRTaucs<double>;
#elif defined(HAVE_PETSC) #elif defined(HAVE_PETSC)
...@@ -423,6 +423,9 @@ void elasticitySolver::assemble(linearSystem<double> *lsys) ...@@ -423,6 +423,9 @@ void elasticitySolver::assemble(linearSystem<double> *lsys)
} }
void elasticitySolver::getSolutionOnElement (MElement *el, fullMatrix<double> &sol) {
}
#if defined(HAVE_POST) #if defined(HAVE_POST)
static void deformation(dofManager<double> *a, MElement *e, static void deformation(dofManager<double> *a, MElement *e,
...@@ -453,7 +456,7 @@ static void deformation(dofManager<double> *a, MElement *e, ...@@ -453,7 +456,7 @@ static void deformation(dofManager<double> *a, MElement *e,
static double vonMises(dofManager<double> *a, MElement *e, static double vonMises(dofManager<double> *a, MElement *e,
double u, double v, double w, double u, double v, double w,
double E, double nu, int _tag){ double E, double nu, int _tag){
double valx[256]; double valx[256];
double valy[256]; double valy[256];
double valz[256]; double valz[256];
...@@ -488,10 +491,6 @@ static double vonMises(dofManager<double> *a, MElement *e, ...@@ -488,10 +491,6 @@ static double vonMises(dofManager<double> *a, MElement *e,
return ComputeVonMises(s); return ComputeVonMises(s);
} }
void elasticitySolver::getSolutionOnElement (MElement *el, fullMatrix<double> &sol) {
}
PView* elasticitySolver::buildDisplacementView (const std::string postFileName) PView* elasticitySolver::buildDisplacementView (const std::string postFileName)
{ {
std::cout << "build Displacement View"<< std::endl; std::cout << "build Displacement View"<< std::endl;
...@@ -553,7 +552,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName) ...@@ -553,7 +552,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName)
MElement *e=*it; MElement *e=*it;
int nbVertex = e->getNumVertices(); int nbVertex = e->getNumVertices();
std::vector<SVector3> val(nbVertex); std::vector<SVector3> val(nbVertex);
double valx[256]; double valx[256];
double valy[256]; double valy[256];
double valz[256]; double valz[256];
...@@ -565,7 +564,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName) ...@@ -565,7 +564,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName)
valy[k] =val[k](1); valy[k] =val[k](1);
valz[k] =val[k](2); valz[k] =val[k](2);
} }
double gradux[3]; double gradux[3];
double graduy[3]; double graduy[3];
double graduz[3]; double graduz[3];
...@@ -578,7 +577,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName) ...@@ -578,7 +577,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName)
0.5 * (gradux[1] + graduy[0]), 0.5 * (gradux[1] + graduy[0]),
0.5 * (gradux[2] + graduz[0]), 0.5 * (gradux[2] + graduz[0]),
0.5 * (graduy[2] + graduz[1])}; 0.5 * (graduy[2] + graduz[1])};
double A = E / (1. + nu); double A = E / (1. + nu);
double B = A * (nu / (1. - 2 * nu)); double B = A * (nu / (1. - 2 * nu));
...@@ -592,7 +591,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName) ...@@ -592,7 +591,7 @@ PView* elasticitySolver::buildStressesView (const std::string postFileName)
std::vector<double> vec(9); std::vector<double> vec(9);
vec[0]=sxx; vec[1]=sxy; vec[2]=sxz; vec[3]=sxy; vec[4]=syy; vec[5]=syz; vec[6]=sxz; vec[7]=syz; vec[8]=szz; vec[0]=sxx; vec[1]=sxy; vec[2]=sxz; vec[3]=sxy; vec[4]=syy; vec[5]=syz; vec[6]=sxz; vec[7]=syz; vec[8]=szz;
data[e->getNum()]=vec; data[e->getNum()]=vec;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment