Changeset 20690 for issm/trunk-jpl/src/m/solve/WriteData.js

Timestamp:

06/03/16 10:05:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: marhsall strings instead of enums

File:

• issm/trunk-jpl/src/m/solve/WriteData.js (modified) (4 diffs)

issm/trunk-jpl/src/m/solve/WriteData.js

@@ -1 @@
-function WriteData(fid){
+function WriteData(fid,prefix){
 //WRITEDATA - write model field into binary buffer 
 //
@@ -17 +17 @@
                 obj       = options.getfieldvalue('object');
                 fieldname = options.getfieldvalue('fieldname');
-                if (options.exist('enum')){
-                        enumm = options.getfieldvalue('enum');
+                name      = options.getfieldvalue('name',[prefix+'.'+fieldname ]);
+                if (options.exist('data')){
+                        data = options.getfieldvalue('data');
                 }
                 else{
-                        classname = options.getfieldvalue('class',obj.classname());
-                        enumm = BuildEnum(classname  + '_' + fieldname);
-                }
-                dataini  = obj[fieldname];
+                        dataini  = obj[fieldname];
+                }
         }
         else{
                 //No processing required
                 dataini = options.getfieldvalue('data');
-                enumm = options.getfieldvalue('enum');
+                namem = options.getfieldvalue('name');
         }
         if (IsArray(dataini)){
@@ -73 +72 @@
         }
 
-        //Step 1: write the enum to identify this record uniquely
-        fid.fwrite(enumm,'int'); 
+        //Step 1: write the name to identify this record uniquely
+        fid.fwrite(name.length,'int'); 
+        fid.fwrite(name,'char'); 
 
         //Step 2: write the data itself.
@@ -278 +278 @@
 }
 
-function BuildEnum(string){ // {{{
-        //BUILDENUM - build enum out of string
-        //
-        //   Usage:
-        //      enumm=BuildEnum(string)
-
-        var index;
-        while( string.indexOf('_') !=-1){
-                index=string.indexOf('_');
-                string=string.slice(0,index)+string[index+1].toUpperCase() + string.slice(index+2);
-        }
-
-        //take first letter of string and make it uppercase: 
-        string = string.charAt(0).toUpperCase() + string.slice(1);
-
-        //Get Enum
-        enumm=StringToEnum(string); 
-
-        return enumm;
-} // }}}
 function FormatToCode(format){ // {{{
         //This routine takes the format string, and hardcodes it into an integer, which