source: issm/oecreview/Archive/24684-25833/ISSM-25485-25486.diff@ 25834

../trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp

@@ -35 +35 @@
 
         numberofdofspernode=femmodel->nodes->MaxNumDofs(GsetEnum);
 
-        /*if our matrices are coming from issm, we don't do dynamic allocation like Petsc 
+        /*if our matrices are coming from issm, we don't do dynamic allocation like Petsc
          * does, and this routine is essentially useless. Force standard alloc in this case: */
         toolkittype=ToolkitOptions::GetToolkitType();
 
@@ -117 +117 @@
         int numnodesperelement  = femmodel->elements->MaxNumNodes();
         int numnodesperload     = femmodel->loads->MaxNumNodes();
 
+        int elementssize        = femmodel->elements->Size();
+        int loadssize           = femmodel->loads->Size();
         /*First, we are building chaining vectors so that we know what nodes are
          * connected to what elements. These vectors are such that:
          *   for(int i=head[id];i!=-1;i=next[i])
@@ -123 +125 @@
          * will loop over all the elements that are connected to the node number
          * id*/
         head_e         = xNew<int>(localnumnodes); for(i=0;i<localnumnodes;i++) head_e[i]=-1;
-        next_e         = xNew<int>(femmodel->elements->Size()*numnodesperelement);
-        count2offset_e = xNew<int>(femmodel->elements->Size()*numnodesperelement);
+        next_e         = xNew<int>(elementssize*numnodesperelement);
+        count2offset_e = xNew<int>(elementssize*numnodesperelement);
 
         k=0;
-        for(i=0;i<femmodel->elements->Size();i++){
+        for(i=0;i<elementssize;i++){
                 element = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 int elementnumnodes = element->GetNumberOfNodes();
                 lidlist = xNew<int>(elementnumnodes);
@@ -148 +150 @@
 
         /*Chain for loads*/
         head_l         = xNew<int>(localnumnodes); for(i=0;i<localnumnodes;i++) head_l[i]=-1;
-        next_l         = xNew<int>(femmodel->loads->Size()*numnodesperload);
-        count2offset_l = xNew<int>(femmodel->loads->Size()*numnodesperload);
+        next_l         = xNew<int>(loadssize*numnodesperload);
+        count2offset_l = xNew<int>(loadssize*numnodesperload);
         k=0;
-        for(i=0;i<femmodel->loads->Size();i++){
+        for(i=0;i<loadssize;i++){
                 load = xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
                 int loadnumnodes = load->GetNumberOfNodes();
                 lidlist = xNew<int>(loadnumnodes);
@@ -176 +178 @@
         int  *d_connectivity       = xNewZeroInit<int>(localnumnodes);
         int  *o_connectivity       = xNewZeroInit<int>(localnumnodes);
         int   flagsindices_counter;
+        int   analysis_type;
 
         Vector<IssmDouble> *connectivity_clone= new Vector<IssmDouble>(localmasters,numnodes);
 
+        femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         /*Resetting flags to false at each iteration takes a lot of time, so we keep track of the flags
          * to reset in flagsindices, initialized with -1*/
         for(i = 0;i<localnumnodes;i++) flags[i]        = false;
@@ -189 +193 @@
                 Node* node=xDynamicCast<Node*>(femmodel->nodes->GetObjectByOffset(i));
                 int   lid = node->Lid();
                 int   pid = node->Pid();
-
                 /*Reinitialize flags to false*/
                 j=0;
                 while(j<localnumnodes){
@@ -207 +210 @@
                 for(j=head_e[lid];j!=-1;j=next_e[j]){
                         offset=count2offset_e[j];
                         element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(offset));
-                        element->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,&flagsindices_counter,set1enum,set2enum);
+                        element->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,&flagsindices_counter,set1enum,set2enum,analysis_type);
                         if(node->IsClone()){
                                 connectivity_clone->SetValue(pid,d_nz+o_nz,ADD_VAL);
                         }

../trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -736 +736 @@
 
         Gauss* gauss=this->NewGauss(5);
         while(gauss->next()){
+
                 this->JacobianDeterminant(&Jdet,xyz_list,gauss);
 
                 /*Get strain rate assuming that epsilon has been allocated*/
@@ -3393 +3394 @@
 
 }
 /*}}}*/
-void       Element::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int* flagsindices,int* flagsindices_counter,int set1_enum,int set2_enum){/*{{{*/
+void       Element::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int* flagsindices,int* flagsindices_counter,int set1_enum,int set2_enum, int analysis_type){/*{{{*/
 
         /*Intermediaries*/
         const int numnodes = this->GetNumberOfNodes();
@@ -3404 +3405 @@
 
         /*Loop over all nodes*/
         for(int i=0;i<numnodes;i++){
-
                 int nodelid = this->nodes[i]->Lid();
                 if(!flags[nodelid]){
-
                         /*flag current node so that no other element processes it*/
                         flags[nodelid]=true;
 
@@ -3447 +3446 @@
 
         /*Special case: 2d/3d coupling, the node of this element might be connected
          *to the basal element*/
-        int analysis_type,approximation,numlayers;
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        int approximation,numlayers;
         if(analysis_type==StressbalanceAnalysisEnum){
                 this->GetInputValue(&approximation,ApproximationEnum);
                 if(approximation==SSAHOApproximationEnum || approximation==SSAFSApproximationEnum){

../trunk-jpl/src/c/classes/Elements/Element.h

@@ -163 +163 @@
                 void               ResultToPatch(IssmDouble* values,int nodesperelement,int output_enum);
                 void               ResultToMatrix(IssmDouble* values,int ncols,int output_enum);
                 void               ResultToVector(Vector<IssmDouble>* vector,int output_enum);
-                void               SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int* flagsindices_counter,int set1_enum,int set2_enum);
+                void               SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int* flagsindices_counter,int set1_enum,int set2_enum, int analysis_type);
                 void               SetBoolInput(Inputs* inputs,int enum_in,bool value);
 
                 void               SetIntInput(Inputs* inputs,int enum_in,int value);