Changeset 13909

Timestamp:

11/08/12 10:20:46 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: debugged matrix allocation for BedSlopes: confused between configuration_type and analysis_type

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (7 diffs)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/PentaHook.cpp (modified) (1 diff)
• objects/Elements/PentaHook.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -342 +342 @@
         int  fsize,ssize,flocalsize,slocalsize;
         int  connectivity, numberofdofspernode;
-        int  analysis_type,configuration_type;
+        int  configuration_type;
         int  m,n,M,N;
         int *d_nnz = NULL;
@@ -357 +357 @@
 
         /*retrieve parameters: */
-        this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         this->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
         this->parameters->FindParam(&connectivity,MeshAverageVertexConnectivityEnum);
@@ -364 +363 @@
         fsize      = this->nodes->NumberOfDofs(configuration_type,FsetEnum);
         ssize      = this->nodes->NumberOfDofs(configuration_type,SsetEnum);
-        flocalsize = this->nodes->NumberOfDofsLocal(analysis_type,FsetEnum);
-        slocalsize = this->nodes->NumberOfDofsLocal(analysis_type,SsetEnum);
+        flocalsize = this->nodes->NumberOfDofsLocal(configuration_type,FsetEnum);
+        slocalsize = this->nodes->NumberOfDofsLocal(configuration_type,SsetEnum);
 
         numberofdofspernode=this->nodes->MaxNumDofs(configuration_type,GsetEnum);
@@ -408 +407 @@
         /*Intermediary*/
         int      i,j,k,index,offset,count;
-        int      analysis_type,configuration_type;
+        int      configuration_type;
         int      d_nz,o_nz;
         Element *element      = NULL;
@@ -421 +420 @@
 
         /*retrive parameters: */
-        this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         this->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
         /*Get vector size and number of nodes*/
-        int numnodes            = nodes->NumberOfNodes(analysis_type);
+        int numnodes            = nodes->NumberOfNodes(configuration_type);
         int numberofdofspernode = nodes->MaxNumDofs(configuration_type,GsetEnum);
-        int M                   = nodes->NumberOfDofs(analysis_type,set1enum);
-        int N                   = nodes->NumberOfDofs(analysis_type,set2enum);
-        int m                   = nodes->NumberOfDofsLocal(analysis_type,set1enum);
-        int n                   = nodes->NumberOfDofsLocal(analysis_type,set2enum);
+        int M                   = nodes->NumberOfDofs(configuration_type,set1enum);
+        int N                   = nodes->NumberOfDofs(configuration_type,set2enum);
+        int m                   = nodes->NumberOfDofsLocal(configuration_type,set1enum);
+        int n                   = nodes->NumberOfDofsLocal(configuration_type,set2enum);
         int numnodesperobject   = elements->MaxNumNodes();
 
@@ -471 +469 @@
         for(i=0;i<nodes->Size();i++){
                 Node* node=dynamic_cast<Node*>(nodes->GetObjectByOffset(i));
-                if(node->InAnalysis(analysis_type)){
+                if(node->InAnalysis(configuration_type)){
 
                         /*Reinitialize flags to 0*/
@@ -509 +507 @@
                 for(i=0;i<nodes->Size();i++){
                         Node* node=dynamic_cast<Node*>(nodes->GetObjectByOffset(i));
-                        if(node->InAnalysis(analysis_type) && !node->IsClone()){
+                        if(node->InAnalysis(configuration_type) && !node->IsClone()){
                                 for(j=0;j<node->indexing.fsize;j++){
                                         _assert_(count<m);

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -904 +904 @@
 /*FUNCTION Penta::GetNumberOfNodes{{{*/
 int Penta::GetNumberOfNodes(void){
+
+        if(this->nodes==NULL) return 0;
 
         switch(this->element_type){

issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp

@@ -70 +70 @@
 void PentaHook::SetHookNodes(int* node_ids,int analysis_counter){
         this->hnodes[analysis_counter]= new Hook(node_ids,6);
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.h

@@ -13 +13 @@
 
         public: 
-                int   numanalyses; //number of analysis types
-                Hook** hnodes; // 6 nodes for each analysis type
-                Hook*  hmaterial; // 1 ice material
-                Hook*  hmatpar; // 1 material parameter
-                Hook*  hneighbors; // 2 elements, first down, second up
+                int    numanalyses;   //number of analysis types
+                Hook **hnodes;        // 6 nodes for each analysis type
+                Hook  *hmaterial;     // 1 ice material
+                Hook  *hmatpar;       // 1 material parameter
+                Hook  *hneighbors;    // 2 elements, first down, second up
 
-                /*FUNCTION constructors, destructors {{{*/
+                /*constructors, destructors*/
                 PentaHook();
                 PentaHook(int in_numanalyses,int material_id, IoModel* iomodel);
                 ~PentaHook();
+
                 void SetHookNodes(int* node_ids,int analysis_counter);
                 void SpawnTriaHook(TriaHook* triahook,int* indices);
                 void InitHookNeighbors(int* element_ids);
-                /*}}}*/
 };
 

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -1139 +1139 @@
 /*FUNCTION Tria::GetNumberOfNodes{{{*/
 int Tria::GetNumberOfNodes(void){
+
+        if(this->nodes==NULL) return 0;
 
         switch(this->element_type){