Changeset 20270

Timestamp:

02/27/16 21:17:19 (9 years ago)

Author:

Eric.Larour

Message:

CHG (JS):

• successful processing of the results when calling a remote cluster that returns the .outbin file as a typed array

buffer.

• implementing a callback function in the solve.js routine, because the oReq Post routine that retrieves the outbin

typed array buffer from the server during the http request is an async call, which can therefore not be controlled
serially.

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.js (modified) (3 diffs)
• solve/solve.js (modified) (4 diffs)

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

@@ -34 +34 @@
                         }
                 } //}}}
-                this.UploadAndRun = function (fid,toolkitsstring,solutionstring,name) { //{{{
+                this.UploadAndRun = function (md,callbackfunction,fid,toolkitsstring,solutionstring,name) { //{{{
 
                         var oReq = new XMLHttpRequest();
@@ -41 +41 @@
 
                         oReq.onload = function (oEvent) {
-                                var returnBuffer= oReq.response.slice(); 
-                                var returnBuffer_size= returnBuffer.byteLength;
-                                md.results= loadresultsfrombuffer(md,returnBuffer,returnBuffer_size); 
+                                var returnBuffer = new Uint8Array(oReq.response.slice());
+                                var returnBuffer_size=returnBuffer.byteLength;
+                                md.results= parseresultsfrombuffer(returnBuffer,returnBuffer_size);
+                                callbackfunction();
                         };
 
@@ -51 +52 @@
 
                 } /*}}}*/
-
         }

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

@@ -23 +23 @@
 //      - checkconsistency : 'yes' or 'no' (default is 'yes'), ensures checks on consistency of model
 //      - restart: 'directory name (relative to the execution directory) where the restart file is located.
+//      - callback: callback function to be called upon receiving the results from the server, or local computations. 
 //
 //   Examples:
@@ -101 +102 @@
         toolkitsstring= md.toolkits.ToolkitsFile(md.miscellaneous.name + '.toolkits'); // toolkits file
 
+        //callback function: 
+        function callbackfunction(){}; //default, do nothing if no callback requested.
+        if (options.getfieldvalue('callback',false)){
+                callbackfunction=options.getfieldvalue('callback');
+        }
 
         if (cluster.classname() == 'local'){  //{{{
@@ -116 +122 @@
                 md.results = loadresultsfrombuffer(md,outputbuffer,outputbuffersize); 
                 
+                //Call back? 
+                callbackfunction();
+
                 return md;
 
@@ -122 +131 @@
 
                 /*We are running somewhere else on a computational server. Send the buffer to that server and retrieve output: */
-                cluster.UploadAndRun(fid,toolkitsstring,solutionstring,md.miscellaneous.name);
+                cluster.UploadAndRun(md,callbackfunction,fid,toolkitsstring,solutionstring,md.miscellaneous.name);
 
                 return md;