Skip to content
Snippets Groups Projects

WIP: Merge updates from 2019

Closed Matti Rauter requested to merge updates-v1912 into develop
1 unresolved thread

Updates of the year 2019.

Issues #2 (closed) (References) and #3 (closed) (releaseAreaDict format) have been resolved.

  • References have been added to all friction, entrainment and deposition models
  • A manual has been added
  • Contact data has been updated
  • releaseAreaMapping is now able to process geographic data files, such as ESRI grid files and ESRI shape files
  • releaseAreaDict format has been updated
  • gridToSTL is a new tool that allows to generate STL files from ESRI gridfiles
  • Entrainment models have been reworked. IsslerFC has been removed, Ramms has been added
  • More tutorials have been added, covering all tools and models
Edited by Mark OLESEN

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
67 (-3170.70329596 220188.039939 0)
68 (-3217.82825144 220159.061119 0)
69 (-3270.03077906 220135.610461 0)
70 (-3306.52205793 220126.884098 0)
71 (-3351.78087937 220131.05478 0)
72 (-3381.56086268 220146.496531 0)
73 (-3398.40379208 220170.448113 0)
74 (-3409.48018761 220183.461424 0)
75 (-3421.59997722 220189.454136 0)
76 (-3435.56902843 220192.340246 0)
77 (-3456.35183891 220192.698343 0)
78 (-3468.13073787 220189.712968 0)
79 (-3490.65106791 220181.094286 0)
80 );
38 type shapefile;
39 filename "constant/gisdata/release";
  • Author Developer

    This merge is not urgent and can wait until 2020. More updates should come for v2020.

  • @andy - this won't come in just yet, but looks like a case where we might want to have git large file storage to avoid exploding the repo

    @matti - we'll see what Andy comes back with (next year), or if there is a reasonable/reliable way to pull the geometry off a server?

  • LFS is already available - just need to configure the file extensions

  • Mark OLESEN added 20 commits

    added 20 commits

    • 6a2bf4c0...f6d700ce - 9 commits from branch develop
    • 6b7aa5ae - Added Geographic Information System import and export routines
    • 3acf5efc - New version of releaseAreaMapping. Better dictionary structure, reading shapefiles
    • a78a9cf6 - Tutorial for the new version of releaseAreaMapping
    • ecc18e2e - Moved HormannAgathos to library for use in multiple applications.
    • 3d568213 - Added gridToSTL: A tool to generate STL files from ESRI grid files
    • 4150fda1 - Added tutorial case for gridToSTL
    • df2da290 - Updated wolfsgrube case to new tools
    • 3b106fa6 - Updated releaseAreaMapping dictionaries of entrainment and simpleslope case to new version
    • 8f81a9df - Updated mail address
    • 043e1371 - Added tutorial for deposition model
    • 1cd2a8f7 - added manual

    Compare with previous version

  • Mark OLESEN marked as a Work In Progress

    marked as a Work In Progress

  • Hi Matti, I managed to pick across most of the model changes and rebased your branch accordingly.

    Some of the GIS bits need a bit of rework. Gcc doesn't mind, but Clang complains about assigning to variable length arrays. In this case, Clang is correct. However, the code itself needs a general cleanup.

  • Author Developer

    Thank you Mark!

    I will look into Clang and clean up the code for version 2006.

  • The offending part is the use of a variable size in the char buf[...] statement. So I've just added corresponding information in the wiki about how to avoid that.

    See the coding patterns for strings

    BTW: For harder testing, I am now using clang-9 as a system compiler and also with an non-standard combination - see coding patterns for precision

  • Matti Rauter added 11 commits

    added 11 commits

    • 99700f21 - Added Geographic Information System import and export routines
    • 6914fece - New version of releaseAreaMapping. Better dictionary structure, reading shapefiles
    • 4671aadb - Tutorial for the new version of releaseAreaMapping
    • 6a2b610f - Moved HormannAgathos to library for use in multiple applications.
    • 95d87e23 - Added gridToSTL: A tool to generate STL files from ESRI grid files
    • feddb10b - Added tutorial case for gridToSTL
    • 8f6752f7 - Updated wolfsgrube case to new tools
    • 82dafc34 - Updated releaseAreaMapping dictionaries of entrainment and simpleslope case to new version
    • 57124e95 - Updated mail address
    • 63a8479b - Added tutorial for deposition model
    • 21a6106a - added manual

    Compare with previous version

  • Closing this, all changes into v2006 merge request !8 (merged)

  • closed

  • Please register or sign in to reply
    Loading