Changeset 17062

Timestamp:

01/06/14 12:27:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing constraints on P2xP4

Location:

issm/trunk-jpl/src/c/modules

Files:

• IoModelToConstraintsx/IoModelToConstraintsx.cpp (modified) (1 diff)
• ModelProcessorx/CreateNodes.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp

@@ -120 +120 @@
                                         }
                                 }
-                                _printf0_("WARNING: Skipping constraints along edges\n");
+                                for(i=0;i<iomodel->numberofedges;i++){
+                                        if(iomodel->edges[i*3+2]==2){/*Vertical edges*/
+                                                if(my_edges[i]){
+                                                        v1 = iomodel->edges[3*i+0]-1;
+                                                        v2 = iomodel->edges[3*i+1]-1;
+                                                        if(!xIsNan<IssmDouble>(spcdata[v1]) && !xIsNan<IssmDouble>(spcdata[v2])){
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+4*i+1,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+2,iomodel->nodecounter+iomodel->numberofvertices+4*i+2,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+3,iomodel->nodecounter+iomodel->numberofvertices+4*i+3,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                count=count+3;
+                                                        }
+                                                }
+                                        }
+                                        if(iomodel->edges[i*3+2]==1){/*Basal edges*/
+                                                if(my_edges[i]){
+                                                        v1 = iomodel->edges[3*i+0]-1;
+                                                        v2 = iomodel->edges[3*i+1]-1;
+                                                        if(!xIsNan<IssmDouble>(spcdata[v1]) && !xIsNan<IssmDouble>(spcdata[v2])){
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+4*i+1,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+2,iomodel->nodecounter+iomodel->numberofvertices+4*i+2,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+3,iomodel->nodecounter+iomodel->numberofvertices+4*i+3,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+4,iomodel->nodecounter+iomodel->numberofvertices+4*i+4,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                count=count+4;
+                                                        }
+                                                }
+                                        }
+                                        if(iomodel->edges[i*3+2]==3){/*Top edges*/
+                                                if(my_edges[i]){
+                                                        v1 = iomodel->edges[3*i+0]-1;
+                                                        v2 = iomodel->edges[3*i+1]-1;
+                                                        if(!xIsNan<IssmDouble>(spcdata[v1]) && !xIsNan<IssmDouble>(spcdata[v2])){
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+4*i+1,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                count=count+1;
+                                                        }
+                                                }
+                                        }
+                                }
                                 break;
                         case P1bubbleEnum:

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateNodes.cpp

@@ -164 +164 @@
                                                 node = new Node(iomodel->nodecounter+iomodel->numberofvertices+4*i+1,counter+1,lid++,0,iomodel,analysis,approximation);
                                                 nodes->AddObject(node);
-                                                node = new Node(iomodel->nodecounter+iomodel->numberofvertices+4*i+2,counter+1,lid++,0,iomodel,analysis,approximation);
-                                                nodes->AddObject(node);
-                                                node = new Node(iomodel->nodecounter+iomodel->numberofvertices+4*i+3,counter+1,lid++,0,iomodel,analysis,approximation);
-                                                nodes->AddObject(node);
-                                                node = new Node(iomodel->nodecounter+iomodel->numberofvertices+4*i+4,counter+1,lid++,0,iomodel,analysis,approximation);
+                                                node = new Node(iomodel->nodecounter+iomodel->numberofvertices+4*i+2,counter+2,lid++,0,iomodel,analysis,approximation);
+                                                nodes->AddObject(node);
+                                                node = new Node(iomodel->nodecounter+iomodel->numberofvertices+4*i+3,counter+3,lid++,0,iomodel,analysis,approximation);
+                                                nodes->AddObject(node);
+                                                node = new Node(iomodel->nodecounter+iomodel->numberofvertices+4*i+4,counter+4,lid++,0,iomodel,analysis,approximation);
                                                 nodes->AddObject(node);
                                         }