diff --git a/bindings/python/src/common.h b/bindings/python/src/common.h index bc0235df..66704ac1 100644 --- a/bindings/python/src/common.h +++ b/bindings/python/src/common.h @@ -27,7 +27,6 @@ #include #include -#include #include namespace pybind11 @@ -70,12 +69,5 @@ namespace pybind11 std::vector< typename std::remove_const< Type >::type > cpp_; }; - - template <> - struct type_caster< absl::string_view > - : string_caster< absl::string_view, true > - { - }; - } // namespace detail } // namespace pybind11 diff --git a/bindings/python/src/implicit/representation/core/helpers.h b/bindings/python/src/implicit/representation/core/helpers.h index f4a2a397..25e1a676 100644 --- a/bindings/python/src/implicit/representation/core/helpers.h +++ b/bindings/python/src/implicit/representation/core/helpers.h @@ -59,14 +59,13 @@ namespace geode .def( "repair_horizon_stack_if_possible_3d", &repair_horizon_stack_if_possible< 3 > ) .def( "implicit_section_from_cross_section_scalar_field", - []( CrossSection& model, - absl::string_view attribute_name ) { + []( CrossSection& model, std::string_view attribute_name ) { return implicit_section_from_cross_section_scalar_field( model.clone(), attribute_name ); } ) .def( "implicit_model_from_structural_model_scalar_field", []( StructuralModel& model, - absl::string_view attribute_name ) { + std::string_view attribute_name ) { return implicit_model_from_structural_model_scalar_field( model.clone(), attribute_name ); } ) diff --git a/include/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.h b/include/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.h index fe8f4887..535fb826 100644 --- a/include/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.h +++ b/include/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.h @@ -48,80 +48,80 @@ namespace geode void assign_edged_curve_geographic_coordinate_system_info( const EdgedCurve< dimension >& mesh, EdgedCurveBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); template < index_t dimension > void assign_point_set_geographic_coordinate_system_info( const PointSet< dimension >& mesh, PointSetBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); template < index_t dimension > void assign_solid_mesh_geographic_coordinate_system_info( const SolidMesh< dimension >& mesh, SolidMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); template < index_t dimension > void assign_surface_mesh_geographic_coordinate_system_info( const SurfaceMesh< dimension >& mesh, SurfaceMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); void opengeode_geosciences_explicit_api assign_brep_geographic_coordinate_system_info( const BRep& brep, BRepBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem3D::Info& info ); void opengeode_geosciences_explicit_api assign_section_geographic_coordinate_system_info( const Section& section, SectionBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem2D::Info& info ); template < index_t dimension > void convert_edged_curve_coordinate_reference_system( const EdgedCurve< dimension >& mesh, EdgedCurveBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); template < index_t dimension > void convert_point_set_coordinate_reference_system( const PointSet< dimension >& mesh, PointSetBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); template < index_t dimension > void convert_solid_mesh_coordinate_reference_system( const SolidMesh< dimension >& mesh, SolidMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); template < index_t dimension > void convert_surface_mesh_coordinate_reference_system( const SurfaceMesh< dimension >& mesh, SurfaceMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ); void opengeode_geosciences_explicit_api convert_brep_coordinate_reference_system( const BRep& brep, BRepBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem3D::Info& info ); void opengeode_geosciences_explicit_api convert_section_coordinate_reference_system( const Section& section, SectionBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem2D::Info& info ); } // namespace geode \ No newline at end of file diff --git a/include/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.h b/include/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.h index e48fd822..c80da26e 100644 --- a/include/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.h +++ b/include/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.h @@ -39,9 +39,9 @@ namespace geode class FaultBlocksBuilder { public: - void load_fault_blocks( absl::string_view directory ); + void load_fault_blocks( std::string_view directory ); - void set_fault_block_name( const uuid& id, absl::string_view name ); + void set_fault_block_name( const uuid& id, std::string_view name ); protected: explicit FaultBlocksBuilder( FaultBlocks< dimension >& fault_blocks ) diff --git a/include/geode/geosciences/explicit/mixin/builder/faults_builder.h b/include/geode/geosciences/explicit/mixin/builder/faults_builder.h index dc0679b7..18fe16d1 100644 --- a/include/geode/geosciences/explicit/mixin/builder/faults_builder.h +++ b/include/geode/geosciences/explicit/mixin/builder/faults_builder.h @@ -39,12 +39,12 @@ namespace geode class FaultsBuilder { public: - void load_faults( absl::string_view directory ); + void load_faults( std::string_view directory ); void set_fault_type( const uuid& fault_id, typename Fault< dimension >::FAULT_TYPE type ); - void set_fault_name( const uuid& id, absl::string_view name ); + void set_fault_name( const uuid& id, std::string_view name ); protected: explicit FaultsBuilder( Faults< dimension >& faults ) diff --git a/include/geode/geosciences/explicit/mixin/builder/horizons_builder.h b/include/geode/geosciences/explicit/mixin/builder/horizons_builder.h index 073ee646..c06d3bdd 100644 --- a/include/geode/geosciences/explicit/mixin/builder/horizons_builder.h +++ b/include/geode/geosciences/explicit/mixin/builder/horizons_builder.h @@ -39,12 +39,12 @@ namespace geode class HorizonsBuilder { public: - void load_horizons( absl::string_view directory ); + void load_horizons( std::string_view directory ); void set_horizon_type( const uuid& horizon_id, typename Horizon< dimension >::HORIZON_TYPE type ); - void set_horizon_name( const uuid& id, absl::string_view name ); + void set_horizon_name( const uuid& id, std::string_view name ); protected: explicit HorizonsBuilder( Horizons< dimension >& horizons ) diff --git a/include/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.h b/include/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.h index e0ea953f..c0a7d21c 100644 --- a/include/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.h +++ b/include/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.h @@ -39,10 +39,10 @@ namespace geode class StratigraphicUnitsBuilder { public: - void load_stratigraphic_units( absl::string_view directory ); + void load_stratigraphic_units( std::string_view directory ); void set_stratigraphic_unit_name( - const uuid& id, absl::string_view name ); + const uuid& id, std::string_view name ); protected: explicit StratigraphicUnitsBuilder( diff --git a/include/geode/geosciences/explicit/mixin/core/fault.h b/include/geode/geosciences/explicit/mixin/core/fault.h index e5f81c55..1ba74e2c 100644 --- a/include/geode/geosciences/explicit/mixin/core/fault.h +++ b/include/geode/geosciences/explicit/mixin/core/fault.h @@ -89,7 +89,7 @@ namespace geode void set_type( FAULT_TYPE type, FaultsBuilderKey ); - void set_fault_name( absl::string_view name, FaultsBuilderKey ) + void set_fault_name( std::string_view name, FaultsBuilderKey ) { this->set_name( name ); } diff --git a/include/geode/geosciences/explicit/mixin/core/fault_block.h b/include/geode/geosciences/explicit/mixin/core/fault_block.h index 8bf64125..c19f388e 100644 --- a/include/geode/geosciences/explicit/mixin/core/fault_block.h +++ b/include/geode/geosciences/explicit/mixin/core/fault_block.h @@ -71,7 +71,7 @@ namespace geode FaultBlock( FaultBlocksKey ) : FaultBlock(){}; void set_fault_block_name( - absl::string_view name, FaultBlocksBuilderKey ) + std::string_view name, FaultBlocksBuilderKey ) { this->set_name( name ); } diff --git a/include/geode/geosciences/explicit/mixin/core/fault_blocks.h b/include/geode/geosciences/explicit/mixin/core/fault_blocks.h index 5fb22665..d5fdba59 100644 --- a/include/geode/geosciences/explicit/mixin/core/fault_blocks.h +++ b/include/geode/geosciences/explicit/mixin/core/fault_blocks.h @@ -94,7 +94,7 @@ namespace geode FaultBlockRange fault_blocks() const; - void save_fault_blocks( absl::string_view directory ) const; + void save_fault_blocks( std::string_view directory ) const; protected: friend class FaultBlocksBuilder< dimension >; @@ -129,7 +129,7 @@ namespace geode void delete_fault_block( const FaultBlock< dimension >& fault_block ); - void load_fault_blocks( absl::string_view directory ); + void load_fault_blocks( std::string_view directory ); ModifiableFaultBlockRange modifiable_fault_blocks(); diff --git a/include/geode/geosciences/explicit/mixin/core/faults.h b/include/geode/geosciences/explicit/mixin/core/faults.h index eb1f483b..bb00f1f9 100644 --- a/include/geode/geosciences/explicit/mixin/core/faults.h +++ b/include/geode/geosciences/explicit/mixin/core/faults.h @@ -94,7 +94,7 @@ namespace geode FaultRange faults() const; - void save_faults( absl::string_view directory ) const; + void save_faults( std::string_view directory ) const; protected: friend class FaultsBuilder< dimension >; @@ -135,7 +135,7 @@ namespace geode void delete_fault( const Fault< dimension >& fault ); - void load_faults( absl::string_view directory ); + void load_faults( std::string_view directory ); ModifiableFaultRange modifiable_faults(); diff --git a/include/geode/geosciences/explicit/mixin/core/horizon.h b/include/geode/geosciences/explicit/mixin/core/horizon.h index 92586075..74dcfefd 100644 --- a/include/geode/geosciences/explicit/mixin/core/horizon.h +++ b/include/geode/geosciences/explicit/mixin/core/horizon.h @@ -88,7 +88,7 @@ namespace geode void set_type( HORIZON_TYPE type, HorizonsBuilderKey ); - void set_horizon_name( absl::string_view name, HorizonsBuilderKey ) + void set_horizon_name( std::string_view name, HorizonsBuilderKey ) { this->set_name( name ); } diff --git a/include/geode/geosciences/explicit/mixin/core/horizons.h b/include/geode/geosciences/explicit/mixin/core/horizons.h index 6f7afe67..33d54b5e 100644 --- a/include/geode/geosciences/explicit/mixin/core/horizons.h +++ b/include/geode/geosciences/explicit/mixin/core/horizons.h @@ -94,7 +94,7 @@ namespace geode HorizonRange horizons() const; - void save_horizons( absl::string_view directory ) const; + void save_horizons( std::string_view directory ) const; protected: friend class HorizonsBuilder< dimension >; @@ -136,7 +136,7 @@ namespace geode void delete_horizon( const Horizon< dimension >& horizon ); - void load_horizons( absl::string_view directory ); + void load_horizons( std::string_view directory ); ModifiableHorizonRange modifiable_horizons(); diff --git a/include/geode/geosciences/explicit/mixin/core/stratigraphic_unit.h b/include/geode/geosciences/explicit/mixin/core/stratigraphic_unit.h index c61f0f5d..cd87eb09 100644 --- a/include/geode/geosciences/explicit/mixin/core/stratigraphic_unit.h +++ b/include/geode/geosciences/explicit/mixin/core/stratigraphic_unit.h @@ -70,7 +70,7 @@ namespace geode StratigraphicUnit( StratigraphicUnitsKey ) : StratigraphicUnit() {} void set_stratigraphic_unit_name( - absl::string_view name, StratigraphicUnitsBuilderKey ) + std::string_view name, StratigraphicUnitsBuilderKey ) { this->set_name( name ); } diff --git a/include/geode/geosciences/explicit/mixin/core/stratigraphic_units.h b/include/geode/geosciences/explicit/mixin/core/stratigraphic_units.h index 084d8def..2a3ec33a 100644 --- a/include/geode/geosciences/explicit/mixin/core/stratigraphic_units.h +++ b/include/geode/geosciences/explicit/mixin/core/stratigraphic_units.h @@ -100,7 +100,7 @@ namespace geode StratigraphicUnitRange stratigraphic_units() const; - void save_stratigraphic_units( absl::string_view directory ) const; + void save_stratigraphic_units( std::string_view directory ) const; protected: friend class StratigraphicUnitsBuilder< dimension >; @@ -139,7 +139,7 @@ namespace geode void delete_stratigraphic_unit( const StratigraphicUnit< dimension >& stratigraphic_unit ); - void load_stratigraphic_units( absl::string_view directory ); + void load_stratigraphic_units( std::string_view directory ); ModifiableStratigraphicUnitRange modifiable_stratigraphic_units(); diff --git a/include/geode/geosciences/explicit/representation/core/cross_section.h b/include/geode/geosciences/explicit/representation/core/cross_section.h index 2390ba6f..29c7e6c9 100644 --- a/include/geode/geosciences/explicit/representation/core/cross_section.h +++ b/include/geode/geosciences/explicit/representation/core/cross_section.h @@ -154,12 +154,12 @@ namespace geode CrossSection clone() const; - static constexpr absl::string_view native_extension_static() + static constexpr std::string_view native_extension_static() { return "og_xsctn"; } - absl::string_view native_extension() const + std::string_view native_extension() const { return native_extension_static(); } diff --git a/include/geode/geosciences/explicit/representation/core/structural_model.h b/include/geode/geosciences/explicit/representation/core/structural_model.h index 6426ade3..ed2cad80 100644 --- a/include/geode/geosciences/explicit/representation/core/structural_model.h +++ b/include/geode/geosciences/explicit/representation/core/structural_model.h @@ -157,12 +157,12 @@ namespace geode StructuralModel clone() const; - static constexpr absl::string_view native_extension_static() + static constexpr std::string_view native_extension_static() { return "og_strm"; } - absl::string_view native_extension() const + std::string_view native_extension() const { return native_extension_static(); } diff --git a/include/geode/geosciences/explicit/representation/io/cross_section_input.h b/include/geode/geosciences/explicit/representation/io/cross_section_input.h index f422f2ba..9a172079 100644 --- a/include/geode/geosciences/explicit/representation/io/cross_section_input.h +++ b/include/geode/geosciences/explicit/representation/io/cross_section_input.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include @@ -45,7 +45,7 @@ namespace geode * @param[in] filename Path to the file to load. */ CrossSection opengeode_geosciences_explicit_api load_cross_section( - absl::string_view filename ); + std::string_view filename ); class CrossSectionInput : public Input< CrossSection > { @@ -55,18 +55,18 @@ namespace geode using typename Base::MissingFiles; protected: - explicit CrossSectionInput( absl::string_view filename ) + explicit CrossSectionInput( std::string_view filename ) : Base{ filename } { } }; CrossSectionInput::MissingFiles opengeode_geosciences_explicit_api - check_cross_section_missing_files( absl::string_view filename ); + check_cross_section_missing_files( std::string_view filename ); bool opengeode_geosciences_explicit_api is_cross_section_loadable( - absl::string_view filename ); + std::string_view filename ); using CrossSectionInputFactory = - Factory< std::string, CrossSectionInput, absl::string_view >; + Factory< std::string, CrossSectionInput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/explicit/representation/io/cross_section_output.h b/include/geode/geosciences/explicit/representation/io/cross_section_output.h index 6ae263af..e13b9fc5 100644 --- a/include/geode/geosciences/explicit/representation/io/cross_section_output.h +++ b/include/geode/geosciences/explicit/representation/io/cross_section_output.h @@ -24,10 +24,9 @@ #pragma once #include +#include #include -#include - #include #include @@ -49,7 +48,7 @@ namespace geode */ std::vector< std::string > opengeode_geosciences_explicit_api save_cross_section( - const CrossSection& cross_section, absl::string_view filename ); + const CrossSection& cross_section, std::string_view filename ); class CrossSectionOutput : public Output< CrossSection > { @@ -57,15 +56,15 @@ namespace geode virtual ~CrossSectionOutput() = default; protected: - explicit CrossSectionOutput( absl::string_view filename ) + explicit CrossSectionOutput( std::string_view filename ) : Output< CrossSection >{ filename } { } }; bool opengeode_geosciences_explicit_api is_cross_section_saveable( - const CrossSection& cross_section, absl::string_view filename ); + const CrossSection& cross_section, std::string_view filename ); using CrossSectionOutputFactory = - Factory< std::string, CrossSectionOutput, absl::string_view >; + Factory< std::string, CrossSectionOutput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.h b/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.h index 8a82b712..11233343 100644 --- a/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.h +++ b/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.h @@ -32,15 +32,15 @@ namespace geode : public CrossSectionInput { public: - explicit OpenGeodeCrossSectionInput( absl::string_view filename ); + explicit OpenGeodeCrossSectionInput( std::string_view filename ); - static absl::string_view extension() + static std::string_view extension() { return CrossSection::native_extension_static(); } void load_cross_section_files( - CrossSection& cross_section, absl::string_view directory ); + CrossSection& cross_section, std::string_view directory ); CrossSection read() final; }; diff --git a/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.h b/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.h index 214f78b3..8362a148 100644 --- a/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.h +++ b/include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.h @@ -40,15 +40,15 @@ namespace geode : public CrossSectionOutput { public: - explicit OpenGeodeCrossSectionOutput( absl::string_view filename ); + explicit OpenGeodeCrossSectionOutput( std::string_view filename ); - static absl::string_view extension() + static std::string_view extension() { return CrossSection::native_extension_static(); } void save_cross_section_files( const CrossSection& cross_section, - absl::string_view directory ) const; + std::string_view directory ) const; void archive_cross_section_files( const ZipFile& zip_writer ) const; diff --git a/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.h b/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.h index 3502f10c..f639938d 100644 --- a/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.h +++ b/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.h @@ -32,15 +32,15 @@ namespace geode : public StructuralModelInput { public: - explicit OpenGeodeStructuralModelInput( absl::string_view filename ); + explicit OpenGeodeStructuralModelInput( std::string_view filename ); - static absl::string_view extension() + static std::string_view extension() { return StructuralModel::native_extension_static(); } void load_structural_model_files( - StructuralModel& structural_model, absl::string_view directory ); + StructuralModel& structural_model, std::string_view directory ); StructuralModel read() final; }; diff --git a/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.h b/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.h index 60968977..4d20be3f 100644 --- a/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.h +++ b/include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.h @@ -40,16 +40,16 @@ namespace geode final : public StructuralModelOutput { public: - explicit OpenGeodeStructuralModelOutput( absl::string_view filename ); + explicit OpenGeodeStructuralModelOutput( std::string_view filename ); - static absl::string_view extension() + static std::string_view extension() { return StructuralModel::native_extension_static(); } void save_structural_model_files( const StructuralModel& structural_model, - absl::string_view directory ) const; + std::string_view directory ) const; void archive_structural_model_files( const ZipFile& zip_writer ) const; diff --git a/include/geode/geosciences/explicit/representation/io/structural_model_input.h b/include/geode/geosciences/explicit/representation/io/structural_model_input.h index 90753f34..e2c73ab2 100644 --- a/include/geode/geosciences/explicit/representation/io/structural_model_input.h +++ b/include/geode/geosciences/explicit/representation/io/structural_model_input.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include @@ -45,7 +45,7 @@ namespace geode * @param[in] filename Path to the file to load. */ StructuralModel opengeode_geosciences_explicit_api load_structural_model( - absl::string_view filename ); + std::string_view filename ); class StructuralModelInput : public Input< StructuralModel > { @@ -55,18 +55,18 @@ namespace geode using typename Base::MissingFiles; protected: - explicit StructuralModelInput( absl::string_view filename ) + explicit StructuralModelInput( std::string_view filename ) : Base{ filename } { } }; StructuralModelInput::MissingFiles opengeode_geosciences_explicit_api - check_structural_model_missing_files( absl::string_view filename ); + check_structural_model_missing_files( std::string_view filename ); bool opengeode_geosciences_explicit_api is_structural_model_loadable( - absl::string_view filename ); + std::string_view filename ); using StructuralModelInputFactory = - Factory< std::string, StructuralModelInput, absl::string_view >; + Factory< std::string, StructuralModelInput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/explicit/representation/io/structural_model_output.h b/include/geode/geosciences/explicit/representation/io/structural_model_output.h index 6dcd1227..b2343444 100644 --- a/include/geode/geosciences/explicit/representation/io/structural_model_output.h +++ b/include/geode/geosciences/explicit/representation/io/structural_model_output.h @@ -24,10 +24,9 @@ #pragma once #include +#include #include -#include - #include #include @@ -49,7 +48,7 @@ namespace geode */ std::vector< std::string > opengeode_geosciences_explicit_api save_structural_model( const StructuralModel& structural_model, - absl::string_view filename ); + std::string_view filename ); class StructuralModelOutput : public Output< StructuralModel > { @@ -57,15 +56,15 @@ namespace geode virtual ~StructuralModelOutput() = default; protected: - explicit StructuralModelOutput( absl::string_view filename ) + explicit StructuralModelOutput( std::string_view filename ) : Output< StructuralModel >{ filename } { } }; bool opengeode_geosciences_explicit_api is_structural_model_saveable( - const StructuralModel& structural_model, absl::string_view filename ); + const StructuralModel& structural_model, std::string_view filename ); using StructuralModelOutputFactory = - Factory< std::string, StructuralModelOutput, absl::string_view >; + Factory< std::string, StructuralModelOutput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.h b/include/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.h index b1e8e4a8..c3408bb3 100644 --- a/include/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.h +++ b/include/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.h @@ -64,7 +64,7 @@ namespace geode void copy_stratigraphic_relationships( const ModelCopyMapping& mapping, const StratigraphicRelationships& relationships ); - void load_stratigraphic_relationships( absl::string_view directory ); + void load_stratigraphic_relationships( std::string_view directory ); protected: /*! diff --git a/include/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.h b/include/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.h index 8047eb0c..7e305c2e 100644 --- a/include/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.h +++ b/include/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.h @@ -63,7 +63,7 @@ namespace geode std::optional< uuid > under( const uuid& element ) const; void save_stratigraphic_relationships( - absl::string_view directory ) const; + std::string_view directory ) const; public: /*! @@ -115,7 +115,7 @@ namespace geode StratigraphicRelationshipsBuilderKey ); void load_stratigraphic_relationships( - absl::string_view directory, StratigraphicRelationshipsBuilderKey ); + std::string_view directory, StratigraphicRelationshipsBuilderKey ); protected: StratigraphicRelationships( diff --git a/include/geode/geosciences/implicit/representation/core/detail/helpers.h b/include/geode/geosciences/implicit/representation/core/detail/helpers.h index 76c04fd0..99fc5295 100644 --- a/include/geode/geosciences/implicit/representation/core/detail/helpers.h +++ b/include/geode/geosciences/implicit/representation/core/detail/helpers.h @@ -58,20 +58,20 @@ namespace geode rescale_implicit_value_to_bbox_scale( StratigraphicModel& model ); void opengeode_geosciences_implicit_api save_stratigraphic_surfaces( - const StratigraphicSection& section, absl::string_view prefix ); + const StratigraphicSection& section, std::string_view prefix ); void opengeode_geosciences_implicit_api save_stratigraphic_blocks( - const StratigraphicModel& model, absl::string_view prefix ); + const StratigraphicModel& model, std::string_view prefix ); ImplicitCrossSection opengeode_geosciences_implicit_api implicit_section_from_cross_section_scalar_field( CrossSection&& section, - absl::string_view scalar_attribute_name ); + std::string_view scalar_attribute_name ); ImplicitStructuralModel opengeode_geosciences_implicit_api implicit_model_from_structural_model_scalar_field( StructuralModel&& model, - absl::string_view scalar_attribute_name ); + std::string_view scalar_attribute_name ); StratigraphicModel opengeode_geosciences_implicit_api stratigraphic_model_from_implicit_model_and_coords( diff --git a/include/geode/geosciences/implicit/representation/core/horizons_stack.h b/include/geode/geosciences/implicit/representation/core/horizons_stack.h index c3b3c5f8..1b1ed215 100644 --- a/include/geode/geosciences/implicit/representation/core/horizons_stack.h +++ b/include/geode/geosciences/implicit/representation/core/horizons_stack.h @@ -69,14 +69,14 @@ namespace geode HorizonsStack< dimension > clone() const; - static absl::string_view native_extension_static() + static std::string_view native_extension_static() { static const auto extension = absl::StrCat( "og_hst", dimension, "d" ); return extension; } - absl::string_view native_extension() const + std::string_view native_extension() const { return native_extension_static(); } diff --git a/include/geode/geosciences/implicit/representation/core/implicit_cross_section.h b/include/geode/geosciences/implicit/representation/core/implicit_cross_section.h index dfa9c6f0..14810a51 100644 --- a/include/geode/geosciences/implicit/representation/core/implicit_cross_section.h +++ b/include/geode/geosciences/implicit/representation/core/implicit_cross_section.h @@ -65,12 +65,12 @@ namespace geode ImplicitCrossSection clone() const; - static constexpr absl::string_view native_extension_static() + static constexpr std::string_view native_extension_static() { return "og_ixsctn"; } - absl::string_view native_extension() const + std::string_view native_extension() const { return native_extension_static(); } diff --git a/include/geode/geosciences/implicit/representation/core/implicit_structural_model.h b/include/geode/geosciences/implicit/representation/core/implicit_structural_model.h index 07889886..eb057764 100644 --- a/include/geode/geosciences/implicit/representation/core/implicit_structural_model.h +++ b/include/geode/geosciences/implicit/representation/core/implicit_structural_model.h @@ -66,12 +66,12 @@ namespace geode ImplicitStructuralModel clone() const; - static constexpr absl::string_view native_extension_static() + static constexpr std::string_view native_extension_static() { return "og_istrm"; } - absl::string_view native_extension() const + std::string_view native_extension() const { return native_extension_static(); } diff --git a/include/geode/geosciences/implicit/representation/core/stratigraphic_model.h b/include/geode/geosciences/implicit/representation/core/stratigraphic_model.h index 5b33a37c..e83c0d35 100644 --- a/include/geode/geosciences/implicit/representation/core/stratigraphic_model.h +++ b/include/geode/geosciences/implicit/representation/core/stratigraphic_model.h @@ -70,12 +70,12 @@ namespace geode StratigraphicModel clone() const; - static constexpr absl::string_view native_extension_static() + static constexpr std::string_view native_extension_static() { return "og_stgm"; } - absl::string_view native_extension() const + std::string_view native_extension() const { return native_extension_static(); } diff --git a/include/geode/geosciences/implicit/representation/core/stratigraphic_section.h b/include/geode/geosciences/implicit/representation/core/stratigraphic_section.h index e398bbde..025400f6 100644 --- a/include/geode/geosciences/implicit/representation/core/stratigraphic_section.h +++ b/include/geode/geosciences/implicit/representation/core/stratigraphic_section.h @@ -74,12 +74,12 @@ namespace geode StratigraphicSection clone() const; - static constexpr absl::string_view native_extension_static() + static constexpr std::string_view native_extension_static() { return "og_stgs"; } - absl::string_view native_extension() const + std::string_view native_extension() const { return native_extension_static(); } diff --git a/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.h b/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.h index 648f5f4b..fb432e98 100644 --- a/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.h +++ b/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.h @@ -33,19 +33,19 @@ namespace geode : public HorizonsStackInput< dimension > { public: - OpenGeodeHorizonsStackInput( absl::string_view filename ) + OpenGeodeHorizonsStackInput( std::string_view filename ) : HorizonsStackInput< dimension >( filename ) { } - static absl::string_view extension() + static std::string_view extension() { return HorizonsStack< dimension >::native_extension_static(); } void load_horizons_stack_files( HorizonsStack< dimension >& horizons_stack, - absl::string_view directory ); + std::string_view directory ); HorizonsStack< dimension > read() final; }; diff --git a/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_output.h b/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_output.h index 0d70e967..97242120 100644 --- a/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_output.h +++ b/include/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_output.h @@ -43,12 +43,12 @@ namespace geode : public HorizonsStackOutput< dimension > { public: - OpenGeodeHorizonsStackOutput( absl::string_view filename ) + OpenGeodeHorizonsStackOutput( std::string_view filename ) : HorizonsStackOutput< dimension >( filename ) { } - static absl::string_view extension() + static std::string_view extension() { return HorizonsStack< dimension >::native_extension_static(); } @@ -64,7 +64,7 @@ namespace geode void save_horizons_stack_files( const HorizonsStack< dimension >& horizons_stack, - absl::string_view directory ) const + std::string_view directory ) const { async::parallel_invoke( [&directory, &horizons_stack] { diff --git a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.h b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.h index fd3ce592..b19b5a62 100644 --- a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.h +++ b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.h @@ -32,18 +32,18 @@ namespace geode final : public ImplicitCrossSectionInput { public: - OpenGeodeImplicitCrossSectionInput( absl::string_view filename ) + OpenGeodeImplicitCrossSectionInput( std::string_view filename ) : ImplicitCrossSectionInput( filename ) { } - static absl::string_view extension() + static std::string_view extension() { return ImplicitCrossSection::native_extension_static(); } void load_implicit_cross_section_files( - ImplicitCrossSection& section, absl::string_view directory ); + ImplicitCrossSection& section, std::string_view directory ); ImplicitCrossSection read() final; }; diff --git a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.h b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.h index 0367af14..8106240c 100644 --- a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.h +++ b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.h @@ -40,12 +40,12 @@ namespace geode final : public ImplicitCrossSectionOutput { public: - OpenGeodeImplicitCrossSectionOutput( absl::string_view filename ) + OpenGeodeImplicitCrossSectionOutput( std::string_view filename ) : ImplicitCrossSectionOutput( filename ) { } - static absl::string_view extension() + static std::string_view extension() { return ImplicitCrossSection::native_extension_static(); } @@ -54,7 +54,7 @@ namespace geode void save_implicit_section_files( const ImplicitCrossSection& implicit_section, - absl::string_view directory ) const; + std::string_view directory ) const; std::vector< std::string > write( const ImplicitCrossSection& implicit_section ) const final; diff --git a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.h b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.h index 156d3a5a..a85e9b30 100644 --- a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.h +++ b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.h @@ -33,18 +33,18 @@ namespace geode : public ImplicitStructuralModelInput { public: - OpenGeodeImplicitStructuralModelInput( absl::string_view filename ) + OpenGeodeImplicitStructuralModelInput( std::string_view filename ) : ImplicitStructuralModelInput( filename ) { } - static absl::string_view extension() + static std::string_view extension() { return ImplicitStructuralModel::native_extension_static(); } void load_implicit_structural_model_files( - ImplicitStructuralModel& model, absl::string_view directory ); + ImplicitStructuralModel& model, std::string_view directory ); ImplicitStructuralModel read() final; }; diff --git a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.h b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.h index 7b495556..f4cc7e1b 100644 --- a/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.h +++ b/include/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.h @@ -41,12 +41,12 @@ namespace geode : public ImplicitStructuralModelOutput { public: - OpenGeodeImplicitStructuralModelOutput( absl::string_view filename ) + OpenGeodeImplicitStructuralModelOutput( std::string_view filename ) : ImplicitStructuralModelOutput( filename ) { } - static absl::string_view extension() + static std::string_view extension() { return ImplicitStructuralModel::native_extension_static(); } @@ -55,7 +55,7 @@ namespace geode void save_implicit_model_files( const ImplicitStructuralModel& implicit_model, - absl::string_view directory ) const; + std::string_view directory ) const; std::vector< std::string > write( const ImplicitStructuralModel& implicit_model ) const final; diff --git a/include/geode/geosciences/implicit/representation/io/horizons_stack_input.h b/include/geode/geosciences/implicit/representation/io/horizons_stack_input.h index f46a243d..88649d4e 100644 --- a/include/geode/geosciences/implicit/representation/io/horizons_stack_input.h +++ b/include/geode/geosciences/implicit/representation/io/horizons_stack_input.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include #include @@ -45,8 +45,7 @@ namespace geode * @return Loaded HorizonsStack. */ template < index_t dimension > - HorizonsStack< dimension > load_horizons_stack( - absl::string_view filename ); + HorizonsStack< dimension > load_horizons_stack( std::string_view filename ); template < index_t dimension > class HorizonsStackInput : public Input< HorizonsStack< dimension > > @@ -57,7 +56,7 @@ namespace geode using typename Base::MissingFiles; protected: - explicit HorizonsStackInput( absl::string_view filename ) + explicit HorizonsStackInput( std::string_view filename ) : Base{ filename } { } @@ -65,14 +64,14 @@ namespace geode template < index_t dimension > typename HorizonsStackInput< dimension >::MissingFiles - check_horizons_stack_missing_files( absl::string_view filename ); + check_horizons_stack_missing_files( std::string_view filename ); template < index_t dimension > - bool is_horizons_stack_loadable( absl::string_view filename ); + bool is_horizons_stack_loadable( std::string_view filename ); template < index_t dimension > using HorizonsStackInputFactory = Factory< std::string, HorizonsStackInput< dimension >, - absl::string_view >; + std::string_view >; ALIAS_2D_AND_3D( HorizonsStackInputFactory ); } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/horizons_stack_output.h b/include/geode/geosciences/implicit/representation/io/horizons_stack_output.h index 36ad61ba..e83d32fc 100644 --- a/include/geode/geosciences/implicit/representation/io/horizons_stack_output.h +++ b/include/geode/geosciences/implicit/representation/io/horizons_stack_output.h @@ -24,10 +24,9 @@ #pragma once #include +#include #include -#include - #include #include @@ -50,13 +49,13 @@ namespace geode template < index_t dimension > std::vector< std::string > save_horizons_stack( const HorizonsStack< dimension >& horizons_stack, - absl::string_view filename ); + std::string_view filename ); template < index_t dimension > class HorizonsStackOutput : public Output< HorizonsStack< dimension > > { protected: - HorizonsStackOutput( absl::string_view filename ) + HorizonsStackOutput( std::string_view filename ) : Output< HorizonsStack< dimension > >{ filename } { } @@ -66,6 +65,6 @@ namespace geode template < index_t dimension > using HorizonsStackOutputFactory = Factory< std::string, HorizonsStackOutput< dimension >, - absl::string_view >; + std::string_view >; ALIAS_2D_AND_3D( HorizonsStackOutputFactory ); } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/implicit_cross_section_input.h b/include/geode/geosciences/implicit/representation/io/implicit_cross_section_input.h index dc74af90..f7a041f3 100644 --- a/include/geode/geosciences/implicit/representation/io/implicit_cross_section_input.h +++ b/include/geode/geosciences/implicit/representation/io/implicit_cross_section_input.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include #include @@ -43,7 +43,7 @@ namespace geode * @param[in] filename Path to the file to load. */ ImplicitCrossSection opengeode_geosciences_implicit_api - load_implicit_cross_section( absl::string_view filename ); + load_implicit_cross_section( std::string_view filename ); class ImplicitCrossSectionInput : public Input< ImplicitCrossSection > { @@ -53,19 +53,18 @@ namespace geode using typename Base::MissingFiles; protected: - explicit ImplicitCrossSectionInput( absl::string_view filename ) + explicit ImplicitCrossSectionInput( std::string_view filename ) : Base{ filename } { } }; ImplicitCrossSectionInput::MissingFiles opengeode_geosciences_implicit_api - check_implicit_cross_section_missing_files( - absl::string_view filename ); + check_implicit_cross_section_missing_files( std::string_view filename ); bool opengeode_geosciences_implicit_api is_implicit_cross_section_loadable( - absl::string_view filename ); + std::string_view filename ); using ImplicitCrossSectionInputFactory = - Factory< std::string, ImplicitCrossSectionInput, absl::string_view >; + Factory< std::string, ImplicitCrossSectionInput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/implicit_cross_section_output.h b/include/geode/geosciences/implicit/representation/io/implicit_cross_section_output.h index 1f10549d..0925c878 100644 --- a/include/geode/geosciences/implicit/representation/io/implicit_cross_section_output.h +++ b/include/geode/geosciences/implicit/representation/io/implicit_cross_section_output.h @@ -24,10 +24,9 @@ #pragma once #include +#include #include -#include - #include #include @@ -49,7 +48,7 @@ namespace geode */ std::vector< std::string > opengeode_geosciences_implicit_api save_implicit_cross_section( const ImplicitCrossSection& implicit_model, - absl::string_view filename ); + std::string_view filename ); class ImplicitCrossSectionOutput : public Output< ImplicitCrossSection > { @@ -57,15 +56,15 @@ namespace geode virtual ~ImplicitCrossSectionOutput() = default; protected: - ImplicitCrossSectionOutput( absl::string_view filename ) + ImplicitCrossSectionOutput( std::string_view filename ) : Output< ImplicitCrossSection >{ filename } { } }; bool opengeode_geosciences_implicit_api is_implicit_cross_section_saveable( - const ImplicitCrossSection& section, absl::string_view filename ); + const ImplicitCrossSection& section, std::string_view filename ); using ImplicitCrossSectionOutputFactory = - Factory< std::string, ImplicitCrossSectionOutput, absl::string_view >; + Factory< std::string, ImplicitCrossSectionOutput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/implicit_structural_model_input.h b/include/geode/geosciences/implicit/representation/io/implicit_structural_model_input.h index 1011f813..e86a977e 100644 --- a/include/geode/geosciences/implicit/representation/io/implicit_structural_model_input.h +++ b/include/geode/geosciences/implicit/representation/io/implicit_structural_model_input.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include #include @@ -43,7 +43,7 @@ namespace geode * @param[in] filename Path to the file to load. */ ImplicitStructuralModel opengeode_geosciences_implicit_api - load_implicit_structural_model( absl::string_view filename ); + load_implicit_structural_model( std::string_view filename ); class ImplicitStructuralModelInput : public Input< ImplicitStructuralModel > { @@ -53,7 +53,7 @@ namespace geode using typename Base::MissingFiles; protected: - explicit ImplicitStructuralModelInput( absl::string_view filename ) + explicit ImplicitStructuralModelInput( std::string_view filename ) : Base{ filename } { } @@ -62,11 +62,11 @@ namespace geode ImplicitStructuralModelInput::MissingFiles opengeode_geosciences_implicit_api check_implicit_structural_model_missing_files( - absl::string_view filename ); + std::string_view filename ); bool opengeode_geosciences_implicit_api - is_implicit_structural_model_loadable( absl::string_view filename ); + is_implicit_structural_model_loadable( std::string_view filename ); using ImplicitStructuralModelInputFactory = - Factory< std::string, ImplicitStructuralModelInput, absl::string_view >; + Factory< std::string, ImplicitStructuralModelInput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/implicit_structural_model_output.h b/include/geode/geosciences/implicit/representation/io/implicit_structural_model_output.h index a4110611..18deea6d 100644 --- a/include/geode/geosciences/implicit/representation/io/implicit_structural_model_output.h +++ b/include/geode/geosciences/implicit/representation/io/implicit_structural_model_output.h @@ -24,10 +24,9 @@ #pragma once #include +#include #include -#include - #include #include @@ -50,7 +49,7 @@ namespace geode std::vector< std::string > opengeode_geosciences_implicit_api save_implicit_structural_model( const ImplicitStructuralModel& implicit_model, - absl::string_view filename ); + std::string_view filename ); class opengeode_geosciences_implicit_api ImplicitStructuralModelOutput : public Output< ImplicitStructuralModel > @@ -59,7 +58,7 @@ namespace geode virtual ~ImplicitStructuralModelOutput() = default; protected: - ImplicitStructuralModelOutput( absl::string_view filename ) + ImplicitStructuralModelOutput( std::string_view filename ) : Output< ImplicitStructuralModel >{ filename } { } @@ -68,9 +67,8 @@ namespace geode bool opengeode_geosciences_implicit_api is_implicit_structural_model_saveable( const ImplicitStructuralModel& implicit_model, - absl::string_view filename ); + std::string_view filename ); - using ImplicitStructuralModelOutputFactory = Factory< std::string, - ImplicitStructuralModelOutput, - absl::string_view >; + using ImplicitStructuralModelOutputFactory = + Factory< std::string, ImplicitStructuralModelOutput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/stratigraphic_model_input.h b/include/geode/geosciences/implicit/representation/io/stratigraphic_model_input.h index 434b5b79..5871c50b 100644 --- a/include/geode/geosciences/implicit/representation/io/stratigraphic_model_input.h +++ b/include/geode/geosciences/implicit/representation/io/stratigraphic_model_input.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include #include @@ -43,7 +43,7 @@ namespace geode * @param[in] filename Path to the file to load. */ StratigraphicModel opengeode_geosciences_implicit_api - load_stratigraphic_model( absl::string_view filename ); + load_stratigraphic_model( std::string_view filename ); class StratigraphicModelInput : public Input< StratigraphicModel > { @@ -53,18 +53,18 @@ namespace geode using typename Base::MissingFiles; protected: - explicit StratigraphicModelInput( absl::string_view filename ) + explicit StratigraphicModelInput( std::string_view filename ) : Base{ filename } { } }; StratigraphicModelInput::MissingFiles opengeode_geosciences_implicit_api - check_stratigraphic_model_missing_files( absl::string_view filename ); + check_stratigraphic_model_missing_files( std::string_view filename ); bool opengeode_geosciences_implicit_api is_stratigraphic_model_loadable( - absl::string_view filename ); + std::string_view filename ); using StratigraphicModelInputFactory = - Factory< std::string, StratigraphicModelInput, absl::string_view >; + Factory< std::string, StratigraphicModelInput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/stratigraphic_model_output.h b/include/geode/geosciences/implicit/representation/io/stratigraphic_model_output.h index e7fb8a7c..a7535226 100644 --- a/include/geode/geosciences/implicit/representation/io/stratigraphic_model_output.h +++ b/include/geode/geosciences/implicit/representation/io/stratigraphic_model_output.h @@ -24,10 +24,9 @@ #pragma once #include +#include #include -#include - #include #include @@ -49,7 +48,7 @@ namespace geode */ std::vector< std::string > opengeode_geosciences_implicit_api save_stratigraphic_model( const StratigraphicModel& stratigraphic_model, - absl::string_view filename ); + std::string_view filename ); class opengeode_geosciences_implicit_api StratigraphicModelOutput : public Output< StratigraphicModel > @@ -58,7 +57,7 @@ namespace geode virtual ~StratigraphicModelOutput() = default; protected: - StratigraphicModelOutput( absl::string_view filename ) + StratigraphicModelOutput( std::string_view filename ) : Output< StratigraphicModel >{ filename } { } @@ -66,8 +65,8 @@ namespace geode bool opengeode_geosciences_implicit_api is_stratigraphic_model_saveable( const StratigraphicModel& stratigraphic_model, - absl::string_view filename ); + std::string_view filename ); using StratigraphicModelOutputFactory = - Factory< std::string, StratigraphicModelOutput, absl::string_view >; + Factory< std::string, StratigraphicModelOutput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/stratigraphic_section_input.h b/include/geode/geosciences/implicit/representation/io/stratigraphic_section_input.h index 15e5324e..5f36a2a0 100644 --- a/include/geode/geosciences/implicit/representation/io/stratigraphic_section_input.h +++ b/include/geode/geosciences/implicit/representation/io/stratigraphic_section_input.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include #include @@ -43,7 +43,7 @@ namespace geode * @param[in] filename Path to the file to load. */ StratigraphicSection opengeode_geosciences_implicit_api - load_stratigraphic_section( absl::string_view filename ); + load_stratigraphic_section( std::string_view filename ); class StratigraphicSectionInput : public Input< StratigraphicSection > { @@ -53,18 +53,18 @@ namespace geode using typename Base::MissingFiles; protected: - explicit StratigraphicSectionInput( absl::string_view filename ) + explicit StratigraphicSectionInput( std::string_view filename ) : Base{ filename } { } }; StratigraphicSectionInput::MissingFiles opengeode_geosciences_implicit_api - check_stratigraphic_section_missing_files( absl::string_view filename ); + check_stratigraphic_section_missing_files( std::string_view filename ); bool opengeode_geosciences_implicit_api is_stratigraphic_section_loadable( - absl::string_view filename ); + std::string_view filename ); using StratigraphicSectionInputFactory = - Factory< std::string, StratigraphicSectionInput, absl::string_view >; + Factory< std::string, StratigraphicSectionInput, std::string_view >; } // namespace geode diff --git a/include/geode/geosciences/implicit/representation/io/stratigraphic_section_output.h b/include/geode/geosciences/implicit/representation/io/stratigraphic_section_output.h index e2e386dd..c7482986 100644 --- a/include/geode/geosciences/implicit/representation/io/stratigraphic_section_output.h +++ b/include/geode/geosciences/implicit/representation/io/stratigraphic_section_output.h @@ -24,10 +24,9 @@ #pragma once #include +#include #include -#include - #include #include @@ -50,7 +49,7 @@ namespace geode std::vector< std::string > opengeode_geosciences_implicit_api save_stratigraphic_section( const StratigraphicSection& stratigraphic_section, - absl::string_view filename ); + std::string_view filename ); class StratigraphicSectionOutput : public Output< StratigraphicSection > { @@ -58,7 +57,7 @@ namespace geode virtual ~StratigraphicSectionOutput() = default; protected: - StratigraphicSectionOutput( absl::string_view filename ) + StratigraphicSectionOutput( std::string_view filename ) : Output< StratigraphicSection >{ filename } { } @@ -66,8 +65,8 @@ namespace geode bool opengeode_geosciences_implicit_api is_stratigraphic_section_saveable( const StratigraphicSection& stratigraphic_section, - absl::string_view filename ); + std::string_view filename ); using StratigraphicSectionOutputFactory = - Factory< std::string, StratigraphicSectionOutput, absl::string_view >; + Factory< std::string, StratigraphicSectionOutput, std::string_view >; } // namespace geode diff --git a/src/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.cpp b/src/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.cpp index 729b7905..386ca0ed 100644 --- a/src/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.cpp +++ b/src/geode/geosciences/explicit/geometry/geographic_coordinate_system_helper.cpp @@ -51,7 +51,7 @@ namespace template < typename Mesh > void convert_coordinate_reference_system( const Mesh& mesh, typename Mesh::Builder& builder, - absl::string_view crs_name, + std::string_view crs_name, typename geode::GeographicCoordinateSystem< Mesh::dim >::Info info ) { using GeoCRS = typename geode::GeographicCoordinateSystem< Mesh::dim >; @@ -86,7 +86,7 @@ namespace void convert_components_coordinate_reference_system( const typename geode::GeographicCoordinateSystem< dimension >::Info& info, - absl::string_view crs_name, + std::string_view crs_name, Range range, GetMeshBuilder get_mesh_builder ) { @@ -103,7 +103,7 @@ namespace void convert_attribute_to_geographic_coordinate_reference_system( const Mesh& mesh, typename Mesh::Builder& builder, - absl::string_view crs_name, + std::string_view crs_name, typename geode::GeographicCoordinateSystem< Mesh::dim >::Info info ) { const auto& crs_manager = @@ -131,7 +131,7 @@ namespace void convert_components_attribute_to_geographic_coordinate_reference_system( const typename geode::GeographicCoordinateSystem< dimension >::Info& info, - absl::string_view crs_name, + std::string_view crs_name, Range range, GetMeshBuilder get_mesh_builder ) { @@ -151,7 +151,7 @@ namespace geode void assign_edged_curve_geographic_coordinate_system_info( const EdgedCurve< dimension >& mesh, EdgedCurveBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_attribute_to_geographic_coordinate_reference_system( @@ -162,7 +162,7 @@ namespace geode void assign_point_set_geographic_coordinate_system_info( const PointSet< dimension >& mesh, PointSetBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_attribute_to_geographic_coordinate_reference_system( @@ -173,7 +173,7 @@ namespace geode void assign_solid_mesh_geographic_coordinate_system_info( const SolidMesh< dimension >& mesh, SolidMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_attribute_to_geographic_coordinate_reference_system( @@ -184,7 +184,7 @@ namespace geode void assign_surface_mesh_geographic_coordinate_system_info( const SurfaceMesh< dimension >& mesh, SurfaceMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_attribute_to_geographic_coordinate_reference_system( @@ -193,7 +193,7 @@ namespace geode void assign_brep_geographic_coordinate_system_info( const BRep& brep, BRepBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem3D::Info& info ) { convert_components_attribute_to_geographic_coordinate_reference_system< @@ -217,7 +217,7 @@ namespace geode void assign_section_geographic_coordinate_system_info( const Section& section, SectionBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem2D::Info& info ) { convert_components_attribute_to_geographic_coordinate_reference_system< @@ -240,7 +240,7 @@ namespace geode void convert_edged_curve_coordinate_reference_system( const EdgedCurve< dimension >& mesh, EdgedCurveBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_coordinate_reference_system( @@ -251,7 +251,7 @@ namespace geode void convert_point_set_coordinate_reference_system( const PointSet< dimension >& mesh, PointSetBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_coordinate_reference_system( @@ -262,7 +262,7 @@ namespace geode void convert_solid_mesh_coordinate_reference_system( const SolidMesh< dimension >& mesh, SolidMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_coordinate_reference_system( @@ -273,7 +273,7 @@ namespace geode void convert_surface_mesh_coordinate_reference_system( const SurfaceMesh< dimension >& mesh, SurfaceMeshBuilder< dimension >& builder, - absl::string_view crs_name, + std::string_view crs_name, typename GeographicCoordinateSystem< dimension >::Info info ) { convert_coordinate_reference_system( @@ -282,7 +282,7 @@ namespace geode void convert_brep_coordinate_reference_system( const BRep& brep, BRepBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem3D::Info& info ) { convert_components_coordinate_reference_system< 3 >( @@ -305,7 +305,7 @@ namespace geode void convert_section_coordinate_reference_system( const Section& section, SectionBuilder& builder, - absl::string_view crs_name, + std::string_view crs_name, const GeographicCoordinateSystem2D::Info& info ) { convert_components_coordinate_reference_system< 2 >( @@ -326,80 +326,80 @@ namespace geode assign_edged_curve_geographic_coordinate_system_info( const EdgedCurve< 2 >&, EdgedCurveBuilder< 2 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 2 >::Info ); template void opengeode_geosciences_explicit_api assign_point_set_geographic_coordinate_system_info( const PointSet< 2 >&, PointSetBuilder< 2 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 2 >::Info ); template void opengeode_geosciences_explicit_api assign_surface_mesh_geographic_coordinate_system_info( const SurfaceMesh< 2 >&, SurfaceMeshBuilder< 2 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 2 >::Info ); template void opengeode_geosciences_explicit_api convert_edged_curve_coordinate_reference_system( const EdgedCurve< 2 >&, EdgedCurveBuilder< 2 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 2 >::Info ); template void opengeode_geosciences_explicit_api convert_point_set_coordinate_reference_system( const PointSet< 2 >&, PointSetBuilder< 2 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 2 >::Info ); template void opengeode_geosciences_explicit_api convert_surface_mesh_coordinate_reference_system( const SurfaceMesh< 2 >&, SurfaceMeshBuilder< 2 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 2 >::Info ); template void opengeode_geosciences_explicit_api assign_edged_curve_geographic_coordinate_system_info( const EdgedCurve< 3 >&, EdgedCurveBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); template void opengeode_geosciences_explicit_api assign_point_set_geographic_coordinate_system_info( const PointSet< 3 >&, PointSetBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); template void opengeode_geosciences_explicit_api assign_solid_mesh_geographic_coordinate_system_info( const SolidMesh< 3 >&, SolidMeshBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); template void opengeode_geosciences_explicit_api assign_surface_mesh_geographic_coordinate_system_info( const SurfaceMesh< 3 >&, SurfaceMeshBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); template void opengeode_geosciences_explicit_api convert_edged_curve_coordinate_reference_system( const EdgedCurve< 3 >&, EdgedCurveBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); template void opengeode_geosciences_explicit_api convert_point_set_coordinate_reference_system( const PointSet< 3 >&, PointSetBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); template void opengeode_geosciences_explicit_api convert_solid_mesh_coordinate_reference_system( const SolidMesh< 3 >&, SolidMeshBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); template void opengeode_geosciences_explicit_api convert_surface_mesh_coordinate_reference_system( const SurfaceMesh< 3 >&, SurfaceMeshBuilder< 3 >&, - absl::string_view, + std::string_view, typename GeographicCoordinateSystem< 3 >::Info ); } // namespace geode \ No newline at end of file diff --git a/src/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.cpp b/src/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.cpp index e47c95e8..19439d22 100644 --- a/src/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.cpp +++ b/src/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.cpp @@ -50,14 +50,14 @@ namespace geode template < index_t dimension > void FaultBlocksBuilder< dimension >::load_fault_blocks( - absl::string_view directory ) + std::string_view directory ) { return fault_blocks_.load_fault_blocks( directory ); } template < index_t dimension > void FaultBlocksBuilder< dimension >::set_fault_block_name( - const uuid& id, absl::string_view name ) + const uuid& id, std::string_view name ) { fault_blocks_.modifiable_fault_block( id ).set_fault_block_name( name, typename FaultBlock< dimension >::FaultBlocksBuilderKey{} ); diff --git a/src/geode/geosciences/explicit/mixin/builder/faults_builder.cpp b/src/geode/geosciences/explicit/mixin/builder/faults_builder.cpp index 2c2aecc7..fcaa88a7 100644 --- a/src/geode/geosciences/explicit/mixin/builder/faults_builder.cpp +++ b/src/geode/geosciences/explicit/mixin/builder/faults_builder.cpp @@ -62,7 +62,7 @@ namespace geode } template < index_t dimension > - void FaultsBuilder< dimension >::load_faults( absl::string_view directory ) + void FaultsBuilder< dimension >::load_faults( std::string_view directory ) { return faults_.load_faults( directory ); } @@ -77,7 +77,7 @@ namespace geode template < index_t dimension > void FaultsBuilder< dimension >::set_fault_name( - const uuid& id, absl::string_view name ) + const uuid& id, std::string_view name ) { faults_.modifiable_fault( id ).set_fault_name( name, typename Fault< dimension >::FaultsBuilderKey{} ); diff --git a/src/geode/geosciences/explicit/mixin/builder/horizons_builder.cpp b/src/geode/geosciences/explicit/mixin/builder/horizons_builder.cpp index ef7d1743..074b1bbc 100644 --- a/src/geode/geosciences/explicit/mixin/builder/horizons_builder.cpp +++ b/src/geode/geosciences/explicit/mixin/builder/horizons_builder.cpp @@ -63,7 +63,7 @@ namespace geode template < index_t dimension > void HorizonsBuilder< dimension >::load_horizons( - absl::string_view directory ) + std::string_view directory ) { return horizons_.load_horizons( directory ); } @@ -79,7 +79,7 @@ namespace geode template < index_t dimension > void HorizonsBuilder< dimension >::set_horizon_name( - const uuid& id, absl::string_view name ) + const uuid& id, std::string_view name ) { horizons_.modifiable_horizon( id ).set_horizon_name( name, typename Horizon< dimension >::HorizonsBuilderKey{} ); diff --git a/src/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.cpp b/src/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.cpp index f2916429..5b6ed6fd 100644 --- a/src/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.cpp +++ b/src/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.cpp @@ -51,14 +51,14 @@ namespace geode template < index_t dimension > void StratigraphicUnitsBuilder< dimension >::load_stratigraphic_units( - absl::string_view directory ) + std::string_view directory ) { return stratigraphic_units_.load_stratigraphic_units( directory ); } template < index_t dimension > void StratigraphicUnitsBuilder< dimension >::set_stratigraphic_unit_name( - const uuid& id, absl::string_view name ) + const uuid& id, std::string_view name ) { stratigraphic_units_.modifiable_stratigraphic_unit( id ) .set_stratigraphic_unit_name( diff --git a/src/geode/geosciences/explicit/mixin/core/fault_blocks.cpp b/src/geode/geosciences/explicit/mixin/core/fault_blocks.cpp index 8e2e35be..78b51830 100644 --- a/src/geode/geosciences/explicit/mixin/core/fault_blocks.cpp +++ b/src/geode/geosciences/explicit/mixin/core/fault_blocks.cpp @@ -80,14 +80,14 @@ namespace geode template < index_t dimension > void FaultBlocks< dimension >::save_fault_blocks( - absl::string_view directory ) const + std::string_view directory ) const { impl_->save_components( absl::StrCat( directory, "/fault_blocks" ) ); } template < index_t dimension > void FaultBlocks< dimension >::load_fault_blocks( - absl::string_view directory ) + std::string_view directory ) { impl_->load_components( absl::StrCat( directory, "/fault_blocks" ) ); } diff --git a/src/geode/geosciences/explicit/mixin/core/faults.cpp b/src/geode/geosciences/explicit/mixin/core/faults.cpp index c581b894..e6deb45a 100644 --- a/src/geode/geosciences/explicit/mixin/core/faults.cpp +++ b/src/geode/geosciences/explicit/mixin/core/faults.cpp @@ -77,13 +77,13 @@ namespace geode } template < index_t dimension > - void Faults< dimension >::save_faults( absl::string_view directory ) const + void Faults< dimension >::save_faults( std::string_view directory ) const { impl_->save_components( absl::StrCat( directory, "/faults" ) ); } template < index_t dimension > - void Faults< dimension >::load_faults( absl::string_view directory ) + void Faults< dimension >::load_faults( std::string_view directory ) { impl_->load_components( absl::StrCat( directory, "/faults" ) ); } diff --git a/src/geode/geosciences/explicit/mixin/core/horizons.cpp b/src/geode/geosciences/explicit/mixin/core/horizons.cpp index 487210b6..d19143d5 100644 --- a/src/geode/geosciences/explicit/mixin/core/horizons.cpp +++ b/src/geode/geosciences/explicit/mixin/core/horizons.cpp @@ -80,13 +80,13 @@ namespace geode template < index_t dimension > void Horizons< dimension >::save_horizons( - absl::string_view directory ) const + std::string_view directory ) const { impl_->save_components( absl::StrCat( directory, "/horizons" ) ); } template < index_t dimension > - void Horizons< dimension >::load_horizons( absl::string_view directory ) + void Horizons< dimension >::load_horizons( std::string_view directory ) { impl_->load_components( absl::StrCat( directory, "/horizons" ) ); } diff --git a/src/geode/geosciences/explicit/mixin/core/stratigraphic_units.cpp b/src/geode/geosciences/explicit/mixin/core/stratigraphic_units.cpp index ca5d0d54..c12b55cf 100644 --- a/src/geode/geosciences/explicit/mixin/core/stratigraphic_units.cpp +++ b/src/geode/geosciences/explicit/mixin/core/stratigraphic_units.cpp @@ -84,7 +84,7 @@ namespace geode template < index_t dimension > void StratigraphicUnits< dimension >::save_stratigraphic_units( - absl::string_view directory ) const + std::string_view directory ) const { impl_->save_components( absl::StrCat( directory, "/stratigraphic_units" ) ); @@ -92,7 +92,7 @@ namespace geode template < index_t dimension > void StratigraphicUnits< dimension >::load_stratigraphic_units( - absl::string_view directory ) + std::string_view directory ) { impl_->load_components( absl::StrCat( directory, "/stratigraphic_units" ) ); diff --git a/src/geode/geosciences/explicit/representation/io/cross_section_input.cpp b/src/geode/geosciences/explicit/representation/io/cross_section_input.cpp index e74d924b..e5e31d1f 100644 --- a/src/geode/geosciences/explicit/representation/io/cross_section_input.cpp +++ b/src/geode/geosciences/explicit/representation/io/cross_section_input.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -37,7 +37,7 @@ namespace geode { - CrossSection load_cross_section( absl::string_view filename ) + CrossSection load_cross_section( std::string_view filename ) { constexpr auto TYPE = "CrossSection"; try @@ -77,7 +77,7 @@ namespace geode } typename CrossSectionInput::MissingFiles check_cross_section_missing_files( - absl::string_view filename ) + std::string_view filename ) { const auto input = detail::geode_object_input_reader< CrossSectionInputFactory >( @@ -85,7 +85,7 @@ namespace geode return input->check_missing_files(); } - bool is_cross_section_loadable( absl::string_view filename ) + bool is_cross_section_loadable( std::string_view filename ) { const auto input = detail::geode_object_input_reader< CrossSectionInputFactory >( diff --git a/src/geode/geosciences/explicit/representation/io/cross_section_output.cpp b/src/geode/geosciences/explicit/representation/io/cross_section_output.cpp index 2cbe2f9b..f1f9d22f 100644 --- a/src/geode/geosciences/explicit/representation/io/cross_section_output.cpp +++ b/src/geode/geosciences/explicit/representation/io/cross_section_output.cpp @@ -24,10 +24,9 @@ #include #include +#include #include -#include - #include #include #include @@ -39,7 +38,7 @@ namespace geode { std::vector< std::string > save_cross_section( - const CrossSection& cross_section, absl::string_view filename ) + const CrossSection& cross_section, std::string_view filename ) { constexpr auto TYPE = "CrossSection"; try @@ -59,7 +58,7 @@ namespace geode } bool is_cross_section_saveable( - const CrossSection& cross_section, absl::string_view filename ) + const CrossSection& cross_section, std::string_view filename ) { const auto output = detail::geode_object_output_writer< CrossSectionOutputFactory >( diff --git a/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.cpp b/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.cpp index 35e4d9c2..bb42a6f9 100644 --- a/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.cpp +++ b/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.cpp @@ -45,13 +45,13 @@ namespace geode { OpenGeodeCrossSectionInput::OpenGeodeCrossSectionInput( - absl::string_view filename ) + std::string_view filename ) : CrossSectionInput{ filename } { } void OpenGeodeCrossSectionInput::load_cross_section_files( - CrossSection& cross_section, absl::string_view directory ) + CrossSection& cross_section, std::string_view directory ) { CrossSectionBuilder builder{ cross_section }; async::parallel_invoke( diff --git a/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.cpp b/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.cpp index 986302c8..bc14e26b 100644 --- a/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.cpp +++ b/src/geode/geosciences/explicit/representation/io/geode/geode_cross_section_output.cpp @@ -38,13 +38,13 @@ namespace geode { OpenGeodeCrossSectionOutput::OpenGeodeCrossSectionOutput( - absl::string_view filename ) + std::string_view filename ) : CrossSectionOutput( filename ) { } void OpenGeodeCrossSectionOutput::save_cross_section_files( - const CrossSection& cross_section, absl::string_view directory ) const + const CrossSection& cross_section, std::string_view directory ) const { async::parallel_invoke( [&directory, &cross_section] { diff --git a/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.cpp b/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.cpp index 2786b2ca..c4750b33 100644 --- a/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.cpp +++ b/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.cpp @@ -47,13 +47,13 @@ namespace geode { OpenGeodeStructuralModelInput::OpenGeodeStructuralModelInput( - absl::string_view filename ) + std::string_view filename ) : StructuralModelInput{ filename } { } void OpenGeodeStructuralModelInput::load_structural_model_files( - StructuralModel& structural_model, absl::string_view directory ) + StructuralModel& structural_model, std::string_view directory ) { StructuralModelBuilder builder{ structural_model }; async::parallel_invoke( diff --git a/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.cpp b/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.cpp index 4ab17e1c..5a66a2eb 100644 --- a/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.cpp +++ b/src/geode/geosciences/explicit/representation/io/geode/geode_structural_model_output.cpp @@ -38,14 +38,14 @@ namespace geode { OpenGeodeStructuralModelOutput::OpenGeodeStructuralModelOutput( - absl::string_view filename ) + std::string_view filename ) : StructuralModelOutput( filename ) { } void OpenGeodeStructuralModelOutput::save_structural_model_files( const StructuralModel& structural_model, - absl::string_view directory ) const + std::string_view directory ) const { async::parallel_invoke( [&directory, &structural_model] { diff --git a/src/geode/geosciences/explicit/representation/io/structural_model_input.cpp b/src/geode/geosciences/explicit/representation/io/structural_model_input.cpp index 65931f80..ad39e04c 100644 --- a/src/geode/geosciences/explicit/representation/io/structural_model_input.cpp +++ b/src/geode/geosciences/explicit/representation/io/structural_model_input.cpp @@ -23,8 +23,9 @@ #include +#include + #include -#include #include #include @@ -36,7 +37,7 @@ namespace geode { - StructuralModel load_structural_model( absl::string_view filename ) + StructuralModel load_structural_model( std::string_view filename ) { constexpr auto TYPE = "StructuralModel"; try @@ -79,7 +80,7 @@ namespace geode } typename StructuralModelInput::MissingFiles - check_structural_model_missing_files( absl::string_view filename ) + check_structural_model_missing_files( std::string_view filename ) { const auto input = detail::geode_object_input_reader< StructuralModelInputFactory >( @@ -87,7 +88,7 @@ namespace geode return input->check_missing_files(); } - bool is_structural_model_loadable( absl::string_view filename ) + bool is_structural_model_loadable( std::string_view filename ) { const auto input = detail::geode_object_input_reader< StructuralModelInputFactory >( diff --git a/src/geode/geosciences/explicit/representation/io/structural_model_output.cpp b/src/geode/geosciences/explicit/representation/io/structural_model_output.cpp index 69abf82f..3a6b141e 100644 --- a/src/geode/geosciences/explicit/representation/io/structural_model_output.cpp +++ b/src/geode/geosciences/explicit/representation/io/structural_model_output.cpp @@ -24,10 +24,9 @@ #include #include +#include #include -#include - #include #include #include @@ -39,7 +38,7 @@ namespace geode { std::vector< std::string > save_structural_model( - const StructuralModel& structural_model, absl::string_view filename ) + const StructuralModel& structural_model, std::string_view filename ) { constexpr auto TYPE = "StructuralModel"; try @@ -60,7 +59,7 @@ namespace geode } bool is_structural_model_saveable( - const StructuralModel& structural_model, absl::string_view filename ) + const StructuralModel& structural_model, std::string_view filename ) { const auto output = detail::geode_object_output_writer< StructuralModelOutputFactory >( diff --git a/src/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.cpp b/src/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.cpp index 37aabcdc..4e5cbdba 100644 --- a/src/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.cpp +++ b/src/geode/geosciences/implicit/mixin/builder/stratigraphic_relationships_builder.cpp @@ -82,7 +82,7 @@ namespace geode } void StratigraphicRelationshipsBuilder::load_stratigraphic_relationships( - absl::string_view directory ) + std::string_view directory ) { relationships_.load_stratigraphic_relationships( directory, {} ); } diff --git a/src/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.cpp b/src/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.cpp index 4c6ae81b..9b4b5010 100644 --- a/src/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.cpp +++ b/src/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.cpp @@ -245,7 +245,7 @@ namespace geode initialize_relation_attributes(); } - void save( absl::string_view directory ) const + void save( std::string_view directory ) const { const auto filename = absl::StrCat( directory, "/stratigraphic_relationships" ); @@ -260,7 +260,7 @@ namespace geode "[Relationships::save] Error while writing file: ", filename ); } - void load( absl::string_view directory ) + void load( std::string_view directory ) { const auto filename = absl::StrCat( directory, "/stratigraphic_relationships" ); @@ -431,7 +431,7 @@ namespace geode } void StratigraphicRelationships::save_stratigraphic_relationships( - absl::string_view directory ) const + std::string_view directory ) const { impl_->save( directory ); } @@ -445,7 +445,7 @@ namespace geode } void StratigraphicRelationships::load_stratigraphic_relationships( - absl::string_view directory, StratigraphicRelationshipsBuilderKey ) + std::string_view directory, StratigraphicRelationshipsBuilderKey ) { return impl_->load( directory ); } diff --git a/src/geode/geosciences/implicit/representation/core/detail/helpers.cpp b/src/geode/geosciences/implicit/representation/core/detail/helpers.cpp index 44fc5fda..e7bd1e14 100644 --- a/src/geode/geosciences/implicit/representation/core/detail/helpers.cpp +++ b/src/geode/geosciences/implicit/representation/core/detail/helpers.cpp @@ -132,7 +132,7 @@ namespace geode void save_stratigraphic_surfaces( const StratigraphicSection& implicit_model, - absl::string_view prefix ) + std::string_view prefix ) { index_t counter{ 0 }; for( const auto& surface : implicit_model.surfaces() ) @@ -163,7 +163,7 @@ namespace geode void save_stratigraphic_blocks( const geode::StratigraphicModel& implicit_model, - absl::string_view prefix ) + std::string_view prefix ) { index_t counter{ 0 }; for( const auto& block : implicit_model.blocks() ) @@ -193,7 +193,7 @@ namespace geode } ImplicitCrossSection implicit_section_from_cross_section_scalar_field( - CrossSection&& section, absl::string_view scalar_attribute_name ) + CrossSection&& section, std::string_view scalar_attribute_name ) { for( const auto& surface : section.surfaces() ) { @@ -222,7 +222,7 @@ namespace geode ImplicitStructuralModel implicit_model_from_structural_model_scalar_field( StructuralModel&& model, - absl::string_view scalar_attribute_name ) + std::string_view scalar_attribute_name ) { for( const auto& block : model.blocks() ) { diff --git a/src/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.cpp b/src/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.cpp index a2f24258..e6f637d4 100644 --- a/src/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/geode/geode_horizons_stack_input.cpp @@ -35,8 +35,7 @@ namespace geode { template < index_t dimension > void OpenGeodeHorizonsStackInput< dimension >::load_horizons_stack_files( - HorizonsStack< dimension >& horizons_stack, - absl::string_view directory ) + HorizonsStack< dimension >& horizons_stack, std::string_view directory ) { HorizonsStackBuilder< dimension > builder{ horizons_stack }; async::parallel_invoke( diff --git a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.cpp b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.cpp index 0d437883..e562487e 100644 --- a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_input.cpp @@ -41,7 +41,7 @@ namespace geode { void OpenGeodeImplicitCrossSectionInput::load_implicit_cross_section_files( - ImplicitCrossSection& section, absl::string_view directory ) + ImplicitCrossSection& section, std::string_view directory ) { ImplicitCrossSectionBuilder builder{ section }; builder.set_horizons_stack( load_horizons_stack< 2 >( diff --git a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.cpp b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.cpp index de92b51d..d1ad54b0 100644 --- a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.cpp +++ b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_cross_section_output.cpp @@ -53,7 +53,7 @@ namespace geode void OpenGeodeImplicitCrossSectionOutput::save_implicit_section_files( const ImplicitCrossSection& implicit_section, - absl::string_view directory ) const + std::string_view directory ) const { async::parallel_invoke( [&directory, &implicit_section] { diff --git a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.cpp b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.cpp index 4d8704f8..7b1764fe 100644 --- a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_input.cpp @@ -42,7 +42,7 @@ namespace geode { void OpenGeodeImplicitStructuralModelInput:: load_implicit_structural_model_files( - ImplicitStructuralModel& model, absl::string_view directory ) + ImplicitStructuralModel& model, std::string_view directory ) { ImplicitStructuralModelBuilder builder{ model }; builder.set_horizons_stack( std::move( load_horizons_stack< 3 >( diff --git a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.cpp b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.cpp index 37940385..1cddecec 100644 --- a/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.cpp +++ b/src/geode/geosciences/implicit/representation/io/geode/geode_implicit_structural_model_output.cpp @@ -53,7 +53,7 @@ namespace geode void OpenGeodeImplicitStructuralModelOutput::save_implicit_model_files( const ImplicitStructuralModel& implicit_model, - absl::string_view directory ) const + std::string_view directory ) const { async::parallel_invoke( [&directory, &implicit_model] { diff --git a/src/geode/geosciences/implicit/representation/io/horizons_stack_input.cpp b/src/geode/geosciences/implicit/representation/io/horizons_stack_input.cpp index 90b988a9..c92a735b 100644 --- a/src/geode/geosciences/implicit/representation/io/horizons_stack_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/horizons_stack_input.cpp @@ -23,8 +23,9 @@ #include +#include + #include -#include #include #include @@ -36,7 +37,7 @@ namespace geode { template < index_t dimension > - HorizonsStack< dimension > load_horizons_stack( absl::string_view filename ) + HorizonsStack< dimension > load_horizons_stack( std::string_view filename ) { constexpr auto TYPE = "HorizonsStack"; try @@ -64,7 +65,7 @@ namespace geode template < index_t dimension > typename HorizonsStackInput< dimension >::MissingFiles - check_horizons_stack_missing_files( absl::string_view filename ) + check_horizons_stack_missing_files( std::string_view filename ) { const auto input = detail::geode_object_input_reader< HorizonsStackInputFactory< dimension > >( filename ); @@ -72,7 +73,7 @@ namespace geode } template < index_t dimension > - bool is_horizons_stack_loadable( absl::string_view filename ) + bool is_horizons_stack_loadable( std::string_view filename ) { const auto input = detail::geode_object_input_reader< HorizonsStackInputFactory< dimension > >( filename ); @@ -80,19 +81,19 @@ namespace geode } template HorizonsStack< 2 > opengeode_geosciences_implicit_api - load_horizons_stack( absl::string_view ); + load_horizons_stack( std::string_view ); template HorizonsStack< 3 > opengeode_geosciences_implicit_api - load_horizons_stack( absl::string_view ); + load_horizons_stack( std::string_view ); template HorizonsStackInput< 2 >::MissingFiles opengeode_geosciences_implicit_api - check_horizons_stack_missing_files< 2 >( absl::string_view ); + check_horizons_stack_missing_files< 2 >( std::string_view ); template HorizonsStackInput< 3 >::MissingFiles opengeode_geosciences_implicit_api - check_horizons_stack_missing_files< 3 >( absl::string_view ); + check_horizons_stack_missing_files< 3 >( std::string_view ); template bool opengeode_geosciences_implicit_api - is_horizons_stack_loadable< 2 >( absl::string_view ); + is_horizons_stack_loadable< 2 >( std::string_view ); template bool opengeode_geosciences_implicit_api - is_horizons_stack_loadable< 3 >( absl::string_view ); + is_horizons_stack_loadable< 3 >( std::string_view ); } // namespace geode diff --git a/src/geode/geosciences/implicit/representation/io/horizons_stack_output.cpp b/src/geode/geosciences/implicit/representation/io/horizons_stack_output.cpp index 017fc723..c9103491 100644 --- a/src/geode/geosciences/implicit/representation/io/horizons_stack_output.cpp +++ b/src/geode/geosciences/implicit/representation/io/horizons_stack_output.cpp @@ -24,10 +24,9 @@ #include #include +#include #include -#include - #include #include #include @@ -39,7 +38,7 @@ namespace geode template < index_t dimension > std::vector< std::string > save_horizons_stack( const HorizonsStack< dimension >& horizons_stack, - absl::string_view filename ) + std::string_view filename ) { constexpr auto TYPE = "HorizonsStack"; try @@ -61,7 +60,7 @@ namespace geode template < index_t dimension > bool is_horizons_stack_saveable( const HorizonsStack< dimension >& horizons_stack, - absl::string_view filename ) + std::string_view filename ) { const auto output = detail::geode_object_output_writer< HorizonsStackOutputFactory< dimension > >( filename ); @@ -69,12 +68,12 @@ namespace geode } template std::vector< std::string > opengeode_geosciences_implicit_api - save_horizons_stack( const HorizonsStack< 2 >&, absl::string_view ); + save_horizons_stack( const HorizonsStack< 2 >&, std::string_view ); template std::vector< std::string > opengeode_geosciences_implicit_api - save_horizons_stack( const HorizonsStack< 3 >&, absl::string_view ); + save_horizons_stack( const HorizonsStack< 3 >&, std::string_view ); template bool opengeode_geosciences_implicit_api is_horizons_stack_saveable( - const HorizonsStack< 2 >&, absl::string_view ); + const HorizonsStack< 2 >&, std::string_view ); template bool opengeode_geosciences_implicit_api is_horizons_stack_saveable( - const HorizonsStack< 3 >&, absl::string_view ); + const HorizonsStack< 3 >&, std::string_view ); } // namespace geode diff --git a/src/geode/geosciences/implicit/representation/io/implicit_cross_section_input.cpp b/src/geode/geosciences/implicit/representation/io/implicit_cross_section_input.cpp index 47ddc9db..c64cb443 100644 --- a/src/geode/geosciences/implicit/representation/io/implicit_cross_section_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/implicit_cross_section_input.cpp @@ -23,8 +23,9 @@ #include +#include + #include -#include #include #include @@ -38,7 +39,7 @@ namespace geode { ImplicitCrossSection load_implicit_cross_section( - absl::string_view filename ) + std::string_view filename ) { constexpr auto TYPE = "ImplicitCrossSection"; try @@ -82,14 +83,14 @@ namespace geode } typename ImplicitCrossSectionInput::MissingFiles - check_implicit_cross_section_missing_files( absl::string_view filename ) + check_implicit_cross_section_missing_files( std::string_view filename ) { const auto input = detail::geode_object_input_reader< ImplicitCrossSectionInputFactory >( filename ); return input->check_missing_files(); } - bool is_implicit_cross_section_loadable( absl::string_view filename ) + bool is_implicit_cross_section_loadable( std::string_view filename ) { const auto input = detail::geode_object_input_reader< ImplicitCrossSectionInputFactory >( filename ); diff --git a/src/geode/geosciences/implicit/representation/io/implicit_cross_section_output.cpp b/src/geode/geosciences/implicit/representation/io/implicit_cross_section_output.cpp index 311e1ddb..fdb230e2 100644 --- a/src/geode/geosciences/implicit/representation/io/implicit_cross_section_output.cpp +++ b/src/geode/geosciences/implicit/representation/io/implicit_cross_section_output.cpp @@ -24,10 +24,9 @@ #include #include +#include #include -#include - #include #include #include @@ -40,7 +39,7 @@ namespace geode { std::vector< std::string > save_implicit_cross_section( - const ImplicitCrossSection& section, absl::string_view filename ) + const ImplicitCrossSection& section, std::string_view filename ) { constexpr auto TYPE = "ImplicitCrossSection"; try @@ -64,7 +63,7 @@ namespace geode } bool is_implicit_cross_section_saveable( - const ImplicitCrossSection& section, absl::string_view filename ) + const ImplicitCrossSection& section, std::string_view filename ) { const auto output = detail::geode_object_output_writer< ImplicitCrossSectionOutputFactory >( filename ); diff --git a/src/geode/geosciences/implicit/representation/io/implicit_structural_model_input.cpp b/src/geode/geosciences/implicit/representation/io/implicit_structural_model_input.cpp index ba823caf..8509b90f 100644 --- a/src/geode/geosciences/implicit/representation/io/implicit_structural_model_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/implicit_structural_model_input.cpp @@ -23,8 +23,9 @@ #include +#include + #include -#include #include #include @@ -38,7 +39,7 @@ namespace geode { ImplicitStructuralModel load_implicit_structural_model( - absl::string_view filename ) + std::string_view filename ) { constexpr auto TYPE = "ImplicitStructuralModel"; try @@ -85,14 +86,14 @@ namespace geode typename ImplicitStructuralModelInput::MissingFiles check_implicit_structural_model_missing_files( - absl::string_view filename ) + std::string_view filename ) { const auto input = detail::geode_object_input_reader< ImplicitStructuralModelInputFactory >( filename ); return input->check_missing_files(); } - bool is_implicit_structural_model_loadable( absl::string_view filename ) + bool is_implicit_structural_model_loadable( std::string_view filename ) { const auto input = detail::geode_object_input_reader< ImplicitStructuralModelInputFactory >( filename ); diff --git a/src/geode/geosciences/implicit/representation/io/implicit_structural_model_output.cpp b/src/geode/geosciences/implicit/representation/io/implicit_structural_model_output.cpp index 051a80d8..99ebe291 100644 --- a/src/geode/geosciences/implicit/representation/io/implicit_structural_model_output.cpp +++ b/src/geode/geosciences/implicit/representation/io/implicit_structural_model_output.cpp @@ -24,10 +24,9 @@ #include #include +#include #include -#include - #include #include #include @@ -41,7 +40,7 @@ namespace geode { std::vector< std::string > save_implicit_structural_model( const ImplicitStructuralModel& implicit_model, - absl::string_view filename ) + std::string_view filename ) { constexpr auto TYPE = "ImplicitStructuralModel"; try @@ -67,7 +66,7 @@ namespace geode bool is_implicit_structural_model_saveable( const ImplicitStructuralModel& implicit_model, - absl::string_view filename ) + std::string_view filename ) { const auto output = detail::geode_object_output_writer< ImplicitStructuralModelOutputFactory >( filename ); diff --git a/src/geode/geosciences/implicit/representation/io/stratigraphic_model_input.cpp b/src/geode/geosciences/implicit/representation/io/stratigraphic_model_input.cpp index 70f1577b..1abc3274 100644 --- a/src/geode/geosciences/implicit/representation/io/stratigraphic_model_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/stratigraphic_model_input.cpp @@ -23,8 +23,9 @@ #include +#include + #include -#include #include #include @@ -38,7 +39,7 @@ namespace geode { - StratigraphicModel load_stratigraphic_model( absl::string_view filename ) + StratigraphicModel load_stratigraphic_model( std::string_view filename ) { constexpr auto TYPE = "StratigraphicModel"; try @@ -87,7 +88,7 @@ namespace geode } typename StratigraphicModelInput::MissingFiles - check_stratigraphic_model_missing_files( absl::string_view filename ) + check_stratigraphic_model_missing_files( std::string_view filename ) { const auto input = detail::geode_object_input_reader< StratigraphicModelInputFactory >( @@ -95,7 +96,7 @@ namespace geode return input->check_missing_files(); } - bool is_stratigraphic_model_loadable( absl::string_view filename ) + bool is_stratigraphic_model_loadable( std::string_view filename ) { const auto input = detail::geode_object_input_reader< StratigraphicModelInputFactory >( diff --git a/src/geode/geosciences/implicit/representation/io/stratigraphic_model_output.cpp b/src/geode/geosciences/implicit/representation/io/stratigraphic_model_output.cpp index 7ddbfc7f..6dd774a9 100644 --- a/src/geode/geosciences/implicit/representation/io/stratigraphic_model_output.cpp +++ b/src/geode/geosciences/implicit/representation/io/stratigraphic_model_output.cpp @@ -24,10 +24,9 @@ #include #include +#include #include -#include - #include #include #include @@ -42,7 +41,7 @@ namespace geode { std::vector< std::string > save_stratigraphic_model( const StratigraphicModel& stratigraphic_model, - absl::string_view filename ) + std::string_view filename ) { constexpr auto TYPE = "StratigraphicModel"; try @@ -70,7 +69,7 @@ namespace geode bool is_stratigraphic_model_saveable( const StratigraphicModel& stratigraphic_model, - absl::string_view filename ) + std::string_view filename ) { const auto output = detail::geode_object_output_writer< StratigraphicModelOutputFactory >( filename ); diff --git a/src/geode/geosciences/implicit/representation/io/stratigraphic_section_input.cpp b/src/geode/geosciences/implicit/representation/io/stratigraphic_section_input.cpp index c34a251c..3160c6a3 100644 --- a/src/geode/geosciences/implicit/representation/io/stratigraphic_section_input.cpp +++ b/src/geode/geosciences/implicit/representation/io/stratigraphic_section_input.cpp @@ -23,8 +23,9 @@ #include +#include + #include -#include #include #include @@ -38,8 +39,7 @@ namespace geode { - StratigraphicSection load_stratigraphic_section( - absl::string_view filename ) + StratigraphicSection load_stratigraphic_section( std::string_view filename ) { constexpr auto TYPE = "StratigraphicSection"; try @@ -86,14 +86,14 @@ namespace geode } StratigraphicSectionInput::MissingFiles - check_stratigraphic_section_missing_files( absl::string_view filename ) + check_stratigraphic_section_missing_files( std::string_view filename ) { const auto input = detail::geode_object_input_reader< StratigraphicSectionInputFactory >( filename ); return input->check_missing_files(); } - bool is_stratigraphic_section_loadable( absl::string_view filename ) + bool is_stratigraphic_section_loadable( std::string_view filename ) { const auto input = detail::geode_object_input_reader< StratigraphicSectionInputFactory >( filename ); diff --git a/src/geode/geosciences/implicit/representation/io/stratigraphic_section_output.cpp b/src/geode/geosciences/implicit/representation/io/stratigraphic_section_output.cpp index 1163a9be..0f001783 100644 --- a/src/geode/geosciences/implicit/representation/io/stratigraphic_section_output.cpp +++ b/src/geode/geosciences/implicit/representation/io/stratigraphic_section_output.cpp @@ -24,10 +24,9 @@ #include #include +#include #include -#include - #include #include #include @@ -42,7 +41,7 @@ namespace geode { std::vector< std::string > save_stratigraphic_section( const StratigraphicSection& stratigraphic_section, - absl::string_view filename ) + std::string_view filename ) { constexpr auto TYPE = "StratigraphicSection"; try @@ -70,7 +69,7 @@ namespace geode bool is_stratigraphic_section_saveable( const StratigraphicSection& stratigraphic_section, - absl::string_view filename ) + std::string_view filename ) { const auto output = detail::geode_object_output_writer< StratigraphicSectionOutputFactory >( filename );