Changeset 13663


Ignore:
Timestamp:
10/15/12 11:31:48 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: cosmetics on matlab file (model -> model(); Enum -> Enum())

Location:
issm/trunk-jpl/test/NightlyRun
Files:
115 edited

Legend:

Unmodified
Added
Removed

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

    r13508 r13663  
    2323md.autodiff.driver='fos_reverse';
    2424
    25 md=solve(md,TransientSolutionEnum);
     25md=solve(md,TransientSolutionEnum());
    2626
    2727%plot

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

    r13535 r13663  
    1717md.autodiff.driver='fov_forward';
    1818
    19 md=solve(md,TransientSolutionEnum);
     19md=solve(md,TransientSolutionEnum());

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

    r11186 r13663  
    1212        nx=20; %numberof nodes in x direction
    1313        ny=20;
    14         md=model;
     14        md=model();
    1515        md=squaremesh(md,L,L,nx,ny);
    1616        md=setmask(md,'',''); %ice sheet test
    … …  
    4040        %Compute the diagnostic
    4141        md.cluster=generic('name',oshostname(),'np',8);
    42         md=solve(md,DiagnosticSolutionEnum);
     42        md=solve(md,DiagnosticSolutionEnum());
    4343
    4444        %Plot the results and save them

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

    r10976 r13663  
    1212        nx=20; %numberof nodes in x direction
    1313        ny=20;
    14         md=model;
     14        md=model();
    1515        md=squaremesh(md,L,L,nx,ny);
    1616        md=setmask(md,'',''); %ice sheet test
    … …  
    4949        md.diagnostic.restol=1;
    5050        md.cluster=generic('name',oshostname(),'np',8);
    51         md=solve(md,DiagnosticSolutionEnum);
     51        md=solve(md,DiagnosticSolutionEnum());
    5252
    5353        %Plot the results and save them

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

    r11193 r13663  
    1010        nx=20; %numberof nodes in x direction
    1111        ny=20;
    12         md=model;
     12        md=model();
    1313        md=squaremesh(md,L,L,nx,ny);
    1414        md=setmask(md,'',''); %ice sheet test
    … …  
    3737        %Compute the diagnostic
    3838        md.cluster=generic('name',oshostname(),'np',8);
    39         md=solve(md,DiagnosticSolutionEnum);
     39        md=solve(md,DiagnosticSolutionEnum());
    4040
    4141        %Plot the results and save them

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

    r11550 r13663  
    99        nx=20; %numberof nodes in x direction
    1010        ny=20;
    11         md=model;
     11        md=model();
    1212        md=squaremesh(md,L,L,nx,ny);
    1313        md=setmask(md,'',''); %ice sheet test
    … …  
    3737        md.diagnostic.abstol=NaN;
    3838        md.cluster=generic('name',oshostname(),'np',8);
    39         md=solve(md,DiagnosticSolutionEnum);
     39        md=solve(md,DiagnosticSolutionEnum());
    4040        pos=find(md.mesh.x==0 | md.mesh.y==0 | md.mesh.x==max(md.mesh.x) | md.mesh.y==max(md.mesh.y));
    4141        md.diagnostic.spcvx(pos)=md.results.DiagnosticSolution.Vx(pos);
    … …  
    4343        md.diagnostic.vertex_pairing=[];
    4444        md=setflowequation(md,'stokes','all');
    45         md=solve(md,DiagnosticSolutionEnum);
     45        md=solve(md,DiagnosticSolutionEnum());
    4646
    4747        %Plot the results and save them

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

    r11550 r13663  
    1212        nx=30; %number of nodes in x direction
    1313        ny=30;
    14         md=model;
     14        md=model();
    1515        md=squaremesh(md,L,L,nx,ny);
    1616        md=setmask(md,'',''); %ice sheet test
    … …  
    6363        %Compute the diagnostic
    6464        md.cluster=generic('name',oshostname(),'np',8);
    65         md=solve(md,DiagnosticSolutionEnum);
     65        md=solve(md,DiagnosticSolutionEnum());
    6666
    6767        %Plot the results and save them

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

    r11323 r13663  
    4141        %Compute the diagnostic
    4242        md.cluster=generic('name',oshostname(),'np',8);
    43         md=solve(md,DiagnosticSolutionEnum);
     43        md=solve(md,DiagnosticSolutionEnum());
    4444
    4545        %Plot the results and save them

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

    r12811 r13663  
    1212        nx=30; %numberof nodes in x direction
    1313        ny=30;
    14         md=model;
     14        md=model();
    1515        md=squaremesh(md,L,L,nx,ny);
    1616        md=setmask(md,'',''); %ice sheet test
    … …  
    5858        %Compute the diagnostic
    5959        md.cluster=generic('name',oshostname(),'np',8);
    60         md=solve(md,DiagnosticSolutionEnum);
     60        md=solve(md,DiagnosticSolutionEnum());
    6161
    6262        %Plot the results and save them

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

    r12811 r13663  
    99        nx=30; %numberof nodes in x direction
    1010        ny=30;
    11         md=model;
     11        md=model();
    1212        md=squaremesh(md,L,L,nx,ny);
    1313        md=setmask(md,'',''); %ice sheet test
    … …  
    3939        md.cluster=generic('name',oshostname(),'np',8);
    4040        md.verbose=verbose('convergence',true);
    41         md=solve(md,DiagnosticSolutionEnum);
     41        md=solve(md,DiagnosticSolutionEnum());
    4242        md.diagnostic.reltol=NaN;
    4343        md.diagnostic.abstol=NaN;
    … …  
    5151        md.diagnostic.spcvy(pos)=md.results.DiagnosticSolution.Vy(pos);
    5252        md=setflowequation(md,'stokes','all');
    53         md=solve(md,DiagnosticSolutionEnum);
     53        md=solve(md,DiagnosticSolutionEnum());
    5454
    5555        %Plot the results and save them

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

    r11550 r13663  
    1313        nx=3; %number of nodes in x direction
    1414        ny=51;
    15         md=model;
     15        md=model();
    1616        md=squaremesh(md,Lx,Ly,nx,ny);
    1717        md=setmask(md,'',''); %ice sheet test
    … …  
    4949        %Compute the diagnostic
    5050        md.cluster=generic('name',oshostname(),'np',8);
    51         md=solve(md,DiagnosticSolutionEnum);
     51        md=solve(md,DiagnosticSolutionEnum());
    5252
    5353        vx=(md.results.DiagnosticSolution.Vx);

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

    r11550 r13663  
    77        nx=30; %numberof nodes in x direction
    88        ny=30;
    9         md=model;
     9        md=model();
    1010        md=squaremesh(md,L,L,nx,ny);
    1111        %md=triangle(md,'../Exp/SquareISMIP.exp',5500);
    … …  
    5757        md.cluster=generic('name',oshostname(),'np',8);
    5858        md.verbose=verbose('convergence',true,'solution',true);
    59         md=solve(md,TransientSolutionEnum);
     59        md=solve(md,TransientSolutionEnum());
    6060
    6161        %save the results

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

    r11194 r13663  
    3838        md.settings.output_frequency=500; %keep only last step
    3939        md.verbose=verbose();
    40         md=solve(md,TransientSolutionEnum);
     40        md=solve(md,TransientSolutionEnum());
    4141        results{stabilization}=(md.results.TransientSolution(end).Thickness);
    4242end

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

    r11014 r13663  
    33
    44%tests 3 and 4: using Glen's flow law
    5 md=model;
     5md=model();
    66md=triangle(md,'../Exp/SquareEISMINT.exp',3550);
    77md=setmask(md,'all','');
    … …  
    1111%Compute solution for MacAyeal's model
    1212md.cluster=generic('name',oshostname(),'np',8);
    13 md=solve(md,DiagnosticSolutionEnum);
     13md=solve(md,DiagnosticSolutionEnum());
    1414
    1515%plot results

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

    r11014 r13663  
    33
    44%test 5 and 6 :
    5 md=model;
     5md=model();
    66md=triangle(md,'../Exp/SquareEISMINT.exp',5100); %test3
    77md=setmask(md,'all','');
    … …  
    1515%Compute solution for MacAyeal's model
    1616md.cluster=generic('name',oshostname(),'np',8);
    17 md=solve(md,DiagnosticSolutionEnum);
     17md=solve(md,DiagnosticSolutionEnum());
    1818
    1919vx=(md.results.DiagnosticSolution.Vx);

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

    r11014 r13663  
    33
    44%tests 3 and 4: using Glen's flow law
    5 md=model;
     5md=model();
    66md=triangle(md,'../Exp/SquareEISMINT.exp',3550);
    77md=setmask(md,'all','');
    … …  
    1515%Compute solution for MacAyeal's model
    1616md.cluster=generic('name',oshostname(),'np',8);
    17 md=solve(md,DiagnosticSolutionEnum);
     17md=solve(md,DiagnosticSolutionEnum());
    1818
    1919%plot results
    … …  
    2424md.timestepping.final_time=5000;
    2525md.prognostic.stabilization=1;
    26 md=solve(md,TransientSolutionEnum);
     26md=solve(md,TransientSolutionEnum());
    2727
    2828plotmodel(md,'data',(md.results.TransientSolution(end).Vx))

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

    r10976 r13663  
    66
    77%To begin with the numerical model
    8 md=model;
     8md=model();
    99md=roundmesh(md,750000,resolution);
    1010md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
    … …  
    2929%Now we can solve the problem
    3030md.cluster=generic('name',oshostname(),'np',8);
    31 md=solve(md,DiagnosticSolutionEnum);
     31md=solve(md,DiagnosticSolutionEnum());
    3232
    3333%Calculate the depth averaged velocity field (2d):

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

    r11193 r13663  
    66
    77%To begin with the numerical model
    8 md=model;
     8md=model();
    99md=roundmesh(md,750000,resolution);
    1010md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
    … …  
    2929%Now we can solve the problem
    3030md.cluster=generic('name',oshostname(),'np',8);
    31 md=solve(md,DiagnosticSolutionEnum);
     31md=solve(md,DiagnosticSolutionEnum());
    3232
    3333%Calculate the depth averaged velocity field (2d):

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

    r10976 r13663  
    66
    77%To begin with the numerical model
    8 md=model;
     8md=model();
    99md=roundmesh(md,750000,resolution);
    1010md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
    … …  
    2929%Now we can solve the problem
    3030md.cluster=generic('name',oshostname(),'np',8);
    31 md=solve(md,DiagnosticSolutionEnum);
     31md=solve(md,DiagnosticSolutionEnum());
    3232
    3333%Calculate the depth averaged velocity field (2d):

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

    r11204 r13663  
    2727%Now we can solve the problem
    2828md.cluster=generic('name',oshostname(),'np',8);
    29 md=solve(md,TransientSolutionEnum);
     29md=solve(md,TransientSolutionEnum());
    3030
    3131%Fields and tolerances to track changes

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

    r11193 r13663  
    55printingflag=false;
    66
    7 md=model;
     7md=model();
    88md=triangle(md,'../Exp/Square.exp',100000);
    99md=setmask(md,'','');
    … …  
    2626%modeled  results
    2727md.cluster=generic('name',oshostname(),'np',2);
    28 md=solve(md,ThermalSolutionEnum);
     28md=solve(md,ThermalSolutionEnum());
    2929
    3030%plot results

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

    r11172 r13663  
    44printingflag=false;
    55
    6 md=model;
     6md=model();
    77md=triangle(md,'../Exp/Square.exp',100000);
    88md=setmask(md,'','');
    … …  
    2828%modeled  results
    2929md.cluster=generic('name',oshostname(),'np',2);
    30 md=solve(md,ThermalSolutionEnum);
     30md=solve(md,ThermalSolutionEnum());
    3131
    3232%plot results

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

    r11024 r13663  
    55printingflag=false;
    66
    7 md=model;
     7md=model();
    88md=triangle(md,'../Exp/Square.exp',100000);
    99md=setmask(md,'all','');
    … …  
    2222%modeled  results
    2323md.cluster=generic('name',oshostname(),'np',2);
    24 md=solve(md,ThermalSolutionEnum);
     24md=solve(md,ThermalSolutionEnum());
    2525
    2626%plot results

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

    r11024 r13663  
    55printingflag=false;
    66
    7 md=model;
     7md=model();
    88md=triangle(md,'../Exp/Square.exp',100000);
    99md=setmask(md,'','');
    … …  
    2323%modeled  results
    2424md.cluster=generic('name',oshostname(),'np',2);
    25 md=solve(md,ThermalSolutionEnum);
     25md=solve(md,ThermalSolutionEnum());
    2626
    2727%plot results

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

    r9850 r13663  
    77nx=70; %numberof nodes in x direction
    88ny=70;
    9 md=model;
     9md=model();
    1010
    1111%mesh adaptation loop YAMS

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

    r9850 r13663  
    66nx=30; %numberof nodes in x direction
    77ny=30;
    8 md=model;
     8md=model();
    99
    1010%mesh adaptation loop YAMS

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

    r11014 r13663  
    1717md.basalforcings.melting_rate= smb;
    1818
    19 md=solve(md,PrognosticSolutionEnum);
     19md=solve(md,PrognosticSolutionEnum());
    2020
    2121for i=1:10
    22          md=solve(md,PrognosticSolutionEnum);
     22         md=solve(md,PrognosticSolutionEnum());
    2323         md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - ((md.results.PrognosticSolution.Thickness)-md.geometry.thickness);
    2424end
    … …  
    3333md.surfaceforcings.mass_balance(end+1,:)=[1:2000];
    3434
    35 md=solve(md,TransientSolutionEnum);
     35md=solve(md,TransientSolutionEnum());
    3636
    3737%Fields and tolerances to track changes

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

    r11254 r13663  
    1818md.basalforcings.melting_rate= smb;
    1919
    20 md=solve(md,PrognosticSolutionEnum);
     20md=solve(md,PrognosticSolutionEnum());
    2121
    2222for i=1:10
    23          md=solve(md,PrognosticSolutionEnum);
     23         md=solve(md,PrognosticSolutionEnum());
    2424         md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - ((md.results.PrognosticSolution.Thickness)-md.geometry.thickness);
    2525end
    … …  
    3434md.surfaceforcings.mass_balance(end+1,:)=[1:2000];
    3535
    36 md=solve(md,TransientSolutionEnum);
     36md=solve(md,TransientSolutionEnum());
    3737
    3838%Fields and tolerances to track changes

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

    r11024 r13663  
    99
    1010md.cluster=generic('name',oshostname,'np',2);
    11 md=solve(md,DiagnosticSolutionEnum);
     11md=solve(md,DiagnosticSolutionEnum());
    1212vel0=md.results.DiagnosticSolution.Vel;
    1313
    … …  
    2020md.diagnostic.referential(:,1:3)=repmat([cos(theta),sin(theta),0],md.mesh.numberofvertices,1);
    2121md.diagnostic.referential(:,4:6)=repmat([0,0,1],md.mesh.numberofvertices,1);
    22 md=solve(md,DiagnosticSolutionEnum);
     22md=solve(md,DiagnosticSolutionEnum());
    2323vel1=md.results.DiagnosticSolution.Vel;
    2424
    … …  
    3131md.diagnostic.referential(pos,1:3)=repmat([cos(theta),sin(theta),0],size(pos,1),1);
    3232md.diagnostic.referential(pos,4:6)=repmat([0,0,1],size(pos,1),1);
    33 md=solve(md,DiagnosticSolutionEnum);
     33md=solve(md,DiagnosticSolutionEnum());
    3434vel2=md.results.DiagnosticSolution.Vel;
    3535

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

    r11024 r13663  
    1010
    1111md.cluster=generic('name',oshostname,'np',3);
    12 md=solve(md,DiagnosticSolutionEnum);
     12md=solve(md,DiagnosticSolutionEnum());
    1313vel0=md.results.DiagnosticSolution.Vel;
    1414
    … …  
    2121md.diagnostic.referential(:,1:3)=repmat([cos(theta),sin(theta),0],md.mesh.numberofvertices,1);
    2222md.diagnostic.referential(:,4:6)=repmat([0,0,1],md.mesh.numberofvertices,1);
    23 md=solve(md,DiagnosticSolutionEnum);
     23md=solve(md,DiagnosticSolutionEnum());
    2424vel1=md.results.DiagnosticSolution.Vel;
    2525

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

    r13433 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md.diagnostic.requested_outputs=StressTensorEnum;
     6md.diagnostic.requested_outputs=StressTensorEnum();
    77md.autodiff.isautodiff=true;
    88md.verbose=verbose('autodiff',true);
    9 md=solve(md,DiagnosticSolutionEnum);
     9md=solve(md,DiagnosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes

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

    r13433 r13663  
    77md.autodiff.isautodiff=true;
    88md.verbose=verbose('autodiff',true);
    9 md=solve(md,DiagnosticSolutionEnum);
     9md=solve(md,DiagnosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes

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

    r13433 r13663  
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.diagnostic.requested_outputs=StressTensorEnum;
     7md.diagnostic.requested_outputs=StressTensorEnum();
    88md.autodiff.isautodiff=true;
    99md.verbose=verbose('autodiff',true);
    10 md=solve(md,DiagnosticSolutionEnum);
     10md=solve(md,DiagnosticSolutionEnum());
    1111
    1212%Fields and tolerances to track changes

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

    r13433 r13663  
    77md.autodiff.isautodiff=true;
    88md.verbose=verbose('autodiff',true);
    9 md=solve(md,DiagnosticSolutionEnum);
     9md=solve(md,DiagnosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes

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

    r13433 r13663  
    66md.autodiff.isautodiff=true;
    77md.verbose=verbose('autodiff',true);
    8 md=solve(md,PrognosticSolutionEnum);
     8md=solve(md,PrognosticSolutionEnum());
    99
    1010%Fields and tolerances to track changes

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

    r13433 r13663  
    99md.autodiff.isautodiff=true;
    1010md.verbose=verbose('autodiff',true);
    11 md=solve(md,PrognosticSolutionEnum);
     11md=solve(md,PrognosticSolutionEnum());
    1212
    1313%Fields and tolerances to track changes

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

    r13433 r13663  
    77md.autodiff.isautodiff=true;
    88md.verbose=verbose('autodiff',true);
    9 md=solve(md,PrognosticSolutionEnum);
     9md=solve(md,PrognosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes

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

    r13433 r13663  
    88md.autodiff.isautodiff=true;
    99md.verbose=verbose('autodiff',true);
    10 md=solve(md,ThermalSolutionEnum);
     10md=solve(md,ThermalSolutionEnum());
    1111
    1212%Fields and tolerances to track changes

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

    r13433 r13663  
    1111md.autodiff.isautodiff=true;
    1212md.verbose=verbose('autodiff',true);
    13 md=solve(md,TransientSolutionEnum);
     13md=solve(md,TransientSolutionEnum());
    1414
    1515%Fields and tolerances to track changes

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

    r13433 r13663  
    88md.autodiff.isautodiff=true;
    99md.verbose=verbose('autodiff',true);
    10 md=solve(md,TransientSolutionEnum);
     10md=solve(md,TransientSolutionEnum());
    1111
    1212%Fields and tolerances to track changes

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

    r13552 r13663  
    88md=setflowequation(md,'macayeal','all');
    99md.cluster=generic('name',oshostname(),'np',3);
    10 md.prognostic.requested_outputs=IceVolumeEnum;
     10md.prognostic.requested_outputs=IceVolumeEnum();
    1111md.verbose=verbose('autodiff',true);
    1212
    … …  
    4141md=SetIceShelfBC(md);
    4242
    43 md=solve(md,PrognosticSolutionEnum);
     43md=solve(md,PrognosticSolutionEnum());
    4444V0=md.results.PrognosticSolution.IceVolume;
    4545
    … …  
    5252md=SetIceShelfBC(md);
    5353
    54 md=solve(md,PrognosticSolutionEnum);
     54md=solve(md,PrognosticSolutionEnum());
    5555V2=md.results.PrognosticSolution.IceVolume;
    5656
    … …  
    6666md=SetIceShelfBC(md);
    6767
    68 md=solve(md,PrognosticSolutionEnum);
     68md=solve(md,PrognosticSolutionEnum());
    6969%retrieve directly
    7070dVdh_ad=md.results.PrognosticSolution.AutodiffJacobian;

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

    r13516 r13663  
    1414md.autodiff.driver='fos_reverse';
    1515
    16 md=solve(md,TransientSolutionEnum);
     16md=solve(md,TransientSolutionEnum());
    1717
    1818%recover jacobian:
    … …  
    2525md.autodiff.driver='fov_forward';
    2626
    27 md=solve(md,TransientSolutionEnum);
     27md=solve(md,TransientSolutionEnum());
    2828
    2929%recover jacobian:

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

    r13516 r13663  
    88md=setflowequation(md,'macayeal','all');
    99md.cluster=generic('name',oshostname(),'np',3);
    10 md.transient.requested_outputs=[IceVolumeEnum;MaxVelEnum];
     10md.transient.requested_outputs=[IceVolumeEnum();MaxVelEnum];
    1111md.verbose=verbose('autodiff',true);
    1212md.diagnostic.restol=.000001;
    … …  
    4343md=SetIceShelfBC(md);
    4444
    45 md=solve(md,TransientSolutionEnum);
     45md=solve(md,TransientSolutionEnum());
    4646V0=md.results.TransientSolution(end).IceVolume;
    4747MaxV0=md.results.TransientSolution(end).MaxVel;
    … …  
    5555md=SetIceShelfBC(md);
    5656
    57 md=solve(md,TransientSolutionEnum);
     57md=solve(md,TransientSolutionEnum());
    5858V2=md.results.TransientSolution(end).IceVolume;
    5959MaxV2=md.results.TransientSolution(end).MaxVel;
    … …  
    7272md=SetIceShelfBC(md);
    7373
    74 md=solve(md,TransientSolutionEnum);
     74md=solve(md,TransientSolutionEnum());
    7575%retrieve directly
    7676dVdh_ad=md.results.TransientSolution(1).AutodiffJacobian(1);

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

    r13529 r13663  
    2222md.surfaceforcings.smbref=smbref';
    2323md.cluster=generic('name',oshostname(),'np',3);
    24 md=solve(md,TransientSolutionEnum);
     24md=solve(md,TransientSolutionEnum());
    2525
    2626%Fields and tolerances to track changes

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

    r13529 r13663  
    2323md.transient.requested_outputs=TotalSmbEnum();
    2424md.cluster=generic('name',oshostname(),'np',3);
    25 md=solve(md,TransientSolutionEnum);
     25md=solve(md,TransientSolutionEnum());
    2626
    2727%Fields and tolerances to track changes

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

    r12804 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,DiagnosticSolutionEnum);
     6md=solve(md,DiagnosticSolutionEnum());
    77
    88%Fields and tolerances to track changes

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

    r12804 r13663  
    55md=setflowequation(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12804 r13663  
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12804 r13663  
    55md=setflowequation(md,'stokes','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12804 r13663  
    55md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12804 r13663  
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.timestepping.time_step=0;
    8 md=solve(md,ThermalSolutionEnum);
     8md=solve(md,ThermalSolutionEnum());
    99
    1010%Fields and tolerances to track changes

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

    r12804 r13663  
    99md.transient.isthermal=1;
    1010md.transient.isgroundingline=0;
    11 md=solve(md,TransientSolutionEnum);
     11md=solve(md,TransientSolutionEnum());
    1212
    1313%Fields and tolerances to track changes

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

    r12804 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,TransientSolutionEnum);
     6md=solve(md,TransientSolutionEnum());
    77
    88%Fields and tolerances to track changes

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

    r12804 r13663  
    55md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,TransientSolutionEnum);
     7md=solve(md,TransientSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12804 r13663  
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.timestepping.time_step=0;
    8 md=solve(md,SteadystateSolutionEnum);
     8md=solve(md,SteadystateSolutionEnum());
    99
    1010%Fields and tolerances to track changes

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

    r12804 r13663  
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.timestepping.time_step=0;
    8 md=solve(md,SteadystateSolutionEnum);
     8md=solve(md,SteadystateSolutionEnum());
    99
    1010%Fields and tolerances to track changes

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

    r13021 r13663  
    3333
    3434%solve
    35 md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
     35md=solve(md,DiagnosticSolutionEnum(),'overwrite','y');
    3636
    3737%Fields and tolerances to track changes

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

    r13021 r13663  
    3434
    3535%solve
    36 md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
     36md=solve(md,DiagnosticSolutionEnum(),'overwrite','y');
    3737
    3838%Fields and tolerances to track changes

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

    r13021 r13663  
    4848
    4949%solve
    50 md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
     50md=solve(md,DiagnosticSolutionEnum(),'overwrite','y');
    5151md.qmu.results=md.results.dakota;
    5252

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

    r12804 r13663  
    2020
    2121md.cluster=generic('name',oshostname(),'np',3);
    22 md=solve(md,SteadystateSolutionEnum);
     22md=solve(md,SteadystateSolutionEnum());
    2323
    2424%Fields and tolerances to track changes

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

    r12804 r13663  
    2020
    2121md.cluster=generic('name',oshostname(),'np',3);
    22 md=solve(md,SteadystateSolutionEnum);
     22md=solve(md,SteadystateSolutionEnum());
    2323
    2424%Fields and tolerances to track changes

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

    r13021 r13663  
    5050md.diagnostic.reltol=10^-5; %tighten for qmu analyses
    5151
    52 md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
     52md=solve(md,DiagnosticSolutionEnum(),'overwrite','y');
    5353
    5454%Fields and tolerances to track changes

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

    r12804 r13663  
    55md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r13021 r13663  
    3232
    3333%solve
    34 md=solve(md,DiagnosticSolutionEnum,'overwrite','y');
     34md=solve(md,DiagnosticSolutionEnum(),'overwrite','y');
    3535md.qmu.results=md.results.dakota;
    3636

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

    r13340 r13663  
    55md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12804 r13663  
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.diagnostic.reltol=0.4;
    8 md=solve(md,DiagnosticSolutionEnum);
     8md=solve(md,DiagnosticSolutionEnum());
    99
    1010%Fields and tolerances to track changes

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

    r12804 r13663  
    2525%test different grounding line dynamics.
    2626md.groundingline.migration='AgressiveMigration';
    27 md=solve(md,TransientSolutionEnum);
     27md=solve(md,TransientSolutionEnum());
    2828element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice);
    2929
    3030md.groundingline.migration='SoftMigration';
    31 md=solve(md,TransientSolutionEnum);
     31md=solve(md,TransientSolutionEnum());
    3232element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice);
    3333

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

    r12804 r13663  
    1616
    1717md.cluster=generic('name',oshostname(),'np',3);
    18 md=solve(md,TransientSolutionEnum);
     18md=solve(md,TransientSolutionEnum());
    1919
    2020%Fields and tolerances to track changes

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

    r12804 r13663  
    1616
    1717md.cluster=generic('name',oshostname(),'np',3);
    18 md=solve(md,TransientSolutionEnum);
     18md=solve(md,TransientSolutionEnum());
    1919
    2020%Fields and tolerances to track changes

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

    r12804 r13663  
    1818md.cluster=generic('name',oshostname(),'np',3);
    1919
    20 md=solve(md,TransientSolutionEnum);
     20md=solve(md,TransientSolutionEnum());
    2121
    2222%Fields and tolerances to track changes

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

    r12804 r13663  
    1717md.groundingline.migration='SoftMigration';
    1818md.cluster=generic('name',oshostname(),'np',3);
    19 md=solve(md,TransientSolutionEnum);
     19md=solve(md,TransientSolutionEnum());
    2020
    2121%Fields and tolerances to track changes

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

    r12804 r13663  
    66md.diagnostic.restol=0.0001;
    77md.cluster=generic('name',oshostname(),'np',3);
    8 md=solve(md,DiagnosticSolutionEnum);
     8md=solve(md,DiagnosticSolutionEnum());
    99
    1010%Fields and tolerances to track changes

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

    r12804 r13663  
    77md.diagnostic.restol=0.0001;
    88md.cluster=generic('name',oshostname(),'np',3);
    9 md=solve(md,DiagnosticSolutionEnum);
     9md=solve(md,DiagnosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes

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

    r12804 r13663  
    77md.diagnostic.restol=0.0001;
    88md.cluster=generic('name',oshostname(),'np',3);
    9 md=solve(md,DiagnosticSolutionEnum);
     9md=solve(md,DiagnosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes

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

    r12804 r13663  
    88md.thermal.isenthalpy=1;
    99md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
    10 md=solve(md,SteadystateSolutionEnum);
     10md=solve(md,SteadystateSolutionEnum());
    1111
    1212%Fields and tolerances to track changes

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

    r12804 r13663  
    88md.thermal.isenthalpy=1;
    99md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
    10 md=solve(md,SteadystateSolutionEnum);
     10md=solve(md,SteadystateSolutionEnum());
    1111
    1212%Fields and tolerances to track changes

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

    r13657 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,DiagnosticSolutionEnum);
     6md=solve(md,DiagnosticSolutionEnum());
    77
    88%Fields and tolerances to track changes

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000).;
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    … …  
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test502.py

    r13657 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',20000)
     10md=triangle(model(),'../Exp/Pig.exp',20000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    … …  
    55md=setflowequation(md,'stokes','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,DiagnosticSolutionEnum);
     7md=solve(md,DiagnosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test503.py

    r13657 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',20000)
     10md=triangle(model(),'../Exp/Pig.exp',20000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,TransientSolutionEnum);
     6md=solve(md,TransientSolutionEnum());
    77
    88%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test504.py

    r13657 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',20000)
     10md=triangle(model(),'../Exp/Pig.exp',20000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,3,1);
     4md=extrude(md,3,1.);
    55md=setflowequation(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,TransientSolutionEnum);
     7md=solve(md,TransientSolutionEnum());
    88
    99%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test505.py

    r13657 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',30000)
     10md=triangle(model(),'../Exp/Pig.exp',30000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')
    13 md.extrude(3,1)
     13md.extrude(3,1.)
    1414md=setflowequation(md,'macayeal','all')
    1515md.cluster=generic('name',oshostname(),'np',3)

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,2,1);
     4md=extrude(md,2,1.);
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,TransientSolutionEnum);
     7md=solve(md,TransientSolutionEnum());
    88
    99%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test506.py

    r13658 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',30000)
     10md=triangle(model(),'../Exp/Pig.exp',30000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')
    13 md.extrude(2,1)
     13md.extrude(2,1.)
    1414md=setflowequation(md,'pattyn','all')
    1515md.cluster=generic('name',oshostname(),'np',3)

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

    r13658 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,2,1);
     4md=extrude(md,2,1.);
    55md=setflowequation(md,'stokes','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,TransientSolutionEnum);
     7md=solve(md,TransientSolutionEnum());
    88
    99%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test507.py

    r13658 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',30000)
     10md=triangle(model(),'../Exp/Pig.exp',30000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')
    13 md.extrude(2,1)
     13md.extrude(2,1.)
    1414md=setflowequation(md,'stokes','all')
    1515md.cluster=generic('name',oshostname(),'np',3)

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

    r13658 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    … …  
    55md=setflowequation(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.timestepping.time_step=0;
    8 md=solve(md,SteadystateSolutionEnum);
     7md.timestepping.time_step=0.;
     8md=solve(md,SteadystateSolutionEnum());
    99
    1010%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test508.py

    r13658 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',30000)
     10md=triangle(model(),'../Exp/Pig.exp',30000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')
    … …  
    1414md=setflowequation(md,'macayeal','all')
    1515md.cluster=generic('name',oshostname(),'np',3)
    16 md.timestepping.time_step=0
     16md.timestepping.time_step=0.
    1717md=solve(md,SteadystateSolutionEnum())
    1818

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,3,1);
     4md=extrude(md,3,1.);
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.timestepping.time_step=0;
    8 md=solve(md,SteadystateSolutionEnum);
     7md.timestepping.time_step=0.;
     8md=solve(md,SteadystateSolutionEnum());
    99
    1010%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test509.py

    r13658 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',30000)
     10md=triangle(model(),'../Exp/Pig.exp',30000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')
    13 md.extrude(3,1)
     13md.extrude(3,1.)
    1414md=setflowequation(md,'pattyn','all')
    1515md.cluster=generic('name',oshostname(),'np',3)
    16 md.timestepping.time_step=0
     16md.timestepping.time_step=0.
    1717md=solve(md,SteadystateSolutionEnum())
    1818

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

    r13662 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,2,1);
     4md=extrude(md,2,1.);
    55md=setflowequation(md,'stokes','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.timestepping.time_step=0;
    8 md=solve(md,SteadystateSolutionEnum);
     7md.timestepping.time_step=0.;
     8md=solve(md,SteadystateSolutionEnum());
    99
    1010%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test510.py

    r13662 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',20000)
     10md=triangle(model(),'../Exp/Pig.exp',20000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')
    13 md.extrude(2,1)
     13md.extrude(2,1.)
    1414md=setflowequation(md,'stokes','all')
    1515md.cluster=generic('name',oshostname(),'np',3)
    16 md.timestepping.time_step=0
     16md.timestepping.time_step=0.
    1717md=solve(md,SteadystateSolutionEnum())
    1818

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

    r13021 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',10000);
     1md=triangle(model,'../Exp/Pig.exp',10000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    … …  
    66md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    77md.geometry.surface=md.geometry.bed+md.geometry.thickness;
    8 md=extrude(md,3,1);
     8md=extrude(md,3,1.);
    99md=setflowequation(md,'stokes','all');
    1010md=extract(md,md.mask.elementonfloatingice);
    … …  
    1313md.inversion.iscontrol=1;
    1414md.inversion.control_parameters={'MaterialsRheologyBbar'};
    15 md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1);
    16 md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1);
     15md.inversion.min_parameters=10.^6*ones(md.mesh.numberofvertices,1);
     16md.inversion.max_parameters=2.*10^9*ones(md.mesh.numberofvertices,1);
    1717md.inversion.nsteps=2;
    1818md.inversion.cost_functions=101*ones(md.inversion.nsteps,1);
    1919md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    20 md.inversion.gradient_scaling=10^8*ones(md.inversion.nsteps,1);
    21 md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
     20md.inversion.gradient_scaling=10.^8*ones(md.inversion.nsteps,1);
     21md.inversion.maxiter_per_step=2.*ones(md.inversion.nsteps,1);
    2222md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    2323md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    2424
    2525md.cluster=generic('name',oshostname(),'np',3);
    26 md=solve(md,DiagnosticSolutionEnum);
     26md=solve(md,DiagnosticSolutionEnum());
    2727
    2828%Fields and tolerances to track changes

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

    r13662 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,3,1);
     4md=extrude(md,3,1.);
    55md=setflowequation(md,'pattyn','all');
    66
    … …  
    1212md.inversion.nsteps=2;
    1313md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
    14 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7;
    15 md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1);
     14md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
     15md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    … …  
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);
    21 md=solve(md,DiagnosticSolutionEnum);
     21md=solve(md,DiagnosticSolutionEnum());
    2222
    2323%Fields and tolerances to track changes

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

    r13662 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,3,1);
     4md=extrude(md,3,1.);
    55md=setflowequation(md,'macayeal','all');
    66
    … …  
    88md.inversion.iscontrol=1;
    99md.inversion.control_parameters={'FrictionCoefficient'};
    10 md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1);
    11 md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1);
     10md.inversion.min_parameters=1.*ones(md.mesh.numberofvertices,1);
     11md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    1313md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
    14 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7;
    15 md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1);
    16 md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
     14md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
     15md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);
     16md.inversion.maxiter_per_step=2.*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    1818md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    19 md.timestepping.time_step=0;
     19md.timestepping.time_step=0.;
    2020
    2121md.thermal.penalty_lock=5;
    2222md.cluster=generic('name',oshostname(),'np',3);
    23 md=solve(md,SteadystateSolutionEnum);
     23md=solve(md,SteadystateSolutionEnum());
    2424
    2525%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test513.py

    r13662 r13663  
    2828md.inversion.vx_obs=md.initialization.vx
    2929md.inversion.vy_obs=md.initialization.vy
    30 md.timestepping.time_step=0
     30md.timestepping.time_step=0.
    3131
    3232md.thermal.penalty_lock=5

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,3,1);
     4md=extrude(md,3,1.);
    55md=setflowequation(md,'pattyn','all');
    66md.thermal.stabilization=2;
    … …  
    1010md.transient.isthermal=1;
    1111md.transient.isgroundingline=0;
    12 md=solve(md,TransientSolutionEnum);
     12md=solve(md,TransientSolutionEnum());
    1313
    1414%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test515.py

    r13662 r13663  
    88from MatlabFuncs import *
    99
    10 md=triangle(model(),'../Exp/Pig.exp',30000)
     10md=triangle(model(),'../Exp/Pig.exp',30000.)
    1111md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp')
    1212md=parameterize(md,'../Par/Pig.py')

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

    r12805 r13663  
    1 md=triangle(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000.);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    4 md=extrude(md,3,1);
     4md=extrude(md,3,1.);
    55md=setflowequation(md,'pattyn','all');
    66md.thermal.stabilization=2;
    … …  
    88md.timestepping.time_step=0;
    99md.thermal.penalty_threshold=40;
    10 md=solve(md,ThermalSolutionEnum);
     10md=solve(md,ThermalSolutionEnum());
    1111
    1212%Fields and tolerances to track changes

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

    r12806 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,PrognosticSolutionEnum);
     6md=solve(md,PrognosticSolutionEnum());
    77
    88%Fields and tolerances to track changes

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

    r12806 r13663  
    77md.prognostic.spcthickness=md.geometry.thickness;
    88md.cluster=generic('name',oshostname(),'np',3);
    9 md=solve(md,PrognosticSolutionEnum);
     9md=solve(md,PrognosticSolutionEnum());
    1010
    1111%Fields and tolerances to track changes

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

    r12806 r13663  
    55md=setflowequation(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,PrognosticSolutionEnum);
     7md=solve(md,PrognosticSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12806 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,SurfaceSlopeSolutionEnum);
     6md=solve(md,SurfaceSlopeSolutionEnum());
    77
    88%Fields and tolerances to track changes

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

    r12806 r13663  
    55md=setflowequation(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,SurfaceSlopeSolutionEnum);
     7md=solve(md,SurfaceSlopeSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12806 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,BedSlopeSolutionEnum);
     6md=solve(md,BedSlopeSolutionEnum());
    77
    88%Fields and tolerances to track changes

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

    r12806 r13663  
    55md=setflowequation(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,BedSlopeSolutionEnum);
     7md=solve(md,BedSlopeSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12806 r13663  
    44md=setflowequation(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md=solve(md,BalancethicknessSolutionEnum);
     6md=solve(md,BalancethicknessSolutionEnum());
    77
    88%Fields and tolerances to track changes

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

    r12806 r13663  
    66md.balancethickness.stabilization=3;
    77md.cluster=generic('name',oshostname(),'np',3);
    8 md=solve(md,BalancethicknessSolutionEnum);
     8md=solve(md,BalancethicknessSolutionEnum());
    99
    1010%Fields and tolerances to track changes

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

    r12806 r13663  
    55md=setflowequation(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md=solve(md,BalancethicknessSolutionEnum);
     7md=solve(md,BalancethicknessSolutionEnum());
    88
    99%Fields and tolerances to track changes

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

    r12806 r13663  
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);
    21 md=solve(md,BalancethicknessSolutionEnum);
     21md=solve(md,BalancethicknessSolutionEnum());
    2222
    2323%Fields and tolerances to track changes

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

    r12806 r13663  
    2020
    2121md.cluster=generic('name',oshostname(),'np',3);
    22 md=solve(md,BalancethicknessSolutionEnum);
     22md=solve(md,BalancethicknessSolutionEnum());
    2323
    2424%Fields and tolerances to track changes

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

    r13021 r13663  
    2727md.verbose.control=1;
    2828md.cluster=generic('name',oshostname(),'np',3);
    29 md=solve(md,BalancethicknessSolutionEnum);
     29md=solve(md,BalancethicknessSolutionEnum());
    3030
    3131%Fields and tolerances to track changes
Note: See TracChangeset for help on using the changeset viewer.