Changeset 25515


Ignore:
Timestamp:
09/02/20 14:10:08 (5 years ago)
Author:
jdquinn
Message:

CHG: Using different implementation of delaunay

Location:
issm/trunk-jpl
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

    r25434 r25515  
    8080#
    8181MATLAB_NROPTIONS="'benchmark','slr','exclude',[2021]"
    82 PYTHON_NROPTIONS="--benchmark slr --exclude 2004 2021"
     82PYTHON_NROPTIONS="--benchmark slr --exclude 2021"

  • issm/trunk-jpl/src/m/geometry/delaunay.py

    r25455 r25515  
    99
    1010    Usage:
    11         # Creates a 2-D or 3-D Delaunay triangulation from the points in a matrix P. The output DT is a three-column (for two dimensions) or four-column (for three dimensions) matrix where each row contains the row indices of the input points that make up a triangle or tetrahedron in the triangulation.
     11        # Creates a 2-D or 3-D Delaunay triangulation from the points in a
     12        matrix P. The output DT is a three-column (for two dimensions) or
     13        four-column (for three dimensions) matrix where each row contains the
     14        row indices of the input points that make up a triangle or tetrahedron
     15        in the triangulation.
     16
    1217        DT = delaunay(P)
    1318
    14         # Creates a 2-D Delaunay triangulation from the points in vectors x and y.
     19        # Creates a 2-D Delaunay triangulation from the points in vectors x and
     20        y.
     21
    1522        DT = delaunay(x, y)
    1623
    17         # Creates a 3-D Delaunay triangulation from the points in vectors x, y, and z.
     24        # Creates a 3-D Delaunay triangulation from the points in vectors x, y,
     25        and z.
     26
    1827        DT = delaunay(x, y, z)
    1928

  • issm/trunk-jpl/src/m/solve/WriteData.py

    r25316 r25515  
    88
    99def WriteData(fid, prefix, *args):
    10     """
    11     WRITEDATA - write model field in binary file
    12 
    13        Usage:
    14           WriteData(fid, varargin)
     10    """WRITEDATA - write model field in binary file
     11
     12    Usage:
     13        WriteData(fid, varargin)
    1514    """
    1615

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

    r22644 r25515  
    22%RUNME - test deck for ISSM nightly runs
    33%
    4 %   In a test deck directory (tests/Vertification/NightlyRun for example)
     4%   In a test deck directory (test/Vertification/NightlyRun for example)
    55%   The following command will launch all the existing tests:
    66%   >> runme

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

    r25302 r25515  
    2020
    2121def runme(id=None, exclude=None, benchmark='nightly', procedure='check', output='none', rank=1, numprocs=1):
    22     """
    23     RUNME - test deck for ISSM nightly runs
    24 
    25         In a test deck directory (tests / Vertification / NightlyRun for example)
    26         The following command will launch all the existing tests:
    27     >>     runme()
    28         To run the tests 101 and 102:
    29     >>     runme(id = [101, 102])
    30         etc...
    31 
    32         Available options:
    33             'id'            followed by the list of ids or (parts of) test names requested
    34                             Note: runs all tests by default
    35 
    36             'exclude'       ids or (parts of) test names to be excluded (same format as id)
    37                             Note: exclude does nothing if 'id' is specified with different values
    38 
    39             'benchmark'     'all' (all of the tests)
     22    """RUNME - test deck for ISSM nightly runs
     23
     24    In a test deck directory (tests/Vertification / NightlyRun for example) the
     25    following command will launch all the existing tests:
     26
     27        >> ./runme.py
     28
     29    To run the tests 101 and 102:
     30
     31        >> ./runme.py -i [101, 102]
     32
     33    Available options:
     34        -i/--id             followed by the list of ids or (parts of) test names requested
     35                            NOTE: runs all tests by default
     36
     37        -e/--exclude        ids or (parts of) test names to be excluded (same format as id)
     38                            NOTE: exclude does nothing if 'id' is specified with different values
     39
     40        -b/--benchmark      'all' (all of the tests)
    4041                            'nightly' (nightly run / daily run)
    4142                            'ismip'  : validation of ismip - hom tests
    … …  
    4647                            'slr'    : validation of slr tests
    4748
    48             'procedure'     'check' : run the test (default)
     49        -p/--procedure      'check' : run the test (default)
    4950                            'update': update the archive
    5051
    51         Usage:
    52             runme(varargin)
    53 
    54         Examples:
    55             runme()
    56             runme(101)
    57             runme('SquareShelf')
    58             runme(exclude = 2001)
    59             runme(exclude = 'Dakota', benchmark = 'all')
    60             runme(id = [[101, 102], ['Dakota', 'Slr']])
    61 
    62         TODO:
    63         - At '#disp test result', make sure precision of output matches that of
     52    Usage:
     53        ./runme.py [option [args]]
     54
     55    Examples:
     56        ./runme.py
     57        ./runme.py -i 101
     58        ./runme.py -i 'SquareShelf'
     59        ./runme.py -e 2001
     60        ./runme.py -e 'Dakota' --benchmark 'all'
     61        ./runme.py -i [[101, 102], ['Dakota', 'Slr']]
     62
     63    TODO:
     64    - At '#disp test result', make sure precision of output matches that of
    6465        MATLAB.
    65         - Check for failures that do not raise exceptions (for example, 'Standard exception'; see also jenkins/jenkins.sh). These should be counted as failures.
    66         """
     66    - Check for failures that do not raise exceptions (for example, 'Standard exception'; see also jenkins/jenkins.sh). These should be counted as failures.
     67    """
     68
    6769    #Get ISSM_DIR variable
    6870    ISSM_DIR = os.environ['ISSM_DIR']
    … …  
    7577        print(("runme warning: benchmark '{}' not supported, defaulting to test 'nightly'.".format(benchmark)))
    7678        benchmark = 'nightly'
    77         # }}}
    78         #GET procedure {{{
     79    # }}}
     80    #GET procedure {{{
    7981    if procedure not in ['check', 'update']:
    8082        print(("runme warning: procedure '{}' not supported, defaulting to test 'check'.".format(procedure)))
    8183        procedure = 'check'
    82         # }}}
    83         #GET output {{{
     84    # }}}
     85    #GET output {{{
    8486    if output not in ['nightly', 'none']:
    8587        print(("runme warning: output '{}' not supported, defaulting to test 'none'.".format(output)))
    8688        output = 'none'
    87         # }}}
    88         #GET RANK and NUMPROCS for multithreaded runs {{{
     89    # }}}
     90    #GET RANK and NUMPROCS for multithreaded runs {{{
    8991    if (numprocs < rank):
    9092        numprocs = 1
    91         # }}}
    92         #GET ids  {{{
     93    # }}}
     94    #GET ids  {{{
    9395    flist = glob('test*.py')  #File name must start with 'test' and must end by '.py' and must be different than 'test.py'
    9496    list_ids = [int(file[4:-3]) for file in flist if not file == 'test.py']  #Keep test id only (skip 'test' and '.py')

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

    r25499 r25515  
    154154                        latAIS=delH{:,2};
    155155                        delHAIS=delH{:,3};
    156                         index=delaunay(longAIS,latAIS);
     156                        points=[longAIS,latAIS];
     157                        index=delaunayn(points);
    157158                        lat=md.mesh.lat;
    158159                        long=md.mesh.long+360;
    … …  
    190191
    191192        %recover lat,long:
    192         [md.mesh.long,md.mesh.lat]=gdaltransform(md.mesh.x,md.mesh.y,md.mesh.proj,'EPSG:4326'); 
     193        [md.mesh.long,md.mesh.lat]=gdaltransform(md.mesh.x,md.mesh.y,md.mesh.proj,'EPSG:4326');
    193194
    194195        %mask:  %{{{
    … …  
    262263                latGIS=delH(:,2);
    263264                delHGIS=delH(:,3);
    264                 index=delaunay(longGIS,latGIS);
     265                points=[longGIS,latGIS];
     266                index=delaunayn(points);
    265267                lat=md.mesh.lat;
    266268                long=md.mesh.long+360;
    … …  
    274276                latGLA=delH(:,2);
    275277                delHGLA=sum(delH(:,3:end),2);
    276                 index=delaunay(longGLA,latGLA);
     278                points=[longGLA,latGLA];
     279                index=delaunayn(points);
    277280                lat=md.mesh.lat;
    278281                long=md.mesh.long+360;
    … …  
    409412md=solve(md,'Sealevelrise');
    410413Srotation=md.results.SealevelriseSolution.Sealevel;
    411 
    412414%}}}
    413415
Note: See TracChangeset for help on using the changeset viewer.