Skip to content
Snippets Groups Projects
Commit 5b99ce78 authored by Jonathan Lambrechts's avatar Jonathan Lambrechts
Browse files

dg : remove functionCoordinates and functionParametricCoordinates

the coordinates are now a regular dgDofContainer. The corresponding function is obtained through dgGroupCollection::getCoordinatesFunction
parent dbc00a00
No related branches found
No related tags found
No related merge requests found
...@@ -90,36 +90,6 @@ function *function::getSolutionGradient() ...@@ -90,36 +90,6 @@ function *function::getSolutionGradient()
return functionSolutionGradient::get(); return functionSolutionGradient::get();
} }
// Get Parametric Coordinates + Additionnal class
class functionParametricCoordinates : public function {
static functionParametricCoordinates *_instance;
// constructor is private only 1 instance can exists, call get to
// access the instance
functionParametricCoordinates():function(0, false){}
public:
void call(dataCacheMap *m, fullMatrix<double> &sol)
{
Msg::Error("a function requires the parametric coordinates but this "
"algorithm does not provide the parametric coordinates");
throw;
}
static function *get()
{
if(!_instance)
_instance = new functionParametricCoordinates();
return _instance;
}
};
functionParametricCoordinates *functionParametricCoordinates::_instance = NULL;
function *function::getParametricCoordinates()
{
return functionParametricCoordinates::get();
}
// Get Normals + Additionnal class // Get Normals + Additionnal class
class functionNormals : public function { class functionNormals : public function {
...@@ -132,7 +102,6 @@ class functionNormals : public function { ...@@ -132,7 +102,6 @@ class functionNormals : public function {
{ {
Msg::Error("a function requires the normals coordinates but this " Msg::Error("a function requires the normals coordinates but this "
"algorithm does not provide the normals"); "algorithm does not provide the normals");
throw;
} }
static function *get() static function *get()
{ {
...@@ -600,44 +569,6 @@ function *functionMeanNew(const function *f0) { ...@@ -600,44 +569,6 @@ function *functionMeanNew(const function *f0) {
return new functionMean (f0); return new functionMean (f0);
} }
// functionCoordinates (get XYZ coordinates)
class functionCoordinates : public function {
static functionCoordinates *_instance;
fullMatrix<double> uvw;
void call (dataCacheMap *m, fullMatrix<double> &xyz)
{
for (int i = 0; i < uvw.size1(); i++) {
SPoint3 p;
m->getElement()->pnt(uvw(i, 0), uvw(i, 1), uvw(i, 2), p);
xyz(i, 0) = p.x();
xyz(i, 1) = p.y();
xyz(i, 2) = p.z();
}
}
functionCoordinates() : function(3)
{
// constructor is private only 1 instance can exists, call get to
// access the instance
setArgument(uvw, function::getParametricCoordinates());
};
public:
static function *get()
{
if(!_instance)
_instance = new functionCoordinates();
return _instance;
}
};
functionCoordinates *functionCoordinates::_instance = NULL;
function *getFunctionCoordinates()
{
return functionCoordinates::get();
}
// functionStructuredGridFile // functionStructuredGridFile
class functionStructuredGridFile : public function { class functionStructuredGridFile : public function {
......
...@@ -73,7 +73,6 @@ class function { ...@@ -73,7 +73,6 @@ class function {
static functionConstant *getDT(); static functionConstant *getDT();
static function *getSolution(); static function *getSolution();
static function *getSolutionGradient(); static function *getSolutionGradient();
static function *getParametricCoordinates();
static function *getNormals(); static function *getNormals();
void printDep() void printDep()
{ {
...@@ -295,7 +294,4 @@ function *functionScaleNew (const function *f0, const double s); ...@@ -295,7 +294,4 @@ function *functionScaleNew (const function *f0, const double s);
function *functionExtractCompNew (const function *f0, const int iComp); function *functionExtractCompNew (const function *f0, const int iComp);
function *functionCatCompNew(std::vector<const function *> fArray); function *functionCatCompNew(std::vector<const function *> fArray);
function *functionMeanNew(const function *f0); function *functionMeanNew(const function *f0);
function *getFunctionCoordinates();
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment