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

Updating branch #220

Merged
merged 33 commits into from
Dec 8, 2023
Merged

Updating branch #220

merged 33 commits into from
Dec 8, 2023

Commits on Oct 30, 2023

  1. Update settings file and git ignore file

    Update settings file and git ignore file
    Mares2022 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    aa3ab3a View commit details
    Browse the repository at this point in the history
  2. Update gitignore

    Update gitignore
    Mares2022 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    aec5a91 View commit details
    Browse the repository at this point in the history
  3. Changing .gpkg files

    Changing .gpkg files
    Mares2022 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    d496995 View commit details
    Browse the repository at this point in the history
  4. Fixing integration hazard test, removing use on data catalog

    Fixing integration hazard test, removing use on data catalog
    Mares2022 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    6692b53 View commit details
    Browse the repository at this point in the history
  5. Remove path to area of interest and define it as geojson in the test …

    …files
    
    Remove path to area of interest and define it as geojson in the test files
    Mares2022 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    d84429d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Implementation of setup ground elevation function including test

    Implementation of setup ground elevation function including test
    Mares2022 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    1dd5aa9 View commit details
    Browse the repository at this point in the history
  2. Data produced in the runs

    Data produced in the runs, this data must be included in the .gitignore file
    Mares2022 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    95779a6 View commit details
    Browse the repository at this point in the history
  3. Change gitignore to avoid conflicts

    Change gitignore to avoid conflicts
    Mares2022 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    85cfd61 View commit details
    Browse the repository at this point in the history
  4. Update gitignore

    Update gitignore
    Mares2022 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    def37bd View commit details
    Browse the repository at this point in the history
  5. update gitignore

    update gitignore
    Mares2022 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    663b2b0 View commit details
    Browse the repository at this point in the history
  6. Update git ignore

    Update git ignore
    Mares2022 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    e4cfee6 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #199 from Deltares/#155-Add-function-to-assign-the…

    …-ground-elevation-to-the-buildings_v2
    
    #155 add function to assign the ground elevation to the buildings v2
    Mares2022 authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    43b4c3b View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Adding changes to update maximum potential damage and ground elevatio…

    …n in new developed areas
    
    Adding changes to update maximum potential damage and ground elevation in new developed areas
    Mares2022 committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    6f31614 View commit details
    Browse the repository at this point in the history
  2. Changes to merges branch with #145

    Changes to merges branch with #145
    Mares2022 committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    cf1a290 View commit details
    Browse the repository at this point in the history
  3. Update gitignore to merge branch with #145

    Update gitignore to merge branch with #145
    Mares2022 committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    43f7f46 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #206 from Deltares/#258-Elevation-of-new-developme…

    …nt-areas_v2
    
    Adding ground elevation from a DEM to new development areas and updating maximun potential damage with input user data (points and polygons)
    Mares2022 authored Nov 3, 2023
    Configuration menu
    Copy the full SHA
    3c29aec View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

  1. Change ground elevation test data

    Change ground elevation test data
    Mares2022 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    86d0e0a View commit details
    Browse the repository at this point in the history
  2. Data required for tests

    Data required for tests
    Mares2022 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    b32f1f0 View commit details
    Browse the repository at this point in the history
  3. Update test data

    Update test data
    Mares2022 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    3339254 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #209 from Deltares/#145-Update-maximum-potential-d…

    …amages-with-user-input-data
    
    #155-258-145-issues-with-main-updated
    Mares2022 authored Nov 5, 2023
    Configuration menu
    Copy the full SHA
    f38e1e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Small bug fix

    frederique-hub committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    fdf5bb8 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Integrate ground elevation from a digital elevation model into the wr…

    …iting function
    
    Integrate ground elevation from a digital elevation model into the writing function
    Mares2022 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    b96ae39 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Update xarray-spatial in environment and project .toml

    Update xarray-spatial in environment and project .toml
    Mares2022 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    2d02af5 View commit details
    Browse the repository at this point in the history
  2. Improvement of tests for assigning ground elevation and maximun poten…

    …tial damage from users data
    
    Improvement of tests for assigning ground elevation and maximun potential damage from users data
    Mares2022 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    337cffb View commit details
    Browse the repository at this point in the history
  3. Updating ground elevation test, and updating maximum potential damage…

    … with user data test
    
    Updating ground elevation test, and updating maximum potential damage with user data test
    Mares2022 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    924d101 View commit details
    Browse the repository at this point in the history
  4. Update test vulnerability exposure with dem data

    Update test vulnerability exposure with dem data
    Mares2022 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    a5c477c View commit details
    Browse the repository at this point in the history
  5. remove comented lines that were remplazed with ground_elevation_from_…

    …dem() function
    
    remove comented lines that were remplazed with ground_elevation_from_dem() function
    Mares2022 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    ba415ef View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Configuration menu
    Copy the full SHA
    4c9047c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a86edb2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    75abab4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d41ced9 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Configuration menu
    Copy the full SHA
    8ec7be7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #219 from Deltares/fix-max-potential-damage-function

    Fix max potential damage function
    frederique-hub authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    6def1ce View commit details
    Browse the repository at this point in the history