Changeset 4113


Ignore:
Timestamp:
06/21/10 17:20:52 (15 years ago)
Author:
Eric.Larour
Message:

cleanup of serial solutions, to look similar to parallel solutions.

Location:
issm/trunk/src/m/solutions/jpl
Files:
2 added
3 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/solutions/jpl/bedslope.m

    r4102 r4113  
    1 function md=slopecompute(md);
    2 %SLOPECOMPUTE - compute the slope of a model
     1function md=bedslopecompute(md);
     2%SLOPECOMPUTE - compute the bed slope of a model
    33%
    44%   Usage:
    5 %      md=slopecompute(md)
     5%      md=bedslope(md)
    66%
    77        %timing
     
    2121        if ~qmu_analysis,
    2222                displaystring(verbose,'%s',['call computational core']);
    23                 bedslope_core(femmodel);
     23                femmodel=bedslope_core(femmodel);
     24       
     25                displaystring(verbose,'%s',['write results']);
     26                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
     27
    2428        else
    2529                %launch dakota driver for diagnostic core solution
  • issm/trunk/src/m/solutions/jpl/diagnostic.m

    r4059 r4113  
    2424                       
    2525                        displaystring(verbose,'%s',['call computational core']);
    26                         diagnostic_core(femmodel);
     26                        femmodel=diagnostic_core(femmodel);
    2727
    2828                else,
    2929                       
    3030                        displaystring(verbose,'%s',['call computational core']);
    31                         control_core(femmodel);
     31                        femmodel=control_core(femmodel);
    3232
    3333                end
     34               
     35                displaystring(verbose,'%s',['write results']);
     36                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
     37
    3438        else
    3539                %launch dakota driver for diagnostic core solution
  • issm/trunk/src/m/solutions/jpl/diagnostic_core.m

    r4063 r4113  
    1 function results=diagnostic_core(model);
     1function femmodel=diagnostic_core(femmodel);
    22%DIAGNOSTIC_CORE - compute the core velocity field
    33%
     
    2828
    2929        %Compute slopes:
    30         if(ishutter)surfaceslope_core(femmodel);end
    31         if(isstokes)bedslope_core(femmodel);end
     30        if(ishutter)femmodel=surfaceslope_core(femmodel);end
     31        if(isstokes)femmodel=bedslope_core(femmodel);end
    3232
    3333        if ishutter,
     
    5959                        %"recondition" pressure computed previously:
    6060                        InputDuplicate(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureStokesEnum);
    61                         ScaleInput(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
     61                        InputScale(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
    6262
    6363                        displaystring(verbose,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);
  • issm/trunk/src/m/solutions/jpl/surfaceslope.m

    r4102 r4113  
    1 function md=slopecompute(md);
    2 %SLOPECOMPUTE - compute the slope of a model
     1function md=surfaceslopecompute(md);
     2%SLOPECOMPUTE - compute the surface slope of a model
    33%
    44%   Usage:
    5 %      md=slopecompute(md)
     5%      md=surfaceslope(md)
    66%
    77        %timing
     
    2121        if ~qmu_analysis,
    2222                displaystring(verbose,'%s',['call computational core']);
    23                 surfaceslope_core(femmodel);
     23                femmodel=surfaceslope_core(femmodel);
     24       
     25                displaystring(verbose,'%s',['write results']);
     26                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
     27
    2428        else
    2529                %launch dakota driver for diagnostic core solution
Note: See TracChangeset for help on using the changeset viewer.