Changeset 13975 for issm/trunk/src/c/classes/IoModel.h

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/IoModel.h (modified) (2 diffs)

issm/trunk/src/c/classes/IoModel.h

@@ -19 +19 @@
 
         private: 
-                Parameters  *constants;   //this dataset holds all IssmDouble, int, bool and char *parameters read in from the input file.*
-        
+                Parameters *constants;   //this dataset holds all IssmDouble, int, bool and char from input
+
         public:
-                IssmDouble **data;        //this dataset holds temporary data, memory intensive.
-                
+                IssmDouble **data;   //this dataset holds temporary data, memory intensive.
+
                 /*This data needs to stay memory resident at all time, even if it's memory intensive: */
-                FILE *fid;         //pointer to input file
+                FILE *fid;                               //pointer to input file
                 bool *my_elements;
                 bool *my_nodes;
@@ -36 +36 @@
                 int loadcounter;         //keep track of how many loads are being created in each analysis type
                 int constraintcounter;   //keep track of how many constraints are being created in each analysis type
-                
+
                 /*for AD mode: to keep track of our independent variables we fetch:*/
                 bool* independents;
+                DataSet* independent_objects;
 
                 /*Methods*/