Changeset 25005


Ignore:
Timestamp:
06/10/20 21:41:58 (5 years ago)
Author:
Eric.Larour
Message:

CHG: updating tests to not rely on md.qmu.vpartition and md.qmu.epartition.

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

Legend:

Unmodified
Added
Removed

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

    r24149 r25005  
    11%Test Name: SquareShelfConstrainedStressSSA2d
    2 md=triangle(model(),'../Exp/Square.exp',50000.);
     2md=triangle(model(),'../Exp/Square.exp',1000.);
    33md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md=setflowequation(md,'SSA','all');
    6 md.cluster=generic('name',oshostname(),'np',2);
     6md.cluster=generic('name',oshostname(),'np',3);
    77
    88%output

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

    r24839 r25005  
    5050
    5151%partitioning
    52 md.qmu.numberofpartitions=md.mesh.numberofvertices;
    53 md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions);
    54 md.qmu.vpartition=md.qmu.vpartition-1;
     52npart=md.mesh.numberofvertices;
     53partition=partitioner(md,'package','linear','npart',npart)-1;
    5554
    5655%Dakota options
    … …  
    6362        'mean',ones(md.mesh.numberofvertices,1),...
    6463        'stddev',.05*ones(md.mesh.numberofvertices,1),...
    65         'partition',md.qmu.vpartition);
     64        'partition',partition);
    6665
    6766%responses

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

    r24839 r25005  
    2222
    2323%partitioning
    24 md.qmu.numberofpartitions=20;
    25 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    26 md.qmu.vpartition=md.qmu.vpartition-1;
     24npart=20;
     25partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1;
    2726
    2827%variables
    2928md.qmu.variables.surface_mass_balance=normal_uncertain('descriptor','scaled_SmbMassBalance',...
    30         'mean',ones(md.qmu.numberofpartitions,1),...
    31         'stddev',.1*ones(md.qmu.numberofpartitions,1),...
    32         'partition',md.qmu.vpartition);
     29        'mean',ones(npart,1),...
     30        'stddev',.1*ones(npart,1),...
     31        'partition',partition);
    3332
    3433%responses

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

    r24840 r25005  
    2222
    2323%partitioning
    24 md.qmu.numberofpartitions=20;
    25 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    26 md.qmu.vpartition=md.qmu.vpartition-1;
     24npart=20;
     25partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1;
    2726
    2827%variables
    2928md.qmu.variables.surface_mass_balance=normal_uncertain('descriptor','scaled_SmbMassBalance',...
    30         'mean',ones(md.qmu.numberofpartitions,1),...
    31         'stddev',100*ones(md.qmu.numberofpartitions,1),...
    32         'partition',md.qmu.vpartition);
     29        'mean',ones(npart,1),...
     30        'stddev',100*ones(npart,1),...
     31        'partition',partition);
    3332
    3433%responses

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

    r24839 r25005  
    4646
    4747%partitioning
    48 md.qmu.numberofpartitions=md.mesh.numberofelements;
    49 md=partitioner(md,'package','linear','type','element');
    50 md.qmu.epartition=md.qmu.epartition-1;
     48partition=partitioner(md,'package','linear','type','element','npart',md.mesh.numberofelements)-1;
    5149
    5250%variables
    … …  
    5452        'mean',1*ones(md.mesh.numberofelements,1),...
    5553        'stddev',.5*ones(md.mesh.numberofelements,1),...
    56         'partition',md.qmu.epartition);
     54        'partition',partition);
    5755
    5856Tmin=273;
    … …  
    6058mint_on_partition=telms;
    6159for pa=1:length(mint_on_partition)
    62         vi=find(md.qmu.epartition+1 == pa);
     60        vi=find(partition+1 == pa);
    6361        mint=telms(vi).*1.05;
    6462        pos=find(mint < Tmin);
    … …  
    7068        'lower',.95*ones(md.mesh.numberofelements,1),...
    7169        'upper',max(min(max(1.05,mint_on_partition),0.9999),0.0001),...
    72         'partition',md.qmu.epartition);
     70        'partition',partition);
    7371
    7472%responses

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

    r24839 r25005  
    2222
    2323%partitioning
    24 md.qmu.numberofpartitions=md.mesh.numberofvertices;
    25 md=partitioner(md,'package','linear');
    26 md.qmu.vpartition=md.qmu.vpartition-1;
     24md=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1;
    2725
    2826%variables
    2927md.qmu.variables.surface_mass_balance=normal_uncertain('descriptor','scaled_SmbMassBalance',...
    30         'mean',ones(md.qmu.numberofpartitions,1),...
    31         'stddev',.1*ones(md.qmu.numberofpartitions,1),...
    32         'partition',md.qmu.vpartition);
     28        'mean',ones(md.mesh.numberofvertices,1),...
     29        'stddev',.1*ones(md.mesh.numberofvertices,1),...
     30        'partition',partition);
    3331
    3432%responses

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

    r24839 r25005  
    2222
    2323%partitioning
    24 md.qmu.numberofpartitions=md.mesh.numberofvertices;
    25 md=partitioner(md,'package','linear');
    26 md.qmu.vpartition=md.qmu.vpartition-1;
     24partition=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1;
    2725
    2826%variables
    … …  
    3028        'mean',ones(md.mesh.numberofvertices,1),...
    3129        'stddev',100*ones(md.mesh.numberofvertices,1),...
    32         'partition',md.qmu.vpartition);
     30        'partition',partition);
    3331
    3432%responses

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

    r24870 r25005  
    77
    88%partitioning
    9 md.qmu.numberofpartitions=md.mesh.numberofvertices;
    10 md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions);
    11 md.qmu.vpartition=md.qmu.vpartition-1;
     9partition=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1;
    1210md.qmu.isdakota=1;
    1311
    … …  
    2220        'mean',ones(md.mesh.numberofvertices,1),...
    2321        'stddev',.01*ones(md.mesh.numberofvertices,1),...
    24         'partition',md.qmu.vpartition);
     22        'partition',partition);
    2523
    2624%responses

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

    r24839 r25005  
    1212
    1313%partitioning
    14 md.qmu.numberofpartitions=20;
    15 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    16 md.qmu.vpartition=md.qmu.vpartition-1;
     14npart=20;
     15partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1;
    1716
    1817%variables
    1918md.qmu.variables.rho_ice=normal_uncertain('descriptor','MaterialsRhoIce','mean',md.materials.rho_ice,'stddev',.01);
    2019md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_FrictionCoefficient',...
    21         'mean',ones(md.qmu.numberofpartitions,1),...
    22         'stddev',.01*ones(md.qmu.numberofpartitions,1),...
    23         'partition',md.qmu.vpartition);
     20        'mean',ones(npart,1),...
     21        'stddev',.01*ones(npart,1),...
     22        'partition',partition);
    2423
    2524%responses

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

    r24839 r25005  
    2020
    2121%partitioning
    22 md.qmu.numberofpartitions=20;
    23 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    24 md.qmu.vpartition=md.qmu.vpartition-1;
     22npart=20;
     23partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1;
    2524
    2625%variables
    2726md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_FrictionCoefficient',...
    28         'mean',ones(md.qmu.numberofpartitions,1),...
    29         'stddev',.01*ones(md.qmu.numberofpartitions,1),...
    30         'partition',md.qmu.vpartition);
     27        'mean',ones(npart,1),...
     28        'stddev',.01*ones(npart,1),...
     29        'partition',partition);
    3130
    3231%responses

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

    r24839 r25005  
    2020
    2121%partitioning
    22 md.qmu.numberofpartitions=20;
    23 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    24 md.qmu.vpartition=md.qmu.vpartition-1;
     22npart=20;
     23partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1;
    2524md.qmu.isdakota=1;
    2625
    2726md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_FrictionCoefficient',...
    28         'mean',ones(md.qmu.numberofpartitions,1),...
    29         'stddev',.01*ones(md.qmu.numberofpartitions,1),...
    30         'partition',md.qmu.vpartition);
     27        'mean',ones(npart,1),...
     28        'stddev',.01*ones(npart,1),...
     29        'partition',partition);
    3130
    3231md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');

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

    r24180 r25005  
    88
    99%partitioning
    10 md.qmu.numberofpartitions=100;
    11 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions);
    12 md.qmu.vpartition=md.qmu.vpartition-1;
     10npart=100;
     11partition=partitioner(md,'package','chaco','npart',npart)-1;
    1312
    1413vector=(1:1:md.mesh.numberofvertices)';
    15 vector_on_partition=AreaAverageOntoPartition(md,vector);
    16 vector_on_nodes=vector_on_partition(md.qmu.vpartition+1);
     14vector_on_partition=AreaAverageOntoPartition(md,vector,partition);
     15vector_on_nodes=vector_on_partition(partition+1);
    1716
    1817field_names     ={'vector_on_nodes'};

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

    r24839 r25005  
    77
    88%partitioning
    9 md.qmu.numberofpartitions=10;
    10 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions);
    11 md.qmu.vpartition=md.qmu.vpartition-1;
     9npart=10;
     10partition=partitioner(md,'package','chaco','npart',npart)-1;
    1211md.qmu.isdakota=1;
    1312
    … …  
    2120
    2221%responses
    23 md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',md.qmu.vpartition);
     22md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',partition);
    2423
    2524%method
    … …  
    4948
    5049%test on thickness
    51 h=zeros(md.qmu.numberofpartitions,1);
    52 for i=1:md.qmu.numberofpartitions,
     50h=zeros(part,1);
     51for i=1:npart,
    5352        h(i)=md.qmu.results.dresp_out(i).mean;
    5453end
    5554
    5655%project onto grid
    57 thickness=h(md.qmu.vpartition+1);
     56thickness=h(partition+1);
    5857
    5958%Fields and tolerances to track changes

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

    r24839 r25005  
    77
    88%partitioning
    9 md.qmu.numberofpartitions=md.mesh.numberofvertices;
    10 md=partitioner(md,'package','linear');
    11 md.qmu.vpartition=md.qmu.vpartition-1;
     9partition=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1;
    1210md.qmu.isdakota=1;
    1311
    … …  
    2119
    2220%responses
    23 md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',md.qmu.vpartition);
     21md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',partition);
    2422
    2523%method
    … …  
    4947
    5048%test on thickness
    51 h=zeros(md.qmu.numberofpartitions,1);
    52 for i=1:md.qmu.numberofpartitions,
     49h=zeros(npart,1);
     50for i=1:npart,
    5351        h(i)=md.qmu.results.dresp_out(i).mean;
    5452end
    5553
    5654%project onto grid
    57 thickness=h(md.qmu.vpartition+1);
     55thickness=h(partition+1);
    5856
    5957%Fields and tolerances to track changes

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

    r24862 r25005  
    5050
    5151%partitioning
    52 md.qmu.numberofpartitions=10;
    53 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    54 md.qmu.vpartition=md.qmu.vpartition-1;
     52npart=10;
     53partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1;
    5554md.qmu.isdakota=1;
    5655
    5756md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_BasalforcingsFloatingiceMeltingRate',...
    58         'mean',ones(md.qmu.numberofpartitions,1),...
    59         'stddev',.1*ones(md.qmu.numberofpartitions,1),...
    60         'partition',md.qmu.vpartition);
     57        'mean',ones(npart,1),...
     58        'stddev',.1*ones(npart,1),...
     59        'partition',partition);
    6160
    6261md.qmu.responses.IceMass1=response_function('descriptor','Outputdefinition5');

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

    r24870 r25005  
    1919
    2020%partitioning
    21 md.qmu.numberofpartitions=10;
    22 md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    23 md.qmu.vpartition=md.qmu.vpartition-1;
     21npart=10;
     22partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1;
    2423md.qmu.isdakota=1;
    2524
    2625%variables
    2726md.qmu.variables.neff=normal_uncertain('descriptor','scaled_FrictionEffectivePressure',...
    28         'mean',ones(md.qmu.numberofpartitions,1),...
    29         'stddev',.05*ones(md.qmu.numberofpartitions,1),...
    30         'partition',md.qmu.vpartition);
     27        'mean',ones(npart,1),...
     28        'stddev',.05*ones(npart,1),...
     29        'partition',partition);
    3130md.qmu.variables.geoflux=normal_uncertain('descriptor','scaled_BasalforcingsGeothermalflux',...
    32         'mean',ones(md.qmu.numberofpartitions,1),...
    33         'stddev',.05*ones(md.qmu.numberofpartitions,1),...
    34         'partition',md.qmu.vpartition);
     31        'mean',ones(npart,1),...
     32        'stddev',.05*ones(npart,1),...
     33        'partition',partition);
    3534
    3635%responses
Note: See TracChangeset for help on using the changeset viewer.