Changeset 24174


Ignore:
Timestamp:
09/27/19 16:45:38 (6 years ago)
Author:
schlegel
Message:

CHG: fixed tests to deal with different partitioning schemes for epartition and vpartition

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

Legend:

Unmodified
Added
Removed

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

    r21056 r24174  
    5252md.qmu.numberofpartitions=md.mesh.numberofvertices;
    5353md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions);
    54 md.qmu.partition=md.qmu.partition-1;
     54md.qmu.vpartition=md.qmu.vpartition-1;
    5555
    5656%Dakota options

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

    r24164 r24174  
    7474md.qmu.numberofpartitions = md.mesh.numberofvertices
    7575md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions)
    76 md.qmu.partition = md.qmu.partition - 1
     76md.qmu.vpartition = md.qmu.vpartition - 1
    7777
    7878#Dakota options

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

    r21056 r24174  
    2424md.qmu.numberofpartitions=20;
    2525md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    26 md.qmu.partition=md.qmu.partition-1;
     26md.qmu.vpartition=md.qmu.vpartition-1;
    2727
    2828%variables

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

    r23793 r24174  
    4040md.qmu.numberofpartitions = 20
    4141md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    42 md.qmu.partition = md.qmu.partition - 1
     42md.qmu.vpartition = md.qmu.vpartition - 1
    4343
    4444#variables

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

    r21056 r24174  
    2424md.qmu.numberofpartitions=20;
    2525md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    26 md.qmu.partition=md.qmu.partition-1;
     26md.qmu.vpartition=md.qmu.vpartition-1;
    2727
    2828%variables

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

    r23793 r24174  
    4040md.qmu.numberofpartitions = 20
    4141md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    42 md.qmu.partition = md.qmu.partition - 1
     42md.qmu.vpartition = md.qmu.vpartition - 1
    4343
    4444#variables

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

    r23858 r24174  
    4747%partitioning
    4848md.qmu.numberofpartitions=md.mesh.numberofelements;
    49 md=partitioner(md,'package','linear');
    50 md.qmu.partition=md.qmu.partition-1;
     49md=partitioner(md,'package','linear','type','element');
     50md.qmu.epartition=md.qmu.epartition-1;
    5151
    5252%variables
    … …  
    5656mint_on_partition=telms;
    5757for pa=1:length(mint_on_partition)
    58         vi=find(md.qmu.partition+1 == pa);
     58        vi=find(md.qmu.epartition+1 == pa);
    5959        mint=telms(vi).*1.05;
    6060        pos=find(mint < Tmin);

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

    r23858 r24174  
    6969#partitioning
    7070md.qmu.numberofpartitions = md.mesh.numberofelements
    71 md = partitioner(md, 'package', 'linear')
    72 md.qmu.partition = (md.qmu.partition - 1).reshape(-1, 1).T
     71md = partitioner(md, 'package', 'linear','type','element')
     72md.qmu.epartition = (md.qmu.epartition - 1).reshape(-1, 1).T
    7373
    7474#variables
    … …  
    7878mint_on_partition = telms.flatten()
    7979for pa in range(np.size(mint_on_partition)):
    80     vi = np.where(md.qmu.partition == pa)
     80    vi = np.where(md.qmu.epartition == pa)
    8181    mint = telms[vi] * 1.05
    8282    pos = np.where(mint < Tmin)

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

    r21056 r24174  
    2424md.qmu.numberofpartitions=md.mesh.numberofvertices;
    2525md=partitioner(md,'package','linear');
    26 md.qmu.partition=md.qmu.partition-1;
     26md.qmu.vpartition=md.qmu.vpartition-1;
    2727
    2828%variables

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

    r23793 r24174  
    3838md.qmu.numberofpartitions = md.mesh.numberofvertices
    3939md = partitioner(md, 'package', 'linear')
    40 md.qmu.partition = md.qmu.partition - 1
     40md.qmu.vpartition = md.qmu.vpartition - 1
    4141
    4242#variables

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

    r21056 r24174  
    2424md.qmu.numberofpartitions=md.mesh.numberofvertices;
    2525md=partitioner(md,'package','linear');
    26 md.qmu.partition=md.qmu.partition-1;
     26md.qmu.vpartition=md.qmu.vpartition-1;
    2727
    2828%variables

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

    r23793 r24174  
    3939md.qmu.numberofpartitions = md.mesh.numberofvertices
    4040md = partitioner(md, 'package', 'linear')
    41 md.qmu.partition = md.qmu.partition - 1
     41md.qmu.vpartition = md.qmu.vpartition - 1
    4242
    4343#variables

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

    r21056 r24174  
    99md.qmu.numberofpartitions=md.mesh.numberofvertices;
    1010md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions);
    11 md.qmu.partition=md.qmu.partition-1;
     11md.qmu.vpartition=md.qmu.vpartition-1;
    1212md.qmu.isdakota=1;
    1313

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

    r23793 r24174  
    2121md.qmu.numberofpartitions = md.mesh.numberofvertices
    2222md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions)
    23 md.qmu.partition = md.qmu.partition - 1
     23md.qmu.vpartition = md.qmu.vpartition - 1
    2424md.qmu.isdakota = 1
    2525

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

    r21056 r24174  
    1414md.qmu.numberofpartitions=20;
    1515md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    16 md.qmu.partition=md.qmu.partition-1;
     16md.qmu.vpartition=md.qmu.vpartition-1;
    1717
    1818%variables

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

    r23793 r24174  
    2525md.qmu.numberofpartitions = 20
    2626md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    27 md.qmu.partition = md.qmu.partition - 1
     27md.qmu.vpartition = md.qmu.vpartition - 1
    2828
    2929#variables

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

    r21056 r24174  
    2222md.qmu.numberofpartitions=20;
    2323md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    24 md.qmu.partition=md.qmu.partition-1;
     24md.qmu.vpartition=md.qmu.vpartition-1;
    2525
    2626%variables

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

    r23793 r24174  
    3434md.qmu.numberofpartitions = 20
    3535md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    36 md.qmu.partition = md.qmu.partition - 1
     36md.qmu.vpartition = md.qmu.vpartition - 1
    3737
    3838#variables

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

    r23852 r24174  
    6161md.qmu.numberofpartitions=20;
    6262md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    63 md.qmu.partition=md.qmu.partition-1;
     63md.qmu.vpartition=md.qmu.vpartition-1;
    6464md.qmu.isdakota=1;
    6565

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

    r23852 r24174  
    3434md.qmu.numberofpartitions = 20
    3535md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    36 md.qmu.partition = md.qmu.partition - 1
     36md.qmu.vpartition = md.qmu.vpartition - 1
    3737
    3838#variables

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

    r19049 r24174  
    1010md.qmu.numberofpartitions=100;
    1111md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions);
    12 md.qmu.partition=md.qmu.partition-1;
     12md.qmu.vpartition=md.qmu.vpartition-1;
    1313
    1414vector=(1:1:md.mesh.numberofvertices)';

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

    r23793 r24174  
    3030md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions)
    3131
    32 md.qmu.partition = md.qmu.partition - 1
     32md.qmu.vpartition = md.qmu.vpartition - 1
    3333
    3434vector = np.arange(1, 1 + md.mesh.numberofvertices, 1).reshape(-1, 1)

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

    r21056 r24174  
    99md.qmu.numberofpartitions=10;
    1010md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions);
    11 md.qmu.partition=md.qmu.partition-1;
     11md.qmu.vpartition=md.qmu.vpartition-1;
    1212md.qmu.isdakota=1;
    1313
    … …  
    5555
    5656%project onto grid
    57 thickness=h(md.qmu.partition+1);
     57thickness=h(md.qmu.vpartition+1);
    5858
    5959%Fields and tolerances to track changes

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

    r23793 r24174  
    1919md.qmu.numberofpartitions = 10
    2020md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions)
    21 md.qmu.partition = md.qmu.partition - 1
     21md.qmu.vpartition = md.qmu.vpartition - 1
    2222md.qmu.isdakota = 1
    2323
    … …  
    6363
    6464#project onto grid
    65 thickness = h[(md.qmu.partition).flatten()]
     65thickness = h[(md.qmu.vpartition).flatten()]
    6666
    6767#Fields and tolerances to track changes

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

    r21056 r24174  
    99md.qmu.numberofpartitions=md.mesh.numberofvertices;
    1010md=partitioner(md,'package','linear');
    11 md.qmu.partition=md.qmu.partition-1;
     11md.qmu.vpartition=md.qmu.vpartition-1;
    1212md.qmu.isdakota=1;
    1313
    … …  
    5555
    5656%project onto grid
    57 thickness=h(md.qmu.partition+1);
     57thickness=h(md.qmu.vpartition+1);
    5858
    5959%Fields and tolerances to track changes

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

    r23793 r24174  
    2020md.qmu.numberofpartitions = md.mesh.numberofvertices
    2121md = partitioner(md, 'package', 'linear')
    22 md.qmu.partition = md.qmu.partition - 1
     22md.qmu.vpartition = md.qmu.vpartition - 1
    2323md.qmu.isdakota = 1
    2424
    … …  
    6464
    6565#project onto grid
    66 thickness = h[md.qmu.partition]
     66thickness = h[md.qmu.vpartition]
    6767
    6868#Fields and tolerances to track changes

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

    r21937 r24174  
    8686md.qmu.numberofpartitions=10;
    8787md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    88 md.qmu.partition=md.qmu.partition-1;
     88md.qmu.vpartition=md.qmu.vpartition-1;
    8989md.qmu.isdakota=1;
    9090

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

    r23793 r24174  
    101101md.qmu.numberofpartitions = 10
    102102md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    103 md.qmu.partition = md.qmu.partition - 1
     103md.qmu.vpartition = md.qmu.vpartition - 1
    104104md.qmu.isdakota = 1
    105105

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

    r23865 r24174  
    5959md.qmu.numberofpartitions=10;
    6060md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
    61 md.qmu.partition=md.qmu.partition-1;
     61md.qmu.vpartition=md.qmu.vpartition-1;
    6262md.qmu.isdakota=1;
    6363

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

    r23865 r24174  
    7272md.qmu.numberofpartitions = 10
    7373md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    74 md.qmu.partition = md.qmu.partition - 1
     74md.qmu.vpartition = md.qmu.vpartition - 1
    7575md.qmu.isdakota = 1
    7676
Note: See TracChangeset for help on using the changeset viewer.