Skip to content

Commit 2e42180

Browse files
BotellaABotellaA
committed
check_
1 parent cacc414 commit 2e42180

15 files changed

Lines changed: 50 additions & 50 deletions

‎src/geode/geosciences/explicit/geometry/geographic_coordinate_system.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ namespace geode
8383
}
8484
const auto status = transformer->Transform(
8585
1, &values[0], &values[1], &values[2] );
86-
OpenGeodeGeosciencesExplicitException::check( status, nullptr,
87-
OpenGeodeException::TYPE::internal,
86+
OpenGeodeGeosciencesExplicitException::check_exception( status,
87+
nullptr, OpenGeodeException::TYPE::internal,
8888
"[GeographicCoordinateSystem::convert_geographic_"
8989
"coordinate_system] Failed to convert coordinates" );
9090
for( const auto d : LRange{ dimension } )

‎src/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ namespace
5757
using GeoCRS = typename geode::GeographicCoordinateSystem< Mesh::dim >;
5858
const auto& crs_manager =
5959
mesh.main_coordinate_reference_system_manager();
60-
geode::OpenGeodeGeosciencesExplicitException::check(
60+
geode::OpenGeodeGeosciencesExplicitException::check_exception(
6161
!crs_manager.coordinate_reference_system_exists( crs_name ),
6262
nullptr, geode::OpenGeodeException::TYPE::data,
6363
"[convert_components_coordinate_reference_system] New CRS name "
@@ -68,7 +68,7 @@ namespace
6868
std::make_shared< GeoCRS >( mesh.vertex_attribute_manager(), info );
6969
if( mesh.nb_vertices() != 0 )
7070
{
71-
geode::OpenGeodeGeosciencesExplicitException::check(
71+
geode::OpenGeodeGeosciencesExplicitException::check_exception(
7272
crs_manager.active_coordinate_reference_system().type_name()
7373
== GeoCRS::type_name_static(),
7474
nullptr, geode::OpenGeodeException::TYPE::data,

‎src/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ namespace geode
174174
Serializer archive{ context, file };
175175
archive.object( *this );
176176
archive.adapter().flush();
177-
OpenGeodeGeosciencesImplicitException::check(
177+
OpenGeodeGeosciencesImplicitException::check_exception(
178178
std::get< 1 >( context ).isValid(), nullptr,
179179
OpenGeodeException::TYPE::internal,
180180
"[Relationships::save] Error while writing file: ", filename );
@@ -191,7 +191,7 @@ namespace geode
191191
Deserializer archive{ context, file };
192192
archive.object( *this );
193193
const auto& adapter = archive.adapter();
194-
OpenGeodeGeosciencesImplicitException::check(
194+
OpenGeodeGeosciencesImplicitException::check_exception(
195195
adapter.error() == bitsery::ReaderError::NoError
196196
&& adapter.isCompletedSuccessfully()
197197
&& std::get< 1 >( context ).isValid(),

‎src/geode/geosciences/implicit/representation/builder/helpers/implicit_structural_model_stratigraphic_blocks_builder.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,23 +416,23 @@ namespace geode
416416
return {};
417417
}
418418
const auto& horizons_stack = implicit_model.horizons_stack();
419-
OpenGeodeGeosciencesImplicitException::check(
419+
OpenGeodeGeosciencesImplicitException::check_exception(
420420
horizons_stack.nb_stratigraphic_units() > 0, nullptr,
421421
OpenGeodeException::TYPE::data,
422422
"[complete_stratigraphic_unit_block_relationships_from_available_"
423423
"data] Horizons stack is empty (no stratigraphic units)." );
424-
OpenGeodeGeosciencesImplicitException::check(
424+
OpenGeodeGeosciencesImplicitException::check_exception(
425425
horizons_stack.nb_horizons() > 0, nullptr,
426426
OpenGeodeException::TYPE::data,
427427
"[complete_stratigraphic_unit_block_relationships_from_available_"
428428
"data] Horizons stack is empty (no horizons)." );
429-
OpenGeodeGeosciencesImplicitException::check(
429+
OpenGeodeGeosciencesImplicitException::check_exception(
430430
horizons_stack.top_horizon().has_value()
431431
&& horizons_stack.bottom_horizon().has_value(),
432432
nullptr, OpenGeodeException::TYPE::data,
433433
"[complete_stratigraphic_unit_block_relationships_from_available_"
434434
"data] Horizons stack is empty (no top and bottom horizons)." );
435-
OpenGeodeGeosciencesImplicitException::check(
435+
OpenGeodeGeosciencesImplicitException::check_exception(
436436
implicit_model.nb_horizons() > 0, nullptr,
437437
OpenGeodeException::TYPE::data,
438438
"[complete_stratigraphic_unit_block_relationships_from_available_"

‎src/geode/geosciences/implicit/representation/builder/horizons_stack_builder.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ namespace geode
4848
{
4949
const auto nb_components = horizons_stack_.nb_horizons()
5050
+ horizons_stack_.nb_stratigraphic_units();
51-
OpenGeodeGeosciencesImplicitException::check( nb_components == 0,
52-
nullptr, OpenGeodeException::TYPE::data,
51+
OpenGeodeGeosciencesImplicitException::check_exception(
52+
nb_components == 0, nullptr, OpenGeodeException::TYPE::data,
5353
"[HorizonsStackBuild::copy] HorizonsStack "
5454
"should be empty before copy." );
5555
if( const auto name = horizons_stack.name() )
@@ -91,8 +91,8 @@ namespace geode
9191
{
9292
const auto nb_components = horizons_stack_.nb_horizons()
9393
+ horizons_stack_.nb_stratigraphic_units();
94-
OpenGeodeGeosciencesImplicitException::check( nb_components == 0,
95-
nullptr, OpenGeodeException::TYPE::data,
94+
OpenGeodeGeosciencesImplicitException::check_exception(
95+
nb_components == 0, nullptr, OpenGeodeException::TYPE::data,
9696
"[HorizonsStackBuild::copy] HorizonsStack "
9797
"should be empty before copy." );
9898
if( const auto name = horizons_stack.name() )
@@ -156,7 +156,7 @@ namespace geode
156156
HorizonsStackBuilder< dimension >::add_horizon_in_stratigraphic_unit(
157157
const StratigraphicUnit< dimension >& strati_unit )
158158
{
159-
OpenGeodeGeosciencesImplicitException::check(
159+
OpenGeodeGeosciencesImplicitException::check_exception(
160160
horizons_stack_.has_stratigraphic_unit( strati_unit.id() ), nullptr,
161161
OpenGeodeException::TYPE::data,
162162
"[HorizonsStackBuilder::add_horizon_in_stratigraphic_"

‎src/geode/geosciences/implicit/representation/core/detail/helpers.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ namespace
5858
void check_number_of_horizons_and_stratigraphic_units(
5959
geode::index_t nb_horizons, geode::index_t nb_units )
6060
{
61-
geode::OpenGeodeGeosciencesImplicitException::check(
61+
geode::OpenGeodeGeosciencesImplicitException::check_exception(
6262
nb_horizons <= nb_units + 1, nullptr,
6363
geode::OpenGeodeException::TYPE::data,
6464
"[check_number_of_horizons_and_stratigraphic_units] Too many "
6565
"horizons compared "
6666
"to stratigraphic units (",
6767
nb_horizons, ", should be less than ", nb_units, ")" );
68-
geode::OpenGeodeGeosciencesImplicitException::check(
68+
geode::OpenGeodeGeosciencesImplicitException::check_exception(
6969
nb_units <= nb_horizons + 1, nullptr,
7070
geode::OpenGeodeException::TYPE::data,
7171
"[check_number_of_horizons_and_stratigraphic_units] Too many "
@@ -257,8 +257,8 @@ namespace geode
257257
ImplicitStructuralModel&& implicit_model,
258258
local_index_t implicit_axis )
259259
{
260-
OpenGeodeGeosciencesImplicitException::check( implicit_axis < 3,
261-
nullptr, OpenGeodeException::TYPE::data,
260+
OpenGeodeGeosciencesImplicitException::check_exception(
261+
implicit_axis < 3, nullptr, OpenGeodeException::TYPE::data,
262262
"[create_stratigraphic_model_from_brep_attribute_and_coords] "
263263
"Give a valid axis (0, 1, or 2)." );
264264

@@ -421,7 +421,7 @@ namespace geode
421421
su_above = horizon_stack.above( current_horizon.value() );
422422
horizon_counter++;
423423
}
424-
OpenGeodeGeosciencesImplicitException::check(
424+
OpenGeodeGeosciencesImplicitException::check_exception(
425425
horizon_counter == nb_horizons, nullptr,
426426
OpenGeodeException::TYPE::data,
427427
"[repair_horizon_stack_if_possible] Missing or wrong "

‎src/geode/geosciences/implicit/representation/core/horizons_stack.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ namespace geode
177177
const uuid& component ) const
178178
{
179179
auto component_is_a_horizon = this->has_horizon( component );
180-
OpenGeodeGeosciencesImplicitException::check(
180+
OpenGeodeGeosciencesImplicitException::check_exception(
181181
component_is_a_horizon || this->has_stratigraphic_unit( component ),
182182
nullptr, OpenGeodeException::TYPE::data,
183183
"[HorizonsStack::is_conformal_above] Given component with uuid ",
@@ -192,7 +192,7 @@ namespace geode
192192
else
193193
{
194194
const auto& horizon_above = this->above( component );
195-
OpenGeodeGeosciencesImplicitException::check(
195+
OpenGeodeGeosciencesImplicitException::check_exception(
196196
horizon_above.has_value(), nullptr,
197197
OpenGeodeException::TYPE::data,
198198
"[HorizonsStack::is_conformal_above] No horizon above given "
@@ -211,7 +211,7 @@ namespace geode
211211
const uuid& component ) const
212212
{
213213
auto component_is_a_horizon = this->has_horizon( component );
214-
OpenGeodeGeosciencesImplicitException::check(
214+
OpenGeodeGeosciencesImplicitException::check_exception(
215215
component_is_a_horizon || this->has_stratigraphic_unit( component ),
216216
nullptr, OpenGeodeException::TYPE::data,
217217
"[HorizonsStack::is_conformal_above] Given component with uuid ",
@@ -226,7 +226,7 @@ namespace geode
226226
else
227227
{
228228
const auto& horizon_under = this->under( component );
229-
OpenGeodeGeosciencesImplicitException::check(
229+
OpenGeodeGeosciencesImplicitException::check_exception(
230230
horizon_under.has_value(), nullptr,
231231
OpenGeodeException::TYPE::data,
232232
"[HorizonsStack::is_conformal_under] No horizon under given "

‎src/geode/geosciences/implicit/representation/core/implicit_cross_section.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ namespace geode
127127
std::optional< double > horizon_implicit_value(
128128
const Horizon2D& horizon ) const
129129
{
130-
OpenGeodeGeosciencesImplicitException::check(
130+
OpenGeodeGeosciencesImplicitException::check_exception(
131131
horizons_stack_.has_horizon( horizon.id() ), nullptr,
132132
OpenGeodeException::TYPE::data,
133133
"[horizon_implicit_value] You cannot access the isovalue of "
@@ -146,13 +146,13 @@ namespace geode
146146
double implicit_function_value, const Horizon2D& horizon ) const
147147
{
148148
const auto increasing = increasing_stack_isovalues();
149-
OpenGeodeGeosciencesImplicitException::check(
149+
OpenGeodeGeosciencesImplicitException::check_exception(
150150
increasing.has_value(), nullptr, OpenGeodeException::TYPE::data,
151151
"[implicit_value_is_above_horizon] Could not find if "
152152
"implicit values were increasing or decreasing in the horizon "
153153
"stack." );
154154
const auto it = horizon_isovalues_.find( horizon.id() );
155-
OpenGeodeGeosciencesImplicitException::check(
155+
OpenGeodeGeosciencesImplicitException::check_exception(
156156
it != horizon_isovalues_.end(), nullptr,
157157
OpenGeodeException::TYPE::data,
158158
"[implicit_value_is_above_horizon] Cannot find horizon "
@@ -222,7 +222,7 @@ namespace geode
222222
implicit_attributes_.reserve( model.nb_surfaces() );
223223
for( const auto& surface : model.surfaces() )
224224
{
225-
OpenGeodeGeosciencesImplicitException::check(
225+
OpenGeodeGeosciencesImplicitException::check_exception(
226226
( surface.mesh().type_name()
227227
== TriangulatedSurface2D::type_name_static() ),
228228
nullptr, OpenGeodeException::TYPE::data,
@@ -252,7 +252,7 @@ namespace geode
252252
void set_implicit_value(
253253
const Surface2D& surface, index_t vertex_id, double value )
254254
{
255-
OpenGeodeGeosciencesImplicitException::check(
255+
OpenGeodeGeosciencesImplicitException::check_exception(
256256
implicit_attributes_.find( surface.id() )
257257
!= implicit_attributes_.end(),
258258
nullptr, OpenGeodeException::TYPE::data,
@@ -271,7 +271,7 @@ namespace geode
271271
void set_horizon_implicit_value(
272272
const Horizon2D& horizon, double isovalue )
273273
{
274-
OpenGeodeGeosciencesImplicitException::check(
274+
OpenGeodeGeosciencesImplicitException::check_exception(
275275
horizons_stack_.has_horizon( horizon.id() ), nullptr,
276276
OpenGeodeException::TYPE::data,
277277
"[horizon_implicit_value] You cannot change the isovalue of "

‎src/geode/geosciences/implicit/representation/core/implicit_structural_model.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ namespace geode
126126
std::optional< double > horizon_implicit_value(
127127
const Horizon3D& horizon ) const
128128
{
129-
OpenGeodeGeosciencesImplicitException::check(
129+
OpenGeodeGeosciencesImplicitException::check_exception(
130130
horizons_stack_.has_horizon( horizon.id() ), nullptr,
131131
OpenGeodeException::TYPE::data,
132132
"[horizon_implicit_value] You cannot access the isovalue of "
@@ -145,13 +145,13 @@ namespace geode
145145
double implicit_function_value, const Horizon3D& horizon ) const
146146
{
147147
const auto increasing = increasing_stack_isovalues();
148-
OpenGeodeGeosciencesImplicitException::check(
148+
OpenGeodeGeosciencesImplicitException::check_exception(
149149
increasing.has_value(), nullptr, OpenGeodeException::TYPE::data,
150150
"[implicit_value_is_above_horizon] Could not find if "
151151
"implicit values were increasing or decreasing in the horizon "
152152
"stack." );
153153
const auto it = horizon_isovalues_.find( horizon.id() );
154-
OpenGeodeGeosciencesImplicitException::check(
154+
OpenGeodeGeosciencesImplicitException::check_exception(
155155
it != horizon_isovalues_.end(), nullptr,
156156
OpenGeodeException::TYPE::data,
157157
"[implicit_value_is_above_horizon] Cannot find horizon "
@@ -225,7 +225,7 @@ namespace geode
225225
{
226226
continue;
227227
}
228-
OpenGeodeGeosciencesImplicitException::check(
228+
OpenGeodeGeosciencesImplicitException::check_exception(
229229
( block.mesh().type_name()
230230
== TetrahedralSolid3D::type_name_static() ),
231231
nullptr, OpenGeodeException::TYPE::data,
@@ -254,7 +254,7 @@ namespace geode
254254
void set_implicit_value(
255255
const Block3D& block, index_t vertex_id, double value )
256256
{
257-
OpenGeodeGeosciencesImplicitException::check(
257+
OpenGeodeGeosciencesImplicitException::check_exception(
258258
implicit_attributes_.find( block.id() )
259259
!= implicit_attributes_.end(),
260260
nullptr, OpenGeodeException::TYPE::data,
@@ -272,7 +272,7 @@ namespace geode
272272
void set_horizon_implicit_value(
273273
const Horizon3D& horizon, double isovalue )
274274
{
275-
OpenGeodeGeosciencesImplicitException::check(
275+
OpenGeodeGeosciencesImplicitException::check_exception(
276276
horizons_stack_.has_horizon( horizon.id() ), nullptr,
277277
OpenGeodeException::TYPE::data,
278278
"[horizon_implicit_value] You cannot access the isovalue of "

‎src/geode/geosciences/implicit/representation/core/stratigraphic_model.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ namespace geode
195195
{
196196
for( const auto& block : model.blocks() )
197197
{
198-
OpenGeodeGeosciencesImplicitException::check(
198+
OpenGeodeGeosciencesImplicitException::check_exception(
199199
( block.mesh().type_name()
200200
== TetrahedralSolid3D::type_name_static() ),
201201
nullptr, OpenGeodeException::TYPE::data,
@@ -241,7 +241,7 @@ namespace geode
241241
void set_stratigraphic_location(
242242
const Block3D& block, index_t vertex_id, Point2D value )
243243
{
244-
OpenGeodeGeosciencesImplicitException::check(
244+
OpenGeodeGeosciencesImplicitException::check_exception(
245245
stratigraphic_location_attributes_.find( block.id() )
246246
!= stratigraphic_location_attributes_.end(),
247247
nullptr, OpenGeodeException::TYPE::data,
@@ -373,7 +373,7 @@ namespace geode
373373
const auto polygon_block_vertices =
374374
block_vertices_from_surface_polygon(
375375
model, block, surface, polygon_id );
376-
OpenGeodeGeosciencesImplicitException::check(
376+
OpenGeodeGeosciencesImplicitException::check_exception(
377377
polygon_block_vertices.size() == 1,
378378
surface_mesh.polygon_barycenter( polygon_id ),
379379
OpenGeodeException::TYPE::internal,
@@ -435,7 +435,7 @@ namespace geode
435435
const auto polygon_block_vertices =
436436
oriented_block_vertices_from_surface_polygon(
437437
model, block, surface, polygon_id );
438-
OpenGeodeGeosciencesImplicitException::check(
438+
OpenGeodeGeosciencesImplicitException::check_exception(
439439
polygon_block_vertices.nb_facets() == 2,
440440
surface_mesh.polygon_barycenter( polygon_id ),
441441
OpenGeodeException::TYPE::internal,

0 commit comments

Comments
 (0)