Ignore:
Timestamp:
06/11/09 15:53:37 (16 years ago)
Author:
Eric.Larour
Message:

reworked diagnostic core to more resemble parallel core

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/solutions/cielo/diagnostic.m

    r738 r922  
    1111        %Build all models requested for diagnostic simulation
    1212        displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
    13         md.analysis_type='diagnostic'; md.sub_analysis_type='horiz'; m_dh=CreateFemModel(md);
     13        md.analysis_type='diagnostic'; md.sub_analysis_type='horiz'; models.dh=CreateFemModel(md);
    1414       
    1515        displaystring(md.debug,'\n%s',['reading diagnostic vert model data']);
    16         md.analysis_type='diagnostic'; md.sub_analysis_type='vert'; m_dv=CreateFemModel(md);
     16        md.analysis_type='diagnostic'; md.sub_analysis_type='vert'; models.dv=CreateFemModel(md);
    1717       
    1818        displaystring(md.debug,'\n%s',['reading diagnostic stokes model data']);
    19         md.analysis_type='diagnostic'; md.sub_analysis_type='stokes'; m_ds=CreateFemModel(md);
     19        md.analysis_type='diagnostic'; md.sub_analysis_type='stokes'; models.ds=CreateFemModel(md);
    2020
    2121        displaystring(md.debug,'\n%s',['reading diagnostic hutter model data']);
    22         md.analysis_type='diagnostic'; md.sub_analysis_type='hutter'; m_dhu=CreateFemModel(md);
     22        md.analysis_type='diagnostic'; md.sub_analysis_type='hutter'; models.dhu=CreateFemModel(md);
    2323       
    2424        displaystring(md.debug,'\n%s',['reading surface and bed slope computation model data']);
    25         md.analysis_type='slope_compute'; md.sub_analysis_type=''; m_sl=CreateFemModel(md);
     25        md.analysis_type='slope_compute'; md.sub_analysis_type=''; models.sl=CreateFemModel(md);
    2626       
    2727        % figure out number of dof: just for information purposes.
    28         md.dof=modelsize(m_dh,m_dv,m_ds,m_dhu,m_sl);
     28        md.dof=modelsize(models);
    2929
    3030        %initialize inputs
    3131        inputs=inputlist;
    32         inputs=add(inputs,'velocity',m_dh.parameters.u_g,'doublevec',3,m_dh.parameters.numberofnodes);
     32        inputs=add(inputs,'velocity',models.dh.parameters.u_g,'doublevec',3,models.dh.parameters.numberofnodes);
    3333
    3434        %compute solution
    35         [u_g,p_g]=diagnostic_core(m_dh,m_dhu,m_dv,m_ds,m_sl,inputs);
     35        results=diagnostic_core(models,inputs);
    3636
    37         %Load results onto model
    38         md=loadresults(md,u_g,p_g,m_dh,m_ds,m_dhu);
     37        %load results onto model
     38        md=loadresults(md,models,results);
    3939
    4040        %stop timing
Note: See TracChangeset for help on using the changeset viewer.