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

Some changes necessary for subsurface #118

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Some changes necessary for subsurface #118

wants to merge 5 commits into from

Commits on Sep 28, 2020

  1. - Added from_dict method

    @Leguark
    Leguark committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    2d1b718 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. - [ENH] Remove float casting. Often data is given as a integer (if it… 

    … is just an lithology id). This casting

 makes impossible to map a table to integer properties
    @Leguark
    Leguark committed May 6, 2021
    Configuration menu
    Copy the full SHA
    1ad2945 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/agile-geoscience/striplog 

    � Conflicts:
�	striplog/striplog.py
    @Leguark
    Leguark committed May 6, 2021
    Configuration menu
    Copy the full SHA
    0034d24 View commit details
    Browse the repository at this point in the history

  3. - [ENH] Allow comparing two components with different integer propert… 

    …y to fail.

This is necessary to be able to use table when the lithologies are given by id (int) instead by name (string)
    @Leguark
    Leguark committed May 6, 2021
    Configuration menu
    Copy the full SHA
    1bda523 View commit details
    Browse the repository at this point in the history

  4. - [CLN] Renamed from_dict_2 to from_dict_advance to be more descriptive

    @Leguark
    Leguark committed May 6, 2021
    Configuration menu
    Copy the full SHA
    fcd7825 View commit details
    Browse the repository at this point in the history