Changeset 13021


Ignore:
Timestamp:
08/13/12 15:31:21 (13 years ago)
Author:
seroussi
Message:

BUG: fixed NR problems caused by src/m reorganization

Location:
issm/trunk-jpl
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/m/contrib/hack/tres.m

    r13008 r13021  
    105105                case MaterialsRheologyBEnum(), string='rheology_B'; return
    106106                case MaterialsRheologyBbarEnum(), string='rheology_B'; return
    107                 case BalancethicknessThickeningRateEnum: string='dhdt'; return
     107                case BalancethicknessThickeningRateEnum(), string='dhdt'; return
    108108                case VxEnum(), string='vx'; return
    109109                case InversionVxObsEnum(), string='vx_obs'; return

  • issm/trunk-jpl/src/m/exp/expwrite.m

    r13010 r13021  
    1717fid=fopen(filename,'w');
    1818for n=1:length(a),
    19         if(length(contours(n).x)~=length(contours(n).y)),
     19        if(length(a(n).x)~=length(a(n).y)),
    2020                error('contours x and y coordinates must be of identical size');
    2121        end

  • issm/trunk-jpl/src/m/mesh/roundmesh.m

    r13010 r13021  
    2020y_list=radius*y_list.*sin(theta);
    2121A=struct('x',x_list,'y',y_list,'density',1);
    22 expwrite('RoundDomainOutline.exp',A);
     22expwrite(A,'RoundDomainOutline.exp');
    2323
    2424%Call Bamg

  • issm/trunk-jpl/test/NightlyRun/test218.m

    r12791 r13021  
    8484
    8585%Fields and tolerances to track changes
    86 md=tres(md,'dakota');
     86md.qmu.results=md.results.dakota;
    8787md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')';
    8888field_names     ={'importancefactors'};

  • issm/trunk-jpl/test/NightlyRun/test234.m

    r12791 r13021  
    5656%solve
    5757md=solve(md,TransientSolutionEnum,'overwrite','y');
    58 md=tres(md,'dakota');
     58md.qmu.results=md.results.dakota;
    5959
    6060%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test235.m

    r12791 r13021  
    5656%solve
    5757md=solve(md,TransientSolutionEnum,'overwrite','y');
    58 md=tres(md,'dakota');
     58md.qmu.results=md.results.dakota;
    5959
    6060%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test412.m

    r12804 r13021  
    3636
    3737%Fields and tolerances to track changes
    38 md=tres(md,'dakota');
     38md.qmu.results=md.results.dakota;
    3939md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')';
    4040field_names     ={'importancefactors'};

  • issm/trunk-jpl/test/NightlyRun/test413.m

    r12804 r13021  
    3737
    3838%Fields and tolerances to track changes
    39 md=tres(md,'dakota');
     39md.qmu.results=md.results.dakota;
    4040md.results.dakota.importancefactors=importancefactors(md,'scaled_FrictionCoefficient','MaxVel')';
    4141field_names     ={'importancefactors'};

  • issm/trunk-jpl/test/NightlyRun/test414.m

    r12804 r13021  
    4949%solve
    5050md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
    51 md=tres(md,'dakota');
     51md.qmu.results=md.results.dakota;
    5252
    5353%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test417.m

    r12804 r13021  
    5353
    5454%Fields and tolerances to track changes
    55 md=tres(md,'dakota');
     55md.qmu.results=md.results.dakota;
    5656
    5757%ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr

  • issm/trunk-jpl/test/NightlyRun/test420.m

    r12804 r13021  
    3333%solve
    3434md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
    35 md=tres(md,'dakota');
     35md.qmu.results=md.results.dakota;
    3636
    3737%test on thickness

  • issm/trunk-jpl/test/NightlyRun/test511.m

    r12805 r13021  
    88md=extrude(md,3,1);
    99md=setflowequation(md,'stokes','all');
    10 md=modelextract(md,md.mask.elementonfloatingice);
     10md=extract(md,md.mask.elementonfloatingice);
    1111
    1212%control parameters

  • issm/trunk-jpl/test/NightlyRun/test613.m

    r12806 r13021  
    66
    77%Ice sheet only
    8 md=modelextract(md,md.mask.elementongroundedice);
     8md=extract(md,md.mask.elementongroundedice);
    99pos=find(md.mesh.vertexonboundary);
    1010md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos);
Note: See TracChangeset for help on using the changeset viewer.