Changeset 22824
- Timestamp:
- 06/01/18 17:40:25 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/solve/solve.js
r22716 r22824 124 124 toolkitsstring= md.toolkits.ToolkitsFile(md.miscellaneous.name + '.toolkits'); // toolkits file 125 125 126 //callback function: 127 function callbackfunction(){solving=false;}; //default, do nothing if no callback function requested. 128 if (options.getfieldvalue('callbackfunction',false)){ 129 callbackfunction=options.getfieldvalue('callbackfunction'); 130 } 131 132 //callback error function: 133 function callbackerrorfunction(){solving=false;}; //default, do nothing if no callback function requested. 134 if (options.getfieldvalue('callbackerrorfunction',false)){ 135 callbackerrorfunction=options.getfieldvalue('callbackerrorfunction'); 136 } 137 138 //callback id: 139 var callbackid = '.run-button'; //default, update .run-button elements with progress updates. 140 if (options.getfieldvalue('callbackid',false)){ 141 callbackid=options.getfieldvalue('callbackid'); 142 } 126 127 /* 128 Set success callback function 129 */ 130 //{{{ 131 132 // Default: do nothing if no success callback function requested 133 function successCallback() { 134 solving = false; 135 }; 136 137 if (options.getfieldvalue('successCallback',false)){ 138 successCallback = options.getfieldvalue('successCallback'); 139 } 140 //}}} 141 142 143 /* 144 Set error callback function 145 */ 146 //{{{ 147 148 // Default: do nothing if no error callback function requested 149 function errorCallback() { 150 solving = false; 151 }; 152 153 if (options.getfieldvalue('errorCallback',false)){ 154 errorCallback = options.getfieldvalue('errorCallback'); 155 } 156 //}}} 157 158 159 /* 160 Set solve button ID 161 */ 162 //{{{ 163 164 // Default: update #solve-button element with progress updates 165 var solveButtonId = '#solve-button'; 166 167 if (options.getfieldvalue('solveButtonId', false)){ 168 solveButtonId = options.getfieldvalue('solveButtonId'); 169 } 170 //}}} 143 171 144 172 if (cluster.classname() == 'local'){ //{{{ … … 156 184 md = loadresultsfrombuffer(md,outputbuffer,outputbuffersize); 157 185 158 // Call back?159 callbackfunction();186 // Call success callback 187 successCallback(); 160 188 161 189 return md; … … 166 194 /*We are running somewhere else on a computational server. Send the buffer to that server and retrieve output: */ 167 195 console.log('running issm remotely'); 168 cluster.UploadAndRun(md, callbackfunction,callbackerrorfunction,callbackid,fid,toolkitsstring,solutionstring,md.miscellaneous.name,md.priv.runtimename);196 cluster.UploadAndRun(md,successCallback,errorCallback,solveButtonId,fid,toolkitsstring,solutionstring,md.miscellaneous.name,md.priv.runtimename); 169 197 170 198 return md;
Note:
See TracChangeset
for help on using the changeset viewer.