Changeset 21553

Timestamp:

02/10/17 13:49:03 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added support for P1xP2 dynamic constraints

File:

• issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (modified) (1 diff)

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

@@ -585 +585 @@
                                 }
                                 break;
+                        case P1xP2Enum:
+                                for(i=0;i<iomodel->numberofvertices;i++){
+                                        if((iomodel->my_vertices[i])){
+                                                if (!xIsNan<IssmDouble>(spcdata[i])){
+                                                        constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,dof,analysis_type));
+                                                        count++;
+                                                }
+                                        }
+                                }
+                                for(i=0;i<iomodel->numberofedges;i++){
+                                        if(iomodel->edges[i*3+2]==2){
+                                                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 SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+i+1,
+                                                                                                dof,analysis_type));
+                                                                count++;
+                                                        }
+                                                }
+                                        }
+                                }
+                                break;
                         default:
                                 _error_("Finite element "<<EnumToStringx(finite_element)<<" not supported yet");