Changeset 22077

Timestamp:

09/13/17 14:36:40 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: continuing implementation of P1xP4

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Penta.cpp (modified) (2 diffs)
• modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (modified) (2 diffs)
• modules/ModelProcessorx/CreateNodes.cpp (modified) (1 diff)

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

@@ -2819 +2819 @@
                         penta_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+8]+1;
                         break;
+                case P1xP4Enum:
+                        numnodes         = 15;
+                        penta_node_ids   = xNew<int>(numnodes);
+                        penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0]; /*Vertex 1*/
+                        penta_node_ids[ 1]=iomodel->nodecounter+iomodel->elements[6*index+1]; /*Vertex 2*/
+                        penta_node_ids[ 2]=iomodel->nodecounter+iomodel->elements[6*index+2]; /*Vertex 3*/
+                        penta_node_ids[ 3]=iomodel->nodecounter+iomodel->elements[6*index+3]; /*Vertex 4*/
+                        penta_node_ids[ 4]=iomodel->nodecounter+iomodel->elements[6*index+4]; /*Vertex 5*/
+                        penta_node_ids[ 5]=iomodel->nodecounter+iomodel->elements[6*index+5]; /*Vertex 6*/
+                        penta_node_ids[ 6]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+1; /*mid vertical edge 1*/
+                        penta_node_ids[ 7]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+1; /*mid vertical edge 2*/
+                        penta_node_ids[ 8]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+1; /*mid vertical edge 3*/
+                        penta_node_ids[ 9]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+2; /* 1/4 vertical edge 1*/
+                        penta_node_ids[10]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+2; /* 1/4 vertical edge 2*/
+                        penta_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+2; /* 1/4 vertical edge 3*/
+                        penta_node_ids[12]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+3; /* 3/4 vertical edge 1*/
+                        penta_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+3; /* 3/4 vertical edge 2*/
+                        penta_node_ids[14]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+3; /* 3/4 vertical edge 3*/
+                        break;
                 case P2xP4Enum:
                         numnodes         = 30;
@@ -2840 +2859 @@
                         penta_node_ids[16]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+2; /* 1/4 vertical edge 2*/
                         penta_node_ids[17]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+2; /* 1/4 vertical edge 3*/
-                        penta_node_ids[18]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+3; /* 2/4 vertical edge 1*/
-                        penta_node_ids[19]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+3; /* 2/4 vertical edge 2*/
-                        penta_node_ids[20]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+3; /* 2/4 vertical edge 3*/
+                        penta_node_ids[18]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+0]+3; /* 3/4 vertical edge 1*/
+                        penta_node_ids[19]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+1]+3; /* 3/4 vertical edge 2*/
+                        penta_node_ids[20]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->elementtoedgeconnectivity[9*index+2]+3; /* 3/4 vertical edge 3*/
                         penta_node_ids[21]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+2]+1; /* 1/4 vertical face 1*/
                         penta_node_ids[22]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->elementtofaceconnectivity[5*index+3]+1; /* 1/4 vertical face 2*/

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

@@ -82 +82 @@
                         break;
                 case P1xP2Enum:
-                        EdgesPartitioning(&my_edges,iomodel);
-                        break;
                 case P1xP3Enum:
+                case P1xP4Enum:
                         EdgesPartitioning(&my_edges,iomodel);
                         break;
@@ -370 +369 @@
                                 }
                                 break;
+                        case P1xP4Enum:
+                                for(i=0;i<iomodel->numberofvertices;i++){
+                                        if((iomodel->my_vertices[i])){
+                                                if (!xIsNan<IssmDouble>(spcdata[i])){
+                                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,dof,spcdata[i],analysis_type));
+                                                        count++;
+                                                }
+                                        }
+                                }
+                                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+3*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+3*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+3*i+3,
+                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                count=count+3;
+                                                        }
+                                                }
+                                        }
+                                }
+                                break;
                         case P2xP1Enum:
                                 for(i=0;i<iomodel->numberofvertices;i++){

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

@@ -107 +107 @@
                                         }
                                         counter=counter+2;
+                                }
+                        }
+                        break;
+                case P1xP4Enum:
+                        EdgesPartitioning(&my_edges,iomodel);
+                        for(i=0;i<iomodel->numberofvertices;i++){
+                                if(iomodel->my_vertices[i]){
+                                        nodes->AddObject(new Node(id0+i+1,i,lid++,i,iomodel,analysis,approximation));
+                                }
+                        }
+                        counter = iomodel->numberofvertices;
+                        for(i=0;i<iomodel->numberofedges;i++){
+                                if(iomodel->edges[i*3+2]==2){/*Vertical edges*/
+                                        if(my_edges[i]){
+                                                node = new Node(id0+iomodel->numberofvertices+3*i+1,counter+1,lid++,0,iomodel,analysis,approximation);
+                                                nodes->AddObject(node);
+                                                node = new Node(id0+iomodel->numberofvertices+3*i+2,counter+2,lid++,0,iomodel,analysis,approximation);
+                                                nodes->AddObject(node);
+                                                node = new Node(id0+iomodel->numberofvertices+3*i+3,counter+3,lid++,0,iomodel,analysis,approximation);
+                                                nodes->AddObject(node);
+                                        }
+                                        counter=counter+3;
                                 }
                         }