Changeset 17508

Timestamp:

03/20/14 16:37:41 (11 years ago)

Author:

seroussi

Message:

BUG: fixed Dirichlet conditions on faces for P2P4

File:

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

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

@@ -181 +181 @@
                                         if(iomodel->faces[i*6+5]==2){/*Vertical quads*/
                                                 if(my_faces[i]){
-                                                        v1 = iomodel->faces[6*i+0]-1;
-                                                        v2 = iomodel->faces[6*i+1]-1;
-                                                        if(!xIsNan<IssmDouble>(spcdata[v1]) && !xIsNan<IssmDouble>(spcdata[v2])){
+                                                        FaceGetVertexIndices(iomodel,&numfacevertices,&faceverticesid,i);
+                                                        isnan=0;
+                                                        for(j=0;j<numfacevertices;j++){
+                                                                if(xIsNan<IssmDouble>(spcdata[faceverticesid[j]])) isnan=1;
+                                                        }
+                                                        if(isnan==0){
+                                                                value=0;
+                                                                for(j=0;j<numfacevertices;j++){
+                                                                        value=value+spcdata[faceverticesid[j]]/numfacevertices;
+                                                                }
                                                                 constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+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*iomodel->numberofedges+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*iomodel->numberofedges+3*i+3,
-                                                                                                dof,1./2.*spcdata[v1]+1./2.*spcdata[v2],analysis_type));
+                                                                                                dof,value,analysis_type));
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+2,
+                                                                                                dof,value,analysis_type));
+                                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+3,
+                                                                                                dof,value,analysis_type));
                                                                 count=count+3;
                                                         }