Changeset 21717

Timestamp:

05/16/17 16:45:51 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added P1xP3 for spc transient

File:

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

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

@@ -504 +504 @@
                                 }
                                 break;
+                        case P1xP3Enum:
+                                for(i=0;i<iomodel->numberofvertices;i++){
+                                        if((iomodel->my_vertices[i])){
+
+                                                /*figure out times and values: */
+                                                values=xNew<IssmDouble>(N);
+                                                spcpresent=false;
+                                                for(j=0;j<N;j++){
+                                                        values[j]=spcdata[i*N+j];
+                                                        if(!xIsNan<IssmDouble>(values[j]))spcpresent=true; //NaN means no spc by default
+                                                }
+
+                                                if(spcpresent){
+                                                        constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,dof,N,times,values,analysis_type));
+                                                        count++;
+                                                }
+                                                xDelete<IssmDouble>(values);
+                                        }
+                                }
+                                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;
+                                                        values=xNew<IssmDouble>(N);
+                                                        spcpresent=false;
+                                                        for(j=0;j<N;j++){
+                                                                values[j]=2./3.*spcdata[v1*N+j]+1./3.*spcdata[v2*N+j];
+                                                                if(!xIsNan<IssmDouble>(values[j])) spcpresent=true; //NaN means no spc by default
+                                                        }
+                                                        if(spcpresent){
+                                                                constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+2*i+1,dof,
+                                                                                                N,times,values,analysis_type));
+                                                                count++;
+                                                        }
+                                                        spcpresent=false;
+                                                        for(j=0;j<N;j++){
+                                                                values[j]=1./3.*spcdata[v1*N+j]+2./3.*spcdata[v2*N+j];
+                                                                  if(!xIsNan<IssmDouble>(values[j])) spcpresent=true; //NaN means no spc by default
+                                                        }
+                                                        if(spcpresent){
+                                                                constraints->AddObject(new SpcTransient(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+2*i+2,dof,
+                                                                                                N,times,values,analysis_type));
+                                                                count++;
+                                                        }
+                                                        xDelete<IssmDouble>(values);
+                                                }
+                                        }
+                                }
+                                break;
                         case P2xP1Enum:
                                 for(i=0;i<iomodel->numberofvertices;i++){