Changeset 17795

Timestamp:

04/21/14 16:00:38 (11 years ago)

Author:

seroussi

Message:

CHG: OneLayerP4 working with P1 pressure

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Penta.cpp (modified) (2 diffs)
• classes/Elements/PentaRef.cpp (modified) (3 diffs)
• modules/ModelProcessorx/CreateNodes.cpp (modified) (2 diffs)

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

@@ -2498 +2498 @@
                         break;
                 case OneLayerP4zEnum:
-                        numnodes         = 30+12;
+                        numnodes         = 30+6;
                         penta_node_ids   = xNew<int>(numnodes);
                         penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0]; /*Vertex 1*/
@@ -2537 +2537 @@
                         penta_node_ids[34]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+4];
                         penta_node_ids[35]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->elements[6*index+5];
-                        penta_node_ids[36]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+0]+1;
-                        penta_node_ids[37]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+1]+1;
-                        penta_node_ids[38]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+2]+1;
-                        penta_node_ids[39]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+0]+2;
-                        penta_node_ids[40]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+1]+2;
-                        penta_node_ids[41]=iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*iomodel->numberoffaces+iomodel->numberofvertices+2*iomodel->elementtoedgeconnectivity[9*index+2]+2;
                         break;
                 default:

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

@@ -1130 +1130 @@
                 case MINIEnum:              return NUMNODESP1b+NUMNODESP1;
                 case TaylorHoodEnum:        return NUMNODESP2+NUMNODESP1;
-                case OneLayerP4zEnum:       return NUMNODESP2xP4+NUMNODESP1xP3;
+                case OneLayerP4zEnum:       return NUMNODESP2xP4+NUMNODESP1;
                 case P2xP4Enum:             return NUMNODESP2xP4;
                 case P1xP3Enum:             return NUMNODESP1xP3;
@@ -1148 +1148 @@
                 case MINIEnum:          return NUMNODESP1;
                 case TaylorHoodEnum:    return NUMNODESP1;
-                case OneLayerP4zEnum:   return NUMNODESP1xP3;
+                case OneLayerP4zEnum:   return NUMNODESP1;
                 default: _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
         }
@@ -1196 +1196 @@
                 case MINIEnum:          return P1Enum;
                 case TaylorHoodEnum:    return P1Enum;
-                case OneLayerP4zEnum:   return P1xP3Enum;
+                case OneLayerP4zEnum:   return P1Enum;
                 default:       _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
         }

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

@@ -396 +396 @@
                         }
 
-                        /*P1xP3 pressure*/
+                        /*P1 pressure*/
                         vnodes = id0+3*iomodel->numberoffaces;
                         for(i=0;i<iomodel->numberofvertices;i++){
@@ -403 +403 @@
                                 }
                                 counter++;
-                        }
-                        for(i=0;i<iomodel->numberofedges;i++){
-                                if(iomodel->edges[i*3+2]==2){
-                                        if(my_edges[i]){
-                                                node = new Node(vnodes+iomodel->numberofvertices+2*i+1,counter+1,lid++,0,iomodel,analysis,FSpressureEnum);
-                                                nodes->AddObject(node);
-                                                node = new Node(vnodes+iomodel->numberofvertices+2*i+2,counter+2,lid++,0,iomodel,analysis,FSpressureEnum);
-                                                nodes->AddObject(node);
-                                        }
-                                        counter=counter+2;
-                                }
                         }
                         break;