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

fix(horizons_stack_from_name_list): fix bug on windows. #110

Merged
merged 4 commits into from
Mar 25, 2024
Merged

fix(horizons_stack_from_name_list): fix bug on windows. #110

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f203ee
fix(horizons_stack_from_name_list): fix bug on windows.
MelchiorSchuh Mar 25, 2024
5411a6e
Apply prepare changes
MelchiorSchuh Mar 25, 2024
256c6bf
Apply prepare changes
MelchiorSchuh Mar 25, 2024
c6e5a52
Merge branch 'fix/changing-block-stratigraphic-unit-association-metho…
MelchiorSchuh Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bindings/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile bindings/python/requirements.in
# pip-compile --pre bindings/python/requirements.in
#
opengeode-core==14.*,>=14.17.0
# via -r bindings/python/requirements.in
7 changes: 4 additions & 3 deletions src/geode/geosciences/implicit/representation/core/detail/helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace
void check_number_of_horizons_and_stratigraphic_units(
geode::index_t nb_horizons, geode::index_t nb_units )
{
OPENGEODE_EXCEPTION( nb_horizons < nb_units + 2,
OPENGEODE_EXCEPTION( nb_horizons < nb_units + 1,
"[repair_horizon_stack_if_possible] Too many horizons compared "
"to stratigraphic units (",
nb_horizons, ", should be less than ", nb_units, ")" );
Expand Down Expand Up @@ -304,8 +304,9 @@ namespace geode
for( const auto counter : Range{ 1, horizons_names.size() } )
{
const auto& su_above = builder.add_stratigraphic_unit();
builder.set_stratigraphic_unit_name( su_above,
units_names[counter + lowest_unit_to_create ? -1 : 0] );
builder.set_stratigraphic_unit_name(
su_above, units_names[lowest_unit_to_create ? counter - 1
: counter] );
builder.add_horizon_under( stack.horizon( current_horizon ),
stack.stratigraphic_unit( su_above ) );
current_horizon = builder.add_horizon();
Expand Down
Loading