Changeset 19816


Ignore:
Timestamp:
11/25/15 14:36:15 (9 years ago)
Author:
Eric.Larour
Message:

CHG: finished loading results from the issm module, using an output memory buffer.
Also finished test101.html, providing results identical to test101.m

Location:
issm/trunk-jpl
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed

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

    r19793 r19816  
    183183               
    184184                //Call issm:
    185                 issm(fid, toolkitsstring, solutionstring, md.miscellaneous.name);
     185                var outputs = issm(fid, toolkitsstring, solutionstring, md.miscellaneous.name);
     186               
     187                //Recover output arguments:
     188                var outputbuffer = outputs[0]; var outputbuffersize = outputs[1];
     189                       
     190                //Load results:
     191                loadresultsfrombuffer(md,outputbuffer,outputbuffersize);
     192
    186193        }
    187194}

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

    r19793 r19816  
    7373<script type="text/javascript" src="../../src/m/inversions/marshallcostfunctions.js"></script>
    7474<script type="text/javascript" src="../../src/m/solve/marshall.js"></script>
     75<script type="text/javascript" src="../../src/m/solve/loadresultsfrombuffer.js"></script>
     76<script type="text/javascript" src="../../src/m/solve/parseresultsfrombuffer.js"></script>
    7577<script type="text/javascript" src="../../src/m/solve/WriteData.js"></script>
    7678<script type="text/javascript" src="../../src/wrappers/TriMesh/TriMesh.js"></script>
    … …  
    9092<body>
    9193       
    92         <script type="text/javascript" async><!--}}}-->
     94<script type="text/javascript" async><!--}}}-->
    9395
     96        console.log('creating model');
    9497        var md = new model();
    95         triangle(md,square[0],100000);
     98
     99        console.log('meshing');
     100        triangle(md,square[0],40000);
     101       
     102        console.log('parameterization');
    96103        setmask(md,'all','');
    97104        parameterize(md);
    98105        setflowequation(md,'SSA','all');
    99         md.verbose.solution=1;  md.verbose.convergence=1;
    100         md=solve(md,StressbalanceSolutionEnum(),'checkconsistency','no');
     106        md.verbose.solution=1;  md.verbose.convergence=0;
    101107
    102         /*plotmodel(md,'data',md.initialization.vel,'colorbar','on','colorbarheight',.5,'data',md.initialization.vx,
    103           'data',md.initialization.temperature, 'data',md.basalforcings.floatingice_melting_rate,'data','mesh');*/
    104         //var output=issm([5,1,1]);
     108        console.log('solve');
     109        solve(md,StressbalanceSolutionEnum(),'checkconsistency','no');
    105110
     111        console.log('plotting');
     112        plotmodel(md,'data',md.results['StressbalanceSolution'][0]['Vel'],'colorbar#1','on','colorbarheight',.5);
    106113
    107114</script> <!--{{{-->
Note: See TracChangeset for help on using the changeset viewer.