Changeset 14617

Timestamp:

04/17/13 07:49:50 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: vector_layout is rarely needed

Location:

issm/trunk-jpl/src/c/classes

Files:

• IoModel.cpp (modified) (4 diffs)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/IndependentObject.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -684 +684 @@
         int*    integer_matrix=NULL;
         int code=0;
-        int vector_type=0;
 
         /*recover my_rank:*/
@@ -690 +689 @@
 
         /*Set file pointer to beginning of the data: */
-        fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
+        fid=this->SetFilePointerToData(&code,NULL,data_enum);
 
         if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
@@ -758 +757 @@
         IssmPDouble* matrix=NULL;
         int code=0;
-        int vector_type=0;
 
         /*recover my_rank:*/
@@ -764 +762 @@
 
         /*Set file pointer to beginning of the data: */
-        fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
+        fid=this->SetFilePointerToData(&code,NULL,data_enum);
         if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
 

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -1994 +1994 @@
                 }
                 else {
-                        _error_("transient elementary inputs not supported yet!");
+                        _error_("transient element inputs not supported yet!");
                 }
         }

issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp

@@ -132 +132 @@
                 IssmDouble* matrix=NULL; //our independent variable
                 int code=0;
-                int vector_type=0;
 
                 /*Set file pointer to beginning of the data: */
-                fid=iomodel->SetFilePointerToData(&code,&vector_type,name);
+                fid=iomodel->SetFilePointerToData(&code,NULL,name);
                 if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(name));