Changeset 21057


Ignore:
Timestamp:
08/03/16 08:48:38 (9 years ago)
Author:
Mathieu Morlighem
Message:

BUG: no more Enums in solve command

Location:
issm/trunk-jpl/examples
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/examples/Greenland/CheatSheet.m

    r20741 r21057  
    2828        %Go solve
    2929        md.cluster=generic('name',oshostname,'np',2);
    30         md=solve(md,TransientSolutionEnum);
     30        md=solve(md,'Transient');
    3131
    3232        save ./Models/Greenland.HistoricTransient_200yr md;

  • issm/trunk-jpl/examples/Greenland/runme.m

    r20741 r21057  
    7373        md.toolkits=toolkits;
    7474        md.verbose=verbose('solution',true,'control',true);
    75         md=solve(md,StressbalanceSolutionEnum);
     75        md=solve(md,'Stressbalance');
    7676
    7777        %Update model friction fields accordingly
    … …  
    107107        %Go solve
    108108        md.cluster=generic('name',oshostname,'np',2);
    109         md=solve(md,TransientSolutionEnum);
     109        md=solve(md,'Transient');
    110110
    111111        save ./Models/Greenland.Transient md;
    … …  
    204204        %Go solve
    205205        md.cluster=generic('name',oshostname,'np',2);
    206         md=solve(md,TransientSolutionEnum);
     206        md=solve(md,'Transient');
    207207
    208208        save ./Models/Greenland.HistoricTransient md;
    … …  
    298298        %Go solve
    299299        md.cluster=generic('name',oshostname,'np',2);
    300         md=solve(md,TransientSolutionEnum);
     300        md=solve(md,'Transient');
    301301
    302302        save ./Models/Greenland.BoxTransient md;

  • issm/trunk-jpl/examples/ISMIP/CheatyRunme.m

    r20532 r21057  
    174174        % we are solving a StressBalanc
    175175        %->
    176         md=solve(md,StressbalanceSolutionEnum());
     176        md=solve(md,'Stressbalance'());
    177177        % save the given model
    178178        %->
    … …  
    212212        % we are solving a TransientSolution
    213213        %->
    214         md=solve(md,TransientSolutionEnum);
     214        md=solve(md,'Transient');
    215215        % save the given model
    216216        %->

  • issm/trunk-jpl/examples/IceBridge/runme.m

    r20743 r21057  
    8787
    8888        md.verbose=verbose('solution',true,'control',true);
    89         md=solve(md,StressbalanceSolutionEnum);
     89        md=solve(md,'Stressbalance');
    9090
    9191        %Update model friction fields accordingly
    … …  
    119119        %Go solve
    120120        md.cluster=generic('name',oshostname,'np',2);
    121         md=solve(md,TransientSolutionEnum);
     121        md=solve(md,'Transient');
    122122
    123123        save ./Models/Greenland.Transient md;

  • issm/trunk-jpl/examples/IceflowModels/eismint.m

    r20949 r21057  
    2525md.cluster=generic('np',2);
    2626md.verbose.convergence=1;
    27 md=solve(md,StressbalanceSolutionEnum());
     27md=solve(md,'Stressbalance'());
    2828vel=DepthAverage(md,sqrt(md.results.StressbalanceSolution.Vx.^2+md.results.StressbalanceSolution.Vy.^2));
    2929

  • issm/trunk-jpl/examples/IceflowModels/runme.m

    r20949 r21057  
    66md=setflowequation(md,'HO','Contour.exp','fill','SSA','coupling','tiling');
    77%Solve
    8 md=solve(md,StressbalanceSolutionEnum);
     8md=solve(md,'Stressbalance');

  • issm/trunk-jpl/examples/Inversion/runme.m

    r20951 r21057  
    88        md = setflowequation(md,'SSA','all');
    99        md.cluster = generic('np',2);
    10         md = solve(md,StressbalanceSolutionEnum());
     10        md = solve(md,'Stressbalance'());
    1111        plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','"True" B',...
    1212                'data',md.results.StressbalanceSolution.Vel,'title','"observed velocities"')
    … …  
    2424        md.inversion.vel_obs = md.results.StressbalanceSolution.Vel;
    2525
    26         md = solve(md,StressbalanceSolutionEnum());
     26        md = solve(md,'Stressbalance'());
    2727        plotmodel(md,'axis#all','tight','data',md.materials.rheology_B,'caxis',[ 1.3 1.9]*10^8,'title','B first guess',...
    2828                'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
    … …  
    4545        %Go solve!
    4646        md.verbose=verbose(0);
    47         md=solve(md,StressbalanceSolutionEnum());
     47        md=solve(md,'Stressbalance'());
    4848        plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
    4949                'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')
    … …  
    6666        %Go solve!
    6767        md.verbose=verbose(0);
    68         md=solve(md,StressbalanceSolutionEnum());
     68        md=solve(md,'Stressbalance'());
    6969        plotmodel(md,'axis#all','tight','data',md.results.StressbalanceSolution.MaterialsRheologyBbar,'caxis',[ 1.3 1.9]*10^8,'title','inferred B',...
    7070                'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities')

  • issm/trunk-jpl/examples/Jakobshavn/runme.m

    r20702 r21057  
    6565        %Go solve
    6666        md.cluster=generic('name',oshostname,'np',4);
    67         md=solve(md,StressbalanceSolutionEnum);
     67        md=solve(md,'Stressbalance');
    6868       
    6969        save JksControl md

  • issm/trunk-jpl/examples/Pig/runme.m

    r20951 r21057  
    130130        md.toolkits=toolkits;
    131131        md.cluster=generic('name',oshostname,'np',2);
    132         md=solve(md,StressbalanceSolutionEnum);
     132        md=solve(md,'Stressbalance');
    133133
    134134        % Update model friction fields accordingly

  • issm/trunk-jpl/examples/PigSensitivity/Help.m

    r20765 r21057  
    1616
    1717        %Solve
    18         md=solve(md,TransientSolutionEnum);
     18        md=solve(md,'Transient');
    1919
    2020        %Save model

  • issm/trunk-jpl/examples/PigSensitivity/runme.m

    r20765 r21057  
    2020        md.transient.requested_outputs={'default','IceVolume','IceVolumeAboveFloatation'};
    2121
    22         md=solve(md,TransientSolutionEnum);
     22        md=solve(md,'Transient');
    2323
    2424        % Save model
    … …  
    3636        md.transient.requested_outputs={'default','IceVolume','IceVolumeAboveFloatation'};
    3737
    38         md=solve(md,TransientSolutionEnum);
     38        md=solve(md,'Transient');
    3939
    4040        save ./Models/PIG_HighMelt md;
    … …  
    5555        md2.transient.requested_outputs={'default','IceVolume','IceVolumeAboveFloatation'};
    5656
    57         md2=solve(md2,TransientSolutionEnum);
     57        md2=solve(md2,'Transient');
    5858
    5959        save ./Models/PIG_FrontRetreat md2;

  • issm/trunk-jpl/examples/SquareIceShelf/README

    r8294 r21057  
    44md=parameterize(md,'Square.par');
    55md=setelementstype(md,'macayeal','all');
    6 md=solve(md,DiagnosticSolutionEnum);
     6md=solve(md,'Stressbalance');

  • issm/trunk-jpl/examples/SquareIceShelf/runme.m

    r18823 r21057  
    55md=setflowequation(md,'SSA','all');
    66md.cluster=generic('name',oshostname,'np',2);
    7 md=solve(md,StressbalanceSolutionEnum());
     7md=solve(md,'Stressbalance'());

  • issm/trunk-jpl/examples/UncertaintyQuantification/runme.m

    r20763 r21057  
    155155        %Turn dakota on
    156156        md.qmu.isdakota=1; md.inversion.iscontrol=0;
    157         md=solve(md,StressbalanceSolutionEnum,'overwrite','y');
     157        md=solve(md,'Stressbalance','overwrite','y');
    158158
    159159        save ./Models/PIG.Sampling md;
    … …  
    237237        md.qmu.isdakota=1; md.inversion.iscontrol=0;
    238238        md.verbose=verbose('qmu',true);
    239         md=solve(md,StressbalanceSolutionEnum,'overwrite','y');
     239        md=solve(md,'Stressbalance','overwrite','y');
    240240       
    241241        save ./Models/PIG.Sensitivity md;
Note: See TracChangeset for help on using the changeset viewer.