Changeset 370


Ignore:
Timestamp:
05/12/09 16:55:27 (16 years ago)
Author:
Mathieu Morlighem
Message:

Now analysis_type is needed in diagnostic_core_nl

Location:
issm/trunk/src/m/solutions/cielo
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/solutions/cielo/GradJCompute.m

    r254 r370  
    55        disp('         computing velocities...')
    66end
    7 [u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs);
     7[u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs,'diagnostic_horiz');
    88
    99%Buid Du, difference between observed velocity and model velocity.

  • issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m

    r364 r370  
    107107                inputs=add(inputs,'velocity',soln(count).u_g,'doublevec',m.parameters.numberofdofspernode,m.parameters.numberofnodes);
    108108                m.parameters.kflag=1; m.parameters.pflag=0;
    109                 [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,loads,m.materials,m.parameters,inputs);
     109                [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,loads,m.materials,m.parameters,inputs,analysis_type);
    110110                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, m.Gmn, m.nodesets);
    111111                varargout(1)={K_ff};

  • issm/trunk/src/m/solutions/cielo/objectivefunctionC.m

    r276 r370  
    1515
    1616%Run diagnostic with updated parameters.
    17 u_g=diagnostic_core_nonlinear(m,inputs);
     17u_g=diagnostic_core_nonlinear(m,inputs,'diagnostic_horiz');
    1818
    1919%Compute misfit for this velocity field.
Note: See TracChangeset for help on using the changeset viewer.