Changeset 19117

Timestamp:

02/18/15 11:19:14 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added IoModelToDynamicConstraintsx for PDD module

Location:

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

Files:

• IoModelToConstraintsx.cpp (modified) (2 diffs)
• IoModelToConstraintsx.h (modified) (1 diff)

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

@@ -29 +29 @@
         xDelete<IssmDouble>(spcdata);
 }
-
-void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,IssmDouble* spcdata,int M,int N,int analysis_type,int finite_element,int dof){
+void IoModelToDynamicConstraintsx(Constraints* constraints,IoModel* iomodel,int vector_enum,int analysis_type,int finite_element,int dof){
+
+        /*intermediary: */
+        int         code,vector_layout;
+        IssmDouble *spcdata = NULL;
+        int         M,N;
+
+        /*First of, find the record for the enum, and get code  of data type: */
+        iomodel->SetFilePointerToData(&code, &vector_layout,vector_enum);
+        if(code!=7)_error_("expecting a IssmDouble vector for constraints with enum " << EnumToStringx(vector_enum));
+        if(vector_layout!=1)_error_("expecting a nodal vector for constraints with enum " << EnumToStringx(vector_enum));
+
+        /*Fetch vector:*/
+        iomodel->FetchData(&spcdata,&M,&N,vector_enum);
+
+        /*Call IoModelToConstraintsx*/
+        IoModelToDynamicConstraintsx(constraints,iomodel,spcdata,M,N,analysis_type,finite_element,dof);
+
+        /*Clean up*/
+        xDelete<IssmDouble>(spcdata);
+}
+
+void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,IssmDouble* spcdata,int M,int N,int analysis_type,int finite_element,int dof){/*{{{*/
 
         /*intermediary: */
@@ -537 +558 @@
         xDelete<bool>(my_faces);
         xDelete<bool>(boundaryedge);
-}
+}/*}}}*/
+void IoModelToDynamicConstraintsx(Constraints* constraints,IoModel* iomodel,IssmDouble* spcdata,int M,int N,int analysis_type,int finite_element,int dof){/*{{{*/
+
+        /*intermediary: */
+        int i,count;
+
+        switch(finite_element){
+                case P1Enum: 
+                        /*Nothing else to do*/
+                        break;
+                default:
+                        _error_("Finite element "<<EnumToStringx(finite_element)<<" not supported yet");
+        }
+
+        count=0;
+        if(M==iomodel->numberofvertices){
+                switch(finite_element){
+                        case P1Enum:
+                                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++;
+                                                }
+                                        }
+                                }
+                                break;
+                        default:
+                                _error_("Finite element "<<EnumToStringx(finite_element)<<" not supported yet");
+                }
+        }
+        else{
+                _error_("Size of spc field not supported");
+        }
+}/*}}}*/

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

@@ -10 +10 @@
 void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,int vector_enum,int analysis_type,int finite_element,int dof=0);
 void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,IssmDouble* spcdata,int M,int N,int analysis_type,int finite_element,int dof=0);
+void IoModelToDynamicConstraintsx(Constraints* constraints,IoModel* iomodel,int vector_enum,int analysis_type,int finite_element,int dof=0);
+void IoModelToDynamicConstraintsx(Constraints* constraints,IoModel* iomodel,IssmDouble* spcdata,int M,int N,int analysis_type,int finite_element,int dof=0);
 
 #endif  /* _IOMODELTOELEMENTINPUTX_H */