Changeset 22917


Ignore:
Timestamp:
07/12/18 16:58:37 (7 years ago)
Author:
dlcheng
Message:

CHG (JS): Updating js build/test scripts.

Location:
issm/trunk-jpl
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/linux64_ross_javascript

    r22715 r22917  
    1010    --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install-javascript" \
    1111    --with-gsl-dir="$ISSM_DIR/externalpackages/gsl/install-javascript" \
    12         --without-Love \
     12    --without-Love \
    1313    --without-kml \
    1414    --without-kriging \

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

    r20900 r22917  
    1717
    1818                //load structure onto results:
    19                 solutiontype=structure[0].SolutionType;
    20                 md.results[solutiontype]=structure;
     19                md.results=structure;
    2120
    2221                return md;

  • issm/trunk-jpl/test/NightlyRun/test101.html

    r22191 r22917  
    44<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
    55<!-- Includes {{{-->
     6<script type="text/javascript" src="../../../ext/jquery-1.11.3/jquery-1-11-3.min.js"></script>
     7<script type="text/javascript" src="../../../ext/gl-matrix-2.3.2/gl-matrix-min.js"></script>
     8<script type="text/javascript" src="../../../ext/litegl-0.99.0/litegl.min.js"></script>
     9<script type="text/javascript" src="../../../ext/hammer-2.0.8/hammer.min.js"></script>
     10<script type="text/javascript" src="../../../js/vesl.js"></script>
     11<script type="text/javascript" src="../../../js/helpers.js"></script>
    612<script type="text/javascript" src="../../bin/issm-bin.js"> </script>
    713<script type="text/javascript" src="../../bin/issm-prebin.js"> </script>
    … …  
    1218<!-- Includes }}}-->
    1319</head>
    14 <body>
    15 
    1620<script type="text/javascript" async>
     21function run() {
    1722
    1823        console.log('creating model');
    … …  
    3136        md=solve(md,'Stressbalance','checkconsistency','no');
    3237       
    33         console.log(md.results['StressbalanceSolution'][0]['Vel']);
     38        console.log(md.results[0]['Vel']);
    3439       
    3540        plotmodel(md,
     41                'canvasid#all', 'issm-sim-canvas',
     42                'colorbarid', 'issm-sim-canvas-colorbar',
    3643                'colorbar','on',
    37                 'data',md.results['StressbalanceSolution'][0]['Vel'],
     44                'caxis', [ArrayMin(md.results[0]['Vel']), ArrayMax(md.results[0]['Vel'])],
     45                'data',md.results[0]['Vel'],
    3846                'data','mesh');
     47}
     48</script>
     49<body onload="run()">
    3950
    40 </script>
     51<canvas id="issm-sim-canvas"></canvas>
     52<canvas id="issm-sim-canvas-colorbar"></canvas>
     53<canvas id="issm-sim-canvas-overlay"></canvas>
    4154</body>
    4255</html>
Note: See TracChangeset for help on using the changeset viewer.