Changeset 20295

Timestamp:

03/04/16 14:17:39 (9 years ago)

Author:

Eric.Larour

Message:

CHG (JS): missing classes to allow marshalling of model in javascript.

Location:

issm/trunk-jpl/src/m

Files:

• Makefile.am (modified) (1 diff)
• classes/clusters/generic.js (modified) (3 diffs)
• classes/maskpsl.js (added)
• classes/maskpsl.m (modified) (1 diff)
• classes/outputdefinition.m (modified) (1 diff)

issm/trunk-jpl/src/m/Makefile.am

@@ -100 +100 @@
                                 ${ISSM_DIR}/src/m/classes/inversion.js \
                                 ${ISSM_DIR}/src/m/classes/mask.js \
+                                ${ISSM_DIR}/src/m/classes/maskpsl.js \
                                 ${ISSM_DIR}/src/m/classes/masstransport.js \
                                 ${ISSM_DIR}/src/m/classes/matice.js \

issm/trunk-jpl/src/m/classes/clusters/generic.js

@@ -74 +74 @@
                 solutionlength[0] = solutionbuffer.byteLength;
                 
-                var binbuffer = new Uint16Array(fid.buffer);
+                var binbuffer = new Uint16Array(fid.rawbuffer());
+
                 var binlength = new Uint32Array(1);
                 binlength[0] = binbuffer.byteLength;
                 
                 var data = new Blob([runtimenamelength,runtimenamebuffer,namelength,namebuffer,toolkitslength,toolkitsbuffer,solutionlength,solutionbuffer,binlength,binbuffer]);
-                //console.log(fid.buffer);
-                if (typeof(download) != "undefined") download(fid.buffer);
+                if (typeof(download) != "undefined") download(fid.rawbuffer());
                 oReq.send(data);
                 
@@ -86 +86 @@
 
         } //}}}
-        this.ab2str = function(buf) {
+        this.ab2str = function(buf) { //{{{
                 return String.fromCharCode.apply(null, new Uint16Array(buf));
         }
@@ -95 +95 @@
                 }
                 return buf;
-        }
+        } //}}}
 }

issm/trunk-jpl/src/m/classes/maskpsl.m

@@ -83 +83 @@
                 function savemodeljs(self,fid,modelname) % {{{
                 
+                        fprintf(fid,'%s.mask=new maskpsl();\n',modelname);
                         writejs1Darray(fid,[modelname '.mask.groundedice_levelset'],self.groundedice_levelset);
                         writejs1Darray(fid,[modelname '.mask.ice_levelset'],self.ice_levelset);

issm/trunk-jpl/src/m/classes/outputdefinition.m

@@ -50 +50 @@
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                
+
+                        fprintf(fid,'%s.outputdefinition.definitions=[];\n',modelname);
                         if ~isempty(self.definitions),
                                 error('outputdefinition savemodeljs error message: not supported yet!');