Skip to content
Snippets Groups Projects
Commit ff63a1ec authored by Nicolas Marsic's avatar Nicolas Marsic
Browse files

Removing concept of ElementData: not general enough -- Adding GroupOfJacobian:...

Removing concept of ElementData: not general enough -- Adding GroupOfJacobian: sexier -- Revert to by group assembly -- *BUT* weak() takes elementID: up to now use one sort at the beginning -- Need to fix that
parent 11687489
No related branches found
No related tags found
No related merge requests found
......@@ -82,13 +82,15 @@ void FunctionSpace::build(GroupOfElement& goe,
// Build Dof //
buildDof();
// Link with GroupOfElement for ordering //
//goe.link(*this);
}
void FunctionSpace::buildDof(void){
// Get Elements //
const unsigned int nElement = goe->getNumber();
const vector<pair<const MElement*, ElementData> >&
element = goe->getAll();
const vector<const MElement*>& element = goe->getAll();
// Init Struct //
dof = new set<const Dof*, DofComparator>;
......@@ -100,11 +102,11 @@ void FunctionSpace::buildDof(void){
// Create Dofs //
for(unsigned int i = 0; i < nElement; i++){
// Get Dof for this Element
vector<Dof> myDof = getKeys(*(element[i].first));
vector<Dof> myDof = getKeys(*(element[i]));
unsigned int nDof = myDof.size();
// Create new GroupOfDof
GroupOfDof* god = new GroupOfDof(nDof, *(element[i].first));
GroupOfDof* god = new GroupOfDof(nDof, *(element[i]));
(*group)[i] = god;
// Add Dof
......@@ -113,10 +115,7 @@ void FunctionSpace::buildDof(void){
// Map GOD
eToGod->insert(pair<const MElement*, const GroupOfDof*>
(element[i].first, god));
// Set in ElementData
goe->getElementData(i).setGroupOfDof(*god);
(element[i], god));
}
}
......
......@@ -37,6 +37,9 @@
Allow Hybrid Mesh
*/
class Mesh;
class GroupOfElement;
class FunctionSpace{
protected:
// Geometry //
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment