Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of UGRID (part 1 of 2) #698

Merged
merged 23 commits into from
Nov 28, 2023
Merged

Commits on Nov 15, 2023

  1. Squashed commit of the following:

    commit 0b4e9f1
    Author: David Hassell <[email protected]>
    Date:   Tue Nov 14 11:38:20 2023 +0000
    
        depency versions
    
    commit 48f543d
    Author: David Hassell <[email protected]>
    Date:   Tue Nov 14 11:37:06 2023 +0000
    
        cfdm version
    
    commit 31c05be
    Author: David Hassell <[email protected]>
    Date:   Tue Nov 14 11:36:40 2023 +0000
    
        scipy required
    
    commit 0161159
    Merge: 4b87c22 2d53ef6
    Author: David Hassell <[email protected]>
    Date:   Tue Nov 14 11:24:47 2023 +0000
    
        Merge branch 'main' into ugrid-0
    
    commit 4b87c22
    Author: David Hassell <[email protected]>
    Date:   Tue Nov 14 11:07:49 2023 +0000
    
        UGRIDVER -> 3.16.0
    
    commit 6c18b1e
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 13:59:44 2023 +0000
    
        missing methods in docs rst
    
    commit 6786198
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 13:40:02 2023 +0000
    
        more ugrid tests
    
    commit 09d4335
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 13:30:00 2023 +0000
    
        sparse arrays
    
    commit 48ed306
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 12:42:39 2023 +0000
    
        format
    
    commit 6494aad
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 12:39:39 2023 +0000
    
        cartesian regridding ugrid
    
    commit 4af0948
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 12:11:42 2023 +0000
    
        UGRID ref
    
    commit 01ed055
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 12:10:38 2023 +0000
    
        cfdm version
    
    commit 943664e
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 12:09:28 2023 +0000
    
        mandatory scipy
    
    commit b96ca21
    Author: David Hassell <[email protected]>
    Date:   Fri Nov 10 11:50:21 2023 +0000
    
        comment
    
    commit 65bfb9e
    Author: David Hassell <[email protected]>
    Date:   Mon Nov 6 13:04:26 2023 +0000
    
        remove commented code
    
    commit ead7e08
    Author: David Hassell <[email protected]>
    Date:   Mon Nov 6 11:49:28 2023 +0000
    
        fix ugrid file
    
    commit ab388f9
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 23 19:05:50 2023 +0100
    
        dev
    
    commit bc68bd7
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 23 10:52:25 2023 +0100
    
        dev
    
    commit e07bf2d
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 23 10:06:17 2023 +0100
    
        weights_file
    
    commit cc034ec
    Merge: 4b1f7bd 1668e0b
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 23 09:45:25 2023 +0100
    
        upstream merge
    
    commit 4b1f7bd
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 23 09:42:49 2023 +0100
    
        dev
    
    commit 3ba860a
    Merge: ee3bdac 492d424
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 23 09:10:12 2023 +0100
    
        dev
    
    commit 492d424
    Author: David Hassell <[email protected]>
    Date:   Thu Oct 19 17:50:22 2023 +0100
    
        dev
    
    commit ee3bdac
    Author: David Hassell <[email protected]>
    Date:   Thu Oct 19 09:20:16 2023 +0100
    
        dev
    
    commit 7552ff4
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 11 19:34:54 2023 +0100
    
        dev
    
    commit c9984eb
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 11 15:38:55 2023 +0100
    
        dev
    
    commit 4cecab6
    Merge: f668a36 70bec02
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 11 14:48:38 2023 +0100
    
        Merge branch 'main' of github.com:NCAS-CMS/cf-python into ugrid-0
    
    commit f668a36
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 11 13:36:31 2023 +0100
    
        dev
    
    commit b185ae4
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 11 13:31:37 2023 +0100
    
        global UGRID files
    
    commit 68b2b0f
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 11 13:30:56 2023 +0100
    
        ignore CDL files
    
    commit 0d68338
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 11 08:16:34 2023 +0100
    
        pre-release
    
    commit 493d0e0
    Merge: 5669ae3 af65855
    Author: David Hassell <[email protected]>
    Date:   Tue Oct 10 15:28:36 2023 +0100
    
        3.15.4 merge
    
    commit 5669ae3
    Author: David Hassell <[email protected]>
    Date:   Tue Oct 10 13:04:58 2023 +0100
    
        dev
    
    commit 750875e
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 9 21:42:09 2023 +0100
    
        dev
    
    commit f25b956
    Merge: 53ce87b 972cdaa
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 9 21:41:23 2023 +0100
    
        Merge branch 'main' of github.com:NCAS-CMS/cf-python into ugrid-0
    
    commit 53ce87b
    Author: David Hassell <[email protected]>
    Date:   Mon Oct 9 21:41:02 2023 +0100
    
        dev
    
    commit 80c19f1
    Author: David Hassell <[email protected]>
    Date:   Fri Oct 6 17:00:27 2023 +0100
    
        dev
    
    commit 28d624b
    Author: David Hassell <[email protected]>
    Date:   Fri Oct 6 10:09:30 2023 +0100
    
        dev
    
    commit a0a4771
    Author: David Hassell <[email protected]>
    Date:   Thu Oct 5 23:50:14 2023 +0100
    
        dev
    
    commit 264780a
    Author: David Hassell <[email protected]>
    Date:   Wed Oct 4 14:17:41 2023 +0100
    
        dev
    
    commit 3f3f98e
    Author: David Hassell <[email protected]>
    Date:   Sun Oct 1 12:50:55 2023 +0100
    
        dev
    
    commit 2023f5a
    Author: David Hassell <[email protected]>
    Date:   Sat Sep 30 14:17:26 2023 +0100
    
        dev
    
    commit 054b272
    Author: David Hassell <[email protected]>
    Date:   Sat Sep 30 12:05:37 2023 +0100
    
        dev
    
    commit 7ce67d2
    Author: David Hassell <[email protected]>
    Date:   Fri Sep 29 18:29:23 2023 +0100
    
        dev
    
    commit 5820978
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 28 16:09:17 2023 +0100
    
        regrid
    
    commit 726223e
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 28 14:52:10 2023 +0100
    
        geometry spherical polygon weights
    
    commit a7ce7b3
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 27 16:05:30 2023 +0100
    
        dev
    
    commit 5b8185d
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 27 16:03:08 2023 +0100
    
        dev
    
    commit 2ebe7b8
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 26 18:51:01 2023 +0100
    
        dev
    
    commit 075dba9
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 26 16:45:37 2023 +0100
    
        dev
    
    commit b89b8c2
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 26 09:16:29 2023 +0100
    
        dev
    
    commit 1afb34a
    Author: David Hassell <[email protected]>
    Date:   Mon Sep 25 19:23:23 2023 +0100
    
        dev
    
    commit 6009f36
    Author: David Hassell <[email protected]>
    Date:   Mon Sep 25 13:26:13 2023 +0100
    
        dev
    
    commit 939aba4
    Merge: 05c1ed1 2cfc8e6
    Author: David Hassell <[email protected]>
    Date:   Mon Sep 25 10:02:01 2023 +0100
    
        Merge branch 'main' of github.com:NCAS-CMS/cf-python into ugrid-0
    
    commit 05c1ed1
    Author: David Hassell <[email protected]>
    Date:   Fri Sep 22 18:01:31 2023 +0100
    
        dev
    
    commit c542050
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 21 10:00:51 2023 +0100
    
        dev
    
    commit e94cd3d
    Merge: 094a60a 88febb7
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 21 08:44:30 2023 +0100
    
        Merge branch 'main' of github.com:NCAS-CMS/cf-python into ugrid-0
    
    commit 094a60a
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 20 23:06:52 2023 +0100
    
        dev
    
    commit ebd47b4
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 20 13:44:38 2023 +0100
    
        dev
    
    commit e9a2d26
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 19 19:34:50 2023 +0100
    
        dev
    
    commit 6b30280
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 19 17:37:57 2023 +0100
    
        dev
    
    commit 529b143
    Author: David Hassell <[email protected]>
    Date:   Mon Sep 18 10:40:17 2023 +0100
    
        dev
    
    commit e11422d
    Author: David Hassell <[email protected]>
    Date:   Sun Sep 17 15:46:42 2023 +0100
    
        dev
    
    commit 0c84d90
    Author: David Hassell <[email protected]>
    Date:   Sun Sep 17 12:06:45 2023 +0100
    
        dev
    
    commit dd5df6a
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 14 16:01:33 2023 +0100
    
        dev
    
    commit 3f0ad2a
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 14 14:09:48 2023 +0100
    
        dev
    
    commit 26ac71a
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 14 09:33:30 2023 +0100
    
        dev
    
    commit 25142fa
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 13 23:13:34 2023 +0100
    
        dev
    
    commit 672cb98
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 13 16:19:33 2023 +0100
    
        dev
    
    commit c3ad04c
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 13 09:44:12 2023 +0100
    
        dev
    
    commit 71f31f6
    Author: David Hassell <[email protected]>
    Date:   Thu Sep 7 13:05:30 2023 +0100
    
        dev
    
    commit 82efa8b
    Author: David Hassell <[email protected]>
    Date:   Wed Sep 6 18:35:01 2023 +0100
    
        dev
    
    commit 229e383
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 5 19:51:31 2023 +0100
    
        dev
    
    commit 4250b11
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 5 19:37:51 2023 +0100
    
        upstream merge
    
    commit 2c70d98
    Merge: 87ffa9b ed9e4c8
    Author: David Hassell <[email protected]>
    Date:   Tue Sep 5 19:37:30 2023 +0100
    
        Merge branch 'main' of github.com:NCAS-CMS/cf-python into ugrid-0
    
    commit 87ffa9b
    Author: David Hassell <[email protected]>
    Date:   Fri Aug 25 14:54:01 2023 +0100
    
        dev
    
    commit e0d89c3
    Author: David Hassell <[email protected]>
    Date:   Fri Aug 25 10:51:18 2023 +0100
    
        dev
    
    commit bff67d9
    Author: David Hassell <[email protected]>
    Date:   Thu Aug 24 22:35:51 2023 +0100
    
        dev
    
    commit 5bd3c5b
    Author: David Hassell <[email protected]>
    Date:   Thu Aug 24 15:13:17 2023 +0100
    
        dev
    
    commit bc279f2
    Author: David Hassell <[email protected]>
    Date:   Wed Aug 23 18:31:14 2023 +0100
    
        dev
    
    commit 354b662
    Author: David Hassell <[email protected]>
    Date:   Wed Aug 23 15:56:22 2023 +0100
    
        dev
    
    commit 4aef6c7
    Author: David Hassell <[email protected]>
    Date:   Wed Aug 23 10:03:56 2023 +0100
    
        dev
    
    commit 0e368b8
    Author: David Hassell <[email protected]>
    Date:   Tue Aug 22 17:23:42 2023 +0100
    
        dev
    davidhassell committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    7bc24ff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bf74799 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    643a1f6 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Clarify changelog

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    71ce0d8 View commit details
    Browse the repository at this point in the history
  2. Typos

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    9403208 View commit details
    Browse the repository at this point in the history
  3. doc string

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    a8cab4b View commit details
    Browse the repository at this point in the history
  4. Correct to_dask_array version added

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    eec0ee4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b1b374a View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Typos

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    0309d46 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4def365 View commit details
    Browse the repository at this point in the history
  3. Clearer logical structure

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    8d20ed5 View commit details
    Browse the repository at this point in the history
  4. Remove old commented code

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    c62fac5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    71c6e93 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Typos

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    ac7b330 View commit details
    Browse the repository at this point in the history
  2. Improve exception message

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    aba9564 View commit details
    Browse the repository at this point in the history
  3. Improve clarity of Boolean test

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    3eba5af View commit details
    Browse the repository at this point in the history
  4. Remove print statement

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    ddef83c View commit details
    Browse the repository at this point in the history
  5. Docstring clarity

    Co-authored-by: Sadie L. Bartholomew <[email protected]>
    davidhassell and sadielbartholomew authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    3fade92 View commit details
    Browse the repository at this point in the history
  6. Add helpful comment

    davidhassell committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    96f446b View commit details
    Browse the repository at this point in the history
  7. remove old TODO comment

    davidhassell committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    2547700 View commit details
    Browse the repository at this point in the history
  8. Fix docstring

    davidhassell committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    ba891a7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    09d9ba5 View commit details
    Browse the repository at this point in the history
  10. traceback TODOs

    davidhassell committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    2b98d54 View commit details
    Browse the repository at this point in the history