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

Water terminating #1403

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Water terminating #1403

wants to merge 36 commits into from

Commits on Mar 27, 2022

  1. Transferring code of external module to OGGM

    @jmalles
    jmalles committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    ef067fb View commit details
    Browse the repository at this point in the history

  2. Small improvements

    @jmalles
    jmalles committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    01f3609 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Add ocean density to params.cfg

    @jmalles
    jmalles committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    5a0e164 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2022

  1. Fixing calving rate calculation and adding stretching distance to par… 

    …ams.cfg
    @jmalles
    jmalles committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    1d702d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Adjustments according to failing tests

    @jmalles
    jmalles committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    9801226 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'OGGM:master' into water-terminating

    @jmalles
    jmalles authored Jul 7, 2022
    Configuration menu
    Copy the full SHA
    ec8fea2 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. More test-related adjustments

    @jmalles
    jmalles committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    5c16a2a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Cleaner distinction of tidewater glaciers in 'mass_conservation_inver… 

    …sion'
    @jmalles
    jmalles committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    df6252f View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. Merge branch 'OGGM:master' into water-terminating

    @jmalles
    jmalles authored Jul 22, 2022
    Configuration menu
    Copy the full SHA
    50a5dfc View commit details
    Browse the repository at this point in the history

  2. More test-related adjustments

    @jmalles
    jmalles committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    ace7baf View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. Bug fixes and adding new diagnostics for water-terminating glaciers

    @jmalles
    jmalles committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    cd504df View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2022

  1. Correcting discharge variable

    @jmalles
    jmalles committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    e3a6051 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Fix calculation of volume above sea/water level

    @jmalles
    jmalles committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    d1e419f View commit details
    Browse the repository at this point in the history

  2. Fix velocity beyond grounding line

    @jmalles
    jmalles committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    228f911 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Fixing small issue with mass redistribution for floating ice volume

    @jmalles
    jmalles committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    9bce58d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. Major code overhaul (bug/error fixes, cleaning)

    @jmalles
    jmalles committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    4a31301 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2022

  1. More fixes and improvements

    @jmalles
    jmalles committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    f8e5b6d View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2022

  1. Making the step in iterative search for water level during inversion … 

    …a parameter.
    @jmalles
    jmalles committed Aug 14, 2022
    Configuration menu
    Copy the full SHA
    7b49d6e View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. Further improvements of inversion and dynamical model

    @jmalles
    jmalles committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    4182d48 View commit details
    Browse the repository at this point in the history

  2. Merging upstream/master

    @jmalles
    jmalles committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    6572dae View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2022

  1. Refining and cleaning

    @jmalles
    jmalles committed Oct 1, 2022
    Configuration menu
    Copy the full SHA
    88df30c View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Initial shift of water level in inversion for some cases

    @jmalles
    jmalles committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    2a89219 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Merge branch 'master' into water-terminating

    @fmaussion
    fmaussion authored Jan 4, 2023
    Configuration menu
    Copy the full SHA
    ab96034 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Fix issue with TANDEM DEM and minor RGI7 issue (OGGM#1510) 

    * Fix issue with TANDEM DEM and minor RGI7 issue

* Test fix
    @fmaussion @jmalles
    fmaussion authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    7cf7057 View commit details
    Browse the repository at this point in the history

  2. Small doc updates (OGGM#1520)

    @fmaussion @jmalles
    fmaussion authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    45f05e2 View commit details
    Browse the repository at this point in the history

  3. Fix Docs (OGGM#1521) 

    * Attempt fix docs

* pin scipy

* add package version

* deprec

* kuddos
    @fmaussion @jmalles
    fmaussion authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    899afad View commit details
    Browse the repository at this point in the history

  4. Migrate away from obsolete setuptools_scm_git_archive

    @TimoRoth @jmalles
    TimoRoth authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    ef27ead View commit details
    Browse the repository at this point in the history

  5. Add UTM coordinate system (OGGM#1526) 

    * Add UTM coordinate system

* Revert defaults
    @fmaussion @jmalles
    fmaussion authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    48844af View commit details
    Browse the repository at this point in the history

  6. Resolve merge conflicts

    @jmalles
    jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    481c90f View commit details
    Browse the repository at this point in the history

  7. rebase

    @pat-schmitt @jmalles
    pat-schmitt authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    8d936f9 View commit details
    Browse the repository at this point in the history

  8. Add hugonnet dhdt to shop and both hugonnet and millan to prepro leve… 

    …ls (OGGM#1529)
    @fmaussion @jmalles
    fmaussion authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    f0ced8a View commit details
    Browse the repository at this point in the history

  9. Bump docker/build-push-action from 3 to 4 (OGGM#1530) 

    Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @jmalles
    dependabot[bot] authored and jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    b9ac900 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/master' into water-terminating

    @jmalles
    jmalles committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    44b557b View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2023

  1. Decluttering, cleaning, commenting

    @jmalles
    jmalles committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    9da33ae View commit details
    Browse the repository at this point in the history

  2. small amendment

    @jmalles
    jmalles committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    fb8b373 View commit details
    Browse the repository at this point in the history

  3. small comment amendment

    @jmalles
    jmalles committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    1acfc19 View commit details
    Browse the repository at this point in the history