Changeset 16657

Timestamp:

11/07/13 09:52:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: constraints need to be applied even if node is clone

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tria.cpp (modified) (3 diffs)
• Elements/Tria.h (modified) (1 diff)
• matrix/ElementMatrix.cpp (modified) (1 diff)

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

@@ -2164 +2164 @@
 }
 /*}}}*/
+/*FUNCTION Tria::HasNodeOnBed {{{*/
+bool Tria::HasNodeOnBed(){
+
+        IssmDouble values[NUMVERTICES];
+        IssmDouble sum;
+
+        /*Retrieve all inputs and parameters*/
+        GetInputListOnVertices(&values[0],MeshVertexonbedEnum);
+        sum = values[0]+values[1]+values[2];
+
+        return sum>0.;
+}
+/*}}}*/
 /*FUNCTION Tria::HasEdgeOnSurface {{{*/
 bool Tria::HasEdgeOnSurface(){
@@ -2184 +2197 @@
                 return false;
         }
+}
+/*}}}*/
+/*FUNCTION Tria::HasNodeOnSurface {{{*/
+bool Tria::HasNodeOnSurface(){
+
+        IssmDouble values[NUMVERTICES];
+        IssmDouble sum;
+
+        /*Retrieve all inputs and parameters*/
+        GetInputListOnVertices(&values[0],MeshVertexonbedEnum);
+        sum = values[0]+values[1]+values[2];
+
+        return sum>0.;
 }
 /*}}}*/
@@ -2805 +2831 @@
 void  Tria::UpdateConstraintsExtrudeFromBase(void){
 
-        if(!HasEdgeOnBed()) return;
-
-        int extrusioninput;
-        int indices[2];
-        IssmDouble value;
+        if(!HasNodeOnBed()) return;
+
+        int        extrusioninput;
+        IssmDouble value,isonbed;
 
         this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum);
-        Input* input = inputs->GetInput(extrusioninput); _assert_(extrusioninput);
-        this->EdgeOnBedIndices(&indices[0],&indices[1]);
+        Input* input = inputs->GetInput(extrusioninput);      _assert_(extrusioninput);
+        Input* onbed = inputs->GetInput(MeshVertexonbedEnum); _assert_(onbed);
 
         GaussTria* gauss=new GaussTria();
-        for(int i=0;i<2;i++){
-                gauss->GaussNode(P1Enum,indices[i]);
-                input->GetInputValue(&value,gauss);
-                this->nodes[indices[i]]->ApplyConstraint(1,value);
+        for(int iv=0;iv<this->NumberofNodes();iv++){
+                gauss->GaussNode(this->element_type,iv);
+                onbed->GetInputValue(&isonbed,gauss);
+                if(isonbed==1.){
+                        input->GetInputValue(&value,gauss);
+                        this->nodes[iv]->ApplyConstraint(1,value);
+                }
         }
         delete gauss;

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -86 +86 @@
                 bool        IsOnBed();
                 bool        HasEdgeOnBed();
+                bool        HasNodeOnBed();
                 bool        HasEdgeOnSurface();
+                bool        HasNodeOnSurface();
                 void        EdgeOnSurfaceIndices(int* pindex1,int* pindex);
                 void        EdgeOnBedIndices(int* pindex1,int* pindex);

issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.cpp

@@ -269 +269 @@
                                 for(j=0;j<this->row_fsize;j++){
                                         *(localvalues+this->row_fsize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]);
+                                        //if(this->row_fglobaldoflist[i]==0 && this->row_fglobaldoflist[j]==304) printf("rank = %i\n",IssmComm::GetRank());
+                                        if(this->row_fglobaldoflist[i]==0 && *(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j])!=0.){
+                                                //printf("[%i] dof = %i\n",IssmComm::GetRank(),this->row_fglobaldoflist[j]);
+                                        }
                                 }
                         }
+
                         /*add local values into global  matrix, using the fglobaldoflist: */
                         Kff->SetValues(this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,localvalues,ADD_VAL);