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.

Sign up for GitHub

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

Jump to bottom

Add regrid operator #111

Merged
merged 9 commits into from
Nov 27, 2023
Merged

Add regrid operator #111

merged 9 commits into from
Nov 27, 2023

Conversation

cehbrecht
Copy link
Collaborator

Pull Request Checklist:

  • This PR addresses an already opened issue (for bug fixes / features)
    • This PR fixes issue #xyz
  • Tests for the changes have been added (for bug fixes / features)
  • Documentation has been added / updated (for bug fixes / features)
  • HISTORY.rst has been updated (with summary of main changes)
  • I have added my relevant user information to AUTHORS.md

  • What kind of change does this PR introduce?:
    Adds the regrid operator.

  • Does this PR introduce a breaking change?:
    Needs clisops >=0.12

  • Other information:

ellesmith88 and others added 9 commits March 22, 2021 15:06
@ellesmith88
work on regrid operation
00ba5d7
@ellesmith88
Merge branch 'master' into regrid-main-elle
f917886
@ellesmith88
fix method
660ebaa
@agstephens
Updated tests to include fixture; got test_regrid running.
a94a4e7
@agstephens
Reverted: setup.cfg
f6d0dd9
@agstephens
Merge pull request #73 from roocs/regrid-main-ag
805f920 
Merging first working regrid tests into `regrid-main`
@cehbrecht
Merge branch 'master' into regrid-main
469427f
@cehbrecht
Merge branch 'master' into regrid-main
a9a8ff9
@cehbrecht
Squashed commit of the following:
2fea59b 
commit 48fe12a
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Nov 27 06:36:11 2023 +0100

    update conda env with clisops

commit f08309d
Author: Carsten Ehbrecht <[email protected]>
Date:   Fri Nov 24 19:43:51 2023 +0100

    update requirements for clisops

commit f2a2edf
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Nov 20 11:31:29 2023 +0100

    added roocs-grids conda package

commit 68fd5fa
Merge: b1deb93 a9a8ff9
Author: Pingu Carsti <[email protected]>
Date:   Fri Nov 17 15:47:04 2023 +0100

    Merge branch 'regrid-main' into regrid-main-ce

commit b1deb93
Author: Pingu Carsti <[email protected]>
Date:   Thu Nov 16 15:19:37 2023 +0100

    added dev requirements to workflow

commit b98da60
Author: Pingu Carsti <[email protected]>
Date:   Thu Nov 16 15:09:01 2023 +0100

    fix workflow

commit 962b60b
Author: Pingu Carsti <[email protected]>
Date:   Thu Nov 16 15:07:26 2023 +0100

    test with conda on github

commit 5167449
Author: Pingu Carsti <[email protected]>
Date:   Thu Nov 16 14:07:24 2023 +0100

    update regrid test

commit 733772f
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 19:54:53 2023 +0100

    skip xfail

commit 814cf37
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 18:25:10 2023 +0100

    added xesmf

commit c0d0d8d
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 15:58:14 2023 +0100

    use regrid branch of clisops

commit f06e440
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 15:37:17 2023 +0100

    xfail regrid

commit b36a0ef
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 15:37:04 2023 +0100

    revert to main

commit 9b4d64d
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 15:25:38 2023 +0100

    xfail all regrid tests

commit 14f7b3b
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 15:18:21 2023 +0100

    xfail regrid test

commit 08e78a3
Merge: 469427f 4b94991
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 15:13:11 2023 +0100

    Merge branch 'prepare-release-0.8.2' into regrid-main-ce

commit 4b94991
Author: Pingu Carsti <[email protected]>
Date:   Wed Nov 15 14:37:05 2023 +0100

    fix errors in docs build

commit 4095532
Author: Pingu Carsti <[email protected]>
Date:   Tue Nov 14 17:25:32 2023 +0100

    update rtd config

commit 81816f1
Author: Pingu Carsti <[email protected]>
Date:   Tue Nov 14 17:21:29 2023 +0100

    updated history

commit 2672d73
Author: Pingu Carsti <[email protected]>
Date:   Tue Nov 14 17:15:32 2023 +0100

    pep8

commit 5674f9b
Author: Pingu Carsti <[email protected]>
Date:   Tue Nov 14 17:12:14 2023 +0100

    enabled lint

commit b7d07ec
Author: Pingu Carsti <[email protected]>
Date:   Tue Nov 14 16:56:12 2023 +0100

    test also on python 3.10 and 3.11

commit 9e651a5
Author: Pingu Carsti <[email protected]>
Date:   Tue Nov 14 16:55:53 2023 +0100

    update dependency to clisops >=0.10

commit 105eb12
Merge: babe443 d662261
Author: Pingu Carsti <[email protected]>
Date:   Tue Nov 14 16:50:31 2023 +0100

    Merge branch 'master' into prepare-release-0.8.2

commit babe443
Author: Carsten Ehbrecht <[email protected]>
Date:   Wed Feb 1 16:42:41 2023 +0100

    updete dev requirements

commit 209b17f
Author: Carsten Ehbrecht <[email protected]>
Date:   Wed Feb 1 15:16:29 2023 +0100

    update history

commit 78107f5
Author: Carsten Ehbrecht <[email protected]>
Date:   Wed Feb 1 15:11:35 2023 +0100

    update pre-commit

commit 39d6d3c
Author: Carsten Ehbrecht <[email protected]>
Date:   Wed Feb 1 14:51:45 2023 +0100

    update reqs
@cehbrecht cehbrecht self-assigned this Nov 27, 2023
@cehbrecht cehbrecht merged commit 3fb4f9c into master Nov 27, 2023
7 checks passed
@cehbrecht cehbrecht deleted the regrid-main branch November 27, 2023 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cehbrecht cehbrecht

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cehbrecht @ellesmith88 @agstephens