rename TMDS_3 to SMDS_3, end.

This commit is contained in:
Jane Tournois 2022-03-01 11:30:21 +01:00
parent 4043c220b5
commit 355b52d21f
75 changed files with 68 additions and 67 deletions

View File

@ -90,7 +90,7 @@
\package_listing{Mesh_2}
\package_listing{Surface_mesher}
\package_listing{Skin_surface_3}
\package_listing{TMDS_3}
\package_listing{SMDS_3}
\package_listing{Mesh_3}
\package_listing{Tetrahedral_remeshing}
\package_listing{Periodic_3_mesh_3}

View File

@ -24,6 +24,13 @@ Release date: June 2022
- Added the function
[`remove_isolated_vertices()`](https://doc.cgal.org/5.5/Mesh_3/classCGAL_1_1Mesh__complex__3__in__triangulation__3.html#ace57c4e777da457c6e33b4f6e89949ce)
as a post-processing step for the tetrahedral mesh generation.
### [3D Simplicial Mesh Data Structure](https://doc.cgal.org/5.4/Manual/packages.html#PkgSMDS3) (new package)
- This new package wraps all the existing code that deals with a ` MeshComplex_3InTriangulation_3`
to describe 3D simplicial meshess, and makes the data structure independant
from the tetrahedral mesh generation package.
[Release 5.4](https://github.com/CGAL/cgal/releases/tag/v5.4)
-----------
@ -202,12 +209,6 @@ Release date: January 2022
- Added support for the [OSQP solver](https://osqp.org/). This solver enables to efficiently compute
the convex Quadratic Programming (QP) problems arising in the context of several packages.
### [Tetrahedral Mesh Data Structure 3](https://doc.cgal.org/5.4/Manual/packages.html#PkgTMDS3) (new package)
- This new package wraps all the existing code that deals with a
` MeshComplex_3InTriangulation_3`, and makes the data structure independant
from the tetrahedral mesh generation package.
[Release 5.3](https://github.com/CGAL/cgal/releases/tag/v5.3)
-----------

View File

@ -7,11 +7,11 @@
// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
//
#ifndef CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
#define CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
#ifndef CGAL_SMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
#define CGAL_SMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
/// \file Mesh_complex_3_in_triangulation_3_fwd.h
/// Forward declarations of the TMDS_3 package.
/// Forward declarations of the SMDS_3 package.
#ifndef DOXYGEN_RUNNING
namespace CGAL {
@ -35,7 +35,7 @@ namespace IO {
);
} //namespace IO
namespace TMDS_3 {
namespace SMDS_3 {
template<class Tr>
bool build_triangulation_from_file(std::istream& is,
@ -43,10 +43,10 @@ namespace TMDS_3 {
bool verbose = false,
bool replace_domain_0 = false);
} // namespace TMDS_3
} // namespace SMDS_3
} // namespace CGAL
#endif
#endif /* CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */
#endif /* CGAL_SMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */

View File

@ -39,13 +39,13 @@
# if defined(CGAL_LICENSE_WARNING)
CGAL_pragma_warning("\nThe macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined."
"\nYou use the CGAL 3D Tetrahedral Mesh Data Structure package under "
"\nYou use the CGAL 3D Simplicial Mesh Data Structure package under "
"the terms of the GPLv3+.")
# endif // CGAL_LICENSE_WARNING
# ifdef CGAL_LICENSE_ERROR
# error "The macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined.\
You use the CGAL 3D Tetrahedral Mesh Data Structure package under the terms of \
You use the CGAL 3D Simplicial Mesh Data Structure package under the terms of \
the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR."
# endif // CGAL_LICENSE_ERROR

View File

@ -90,7 +90,7 @@ Surface_sweep_2 2D Intersection of Curves
TDS_2 2D Triangulation Data Structure
TDS_3 3D Triangulation Data Structure
Three Three
TMDS_3 3D Tetrahedral Mesh Data Structure
SMDS_3 3D Simplicial Mesh Data Structure
Triangulation_2 2D Triangulation
Triangulation_on_sphere_2 2D Triangulation on Sphere
Triangulation_3 3D Triangulations

View File

@ -29,7 +29,7 @@
/// \defgroup PkgMesh3IOFunctions Input/Output Functions
/// \ingroup PkgMesh3Ref
/// See \ref PkgTMDS3IOFunctions from \ref PkgTMDS3
/// See \ref PkgSMDS3IOFunctions from \ref PkgSMDS3
/*!
\addtogroup PkgMesh3Ref

View File

@ -13,5 +13,5 @@ Polyhedron
Miscellany
Mesh_2
Polygon_mesh_processing
TMDS_3
SMDS_3

View File

@ -11,7 +11,7 @@
#include <CGAL/make_mesh_3.h>
#include <CGAL/Image_3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
// Domain
typedef CGAL::Exact_predicates_inexact_constructions_kernel K;

View File

@ -13,7 +13,7 @@
#include <CGAL/make_mesh_3.h>
// Ouput
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
// Read 1D features from input file
#include "read_polylines.h"

View File

@ -33,8 +33,8 @@
#include <functional>
#include <CGAL/TMDS_3/internal/Handle_IO_for_pair_of_int.h>
#include <CGAL/TMDS_3/internal/indices_management.h>
#include <CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h>
#include <CGAL/SMDS_3/internal/indices_management.h>
// support for `CGAL::Image_3`
#include <CGAL/Image_3.h>

View File

@ -13,8 +13,8 @@
#ifndef CGAL_MESH_3_DUMP_C3T3_H
#define CGAL_MESH_3_DUMP_C3T3_H
#include <CGAL/license/TMDS_3.h>
#include <CGAL/license/SMDS_3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
#endif // CGAL_MESH_3_DUMP_C3T3_H

View File

@ -36,7 +36,7 @@
#include <CGAL/Mesh_error_code.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
#include <CGAL/Mesh_3/Refine_facets_3.h>
#include <CGAL/Mesh_3/Refine_facets_manifold_base.h>

View File

@ -28,11 +28,11 @@
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
#ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS
# include <CGAL/IO/File_binary_mesh_3.h>
#endif
#include <CGAL/TMDS_3/utilities.h>
#include <CGAL/SMDS_3/utilities.h>
#include <CGAL/Mesh_3/Triangulation_helpers.h>
#include <CGAL/iterator.h>
#include <CGAL/Mesh_error_code.h>
@ -108,7 +108,7 @@ void debug_dump_c3t3(const std::string filename, const C3t3& c3t3)
template <typename C3T3, typename MeshDomain, typename SizingFunction>
class Protect_edges_sizing_field
: public CGAL::TMDS_3::internal::Debug_messages_tools
: public CGAL::SMDS_3::internal::Debug_messages_tools
{
typedef Protect_edges_sizing_field Self;

View File

@ -38,7 +38,7 @@
#ifdef CGAL_MESH_3_PROFILING
#include <CGAL/Mesh_3/Profiling_tools.h>
#endif
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
#include <CGAL/Object.h>

View File

@ -16,7 +16,7 @@
#include <CGAL/config.h>
#include <CGAL/TMDS_3/config.h>
#include <CGAL/SMDS_3/config.h>
//#define CGAL_MESH_3_VERBOSE 1

View File

@ -22,7 +22,7 @@
#include <CGAL/enum.h>
#include <CGAL/tags.h>
#include <CGAL/TMDS_3/Has_features.h>
#include <CGAL/SMDS_3/Has_features.h>
#include <boost/type_traits/is_same.hpp>
namespace CGAL {

View File

@ -13,8 +13,8 @@
#ifndef CGAL_MESH_3_IO_SIGNATURE_H
#define CGAL_MESH_3_IO_SIGNATURE_H
#include <CGAL/license/TMDS_3.h>
#include <CGAL/license/SMDS_3.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
#endif // CGAL_MESH_3_IO_SIGNATURE_H

View File

@ -29,7 +29,7 @@
#include <CGAL/is_streamable.h>
#include <CGAL/Real_timer.h>
#include <CGAL/property_map.h>
#include <CGAL/TMDS_3/internal/indices_management.h>
#include <CGAL/SMDS_3/internal/indices_management.h>
#include <vector>
#include <set>

View File

@ -28,7 +28,7 @@
#include <CGAL/Mesh_vertex_base_3.h>
#include <CGAL/Compact_mesh_cell_base_3.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
namespace CGAL {

View File

@ -59,9 +59,9 @@
// To handle I/O for Surface_patch_index if that is a pair of `int` (the
// default)
#include <CGAL/TMDS_3/internal/Handle_IO_for_pair_of_int.h>
#include <CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h>
#include <CGAL/TMDS_3/internal/indices_management.h>
#include <CGAL/SMDS_3/internal/indices_management.h>
namespace CGAL {

View File

@ -26,7 +26,7 @@
#include <CGAL/refine_mesh_3.h>
#include <CGAL/tags.h>
#include <CGAL/Mesh_3/Protect_edges_sizing_field.h>
#include <CGAL/TMDS_3/Has_features.h>
#include <CGAL/SMDS_3/Has_features.h>
#include <CGAL/Mesh_3/C3T3_helpers.h>
#include <boost/mpl/has_xxx.hpp>

View File

@ -27,7 +27,7 @@
#include <CGAL/Mesh_3/Mesher_3.h>
#include <CGAL/Mesh_error_code.h>
#include <CGAL/optimize_mesh_3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
#include <boost/parameter/preprocessor.hpp>

View File

@ -36,7 +36,7 @@ Solver_interface
Spatial_searching
Spatial_sorting
Stream_support
TMDS_3
SMDS_3
TDS_3
Triangulation_3
Union_find

View File

@ -4,7 +4,7 @@
#include <CGAL/Mesh_triangulation_3.h>
#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/Mesh_3/Robust_intersection_traits_3.h>
#include <CGAL/Polyhedral_mesh_domain_with_features_3.h>
#include <CGAL/Mesh_cell_base_3.h>
@ -49,7 +49,7 @@ int main (int argc, char** argv){
return 1;
}
C3t3 c3t3;
if(CGAL::TMDS_3::build_triangulation_from_file(in, c3t3.triangulation()))
if(CGAL::SMDS_3::build_triangulation_from_file(in, c3t3.triangulation()))
{
for( C3t3::Triangulation::Finite_cells_iterator
cit = c3t3.triangulation().finite_cells_begin();

View File

@ -15,14 +15,14 @@
// File Description :
//******************************************************************************
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
#include "test_meshing_utilities.h"
#include <CGAL/Polyhedral_mesh_domain_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <boost/type_traits/is_same.hpp>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
#include <CGAL/disable_warnings.h>

View File

@ -6,7 +6,7 @@
#include <CGAL/Mesh_criteria_3.h>
#include <CGAL/Polyhedral_mesh_domain_with_features_3.h>
#include <CGAL/make_mesh_3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
#include <sstream>

View File

@ -308,7 +308,7 @@ void output_to_medit(std::ostream& os,
#endif
CGAL_precondition(c3t3.triangulation().is_1_cover());
typedef CGAL::TMDS_3::Medit_pmap_generator<C3T3, rebind, no_patch> Generator;
typedef CGAL::SMDS_3::Medit_pmap_generator<C3T3, rebind, no_patch> Generator;
typedef typename Generator::Cell_pmap Cell_pmap;
typedef typename Generator::Facet_pmap Facet_pmap;
typedef typename Generator::Facet_pmap_twice Facet_pmap_twice;

View File

@ -31,12 +31,12 @@
#include <CGAL/license/Periodic_3_mesh_3.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
#ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS
#include <CGAL/IO/File_binary_mesh_3.h>
#endif
#include <CGAL/Mesh_3/Protect_edges_sizing_field.h>
#include <CGAL/TMDS_3/utilities.h>
#include <CGAL/SMDS_3/utilities.h>
#include <CGAL/Mesh_3/Triangulation_helpers.h>
#include <CGAL/enum.h>
@ -75,7 +75,7 @@ namespace Periodic_3_mesh_3 {
template <typename C3T3, typename MeshDomain, typename SizingFunction>
class Protect_edges_sizing_field
: public CGAL::TMDS_3::internal::Debug_messages_tools
: public CGAL::SMDS_3::internal::Debug_messages_tools
{
typedef Protect_edges_sizing_field Self;

View File

@ -38,7 +38,7 @@
#include <CGAL/Cartesian_converter.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
#include <CGAL/tags.h>
#include <iostream>

View File

@ -21,7 +21,7 @@
#include <CGAL/Periodic_3_mesh_3/config.h>
#include <CGAL/Mesh_3/C3T3_helpers.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h>
#include <CGAL/Mesh_3/Triangulation_helpers.h>
#include <CGAL/refine_mesh_3.h>
#include <CGAL/Time_stamper.h>

View File

@ -32,7 +32,7 @@ STL_Extension
Solver_interface
Spatial_sorting
Stream_support
TMDS_3
SMDS_3
TDS_3
Triangulation_3
Union_find

View File

@ -10,7 +10,7 @@
// Jane Tournois
//
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
#include <QtCore/qglobal.h>
#include "Scene_surface_mesh_item.h"
@ -37,7 +37,7 @@
#include <CGAL/boost/graph/Euler_operations.h>
#include <CGAL/property_map.h>
#include <CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/IO/output_to_vtu.h>
#include <CGAL/boost/graph/io.h>
@ -425,7 +425,7 @@ public:
}
}
CGAL::TMDS_3::build_triangulation_with_subdomains_range(
CGAL::SMDS_3::build_triangulation_with_subdomains_range(
c3t3_item->c3t3().triangulation(),
points, finite_cells, subdomains, border_facets);

View File

@ -1,6 +1,6 @@
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/SMDS_3/io_signature.h>
#include "Scene_c3t3_item.h"
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/Three/Polyhedron_demo_io_plugin_interface.h>
#include <CGAL/Three/Three.h>
#include <CGAL/IO/File_avizo.h>
@ -129,7 +129,7 @@ Polyhedron_demo_c3t3_binary_io_plugin::load(
item->setName(fileinfo.baseName());
item->set_valid(false);
if(CGAL::TMDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true))
if(CGAL::SMDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true))
{
item->c3t3().rescan_after_load_of_triangulation(); //fix counters for facets and cells
for( C3t3::Cell_handle cit : item->c3t3().triangulation().finite_cell_handles())

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -209,7 +209,7 @@ CGAL_add_named_parameter(cell_selector_t, cell_selector, cell_is_selected_map)
CGAL_add_named_parameter(facet_is_constrained_t, facet_is_constrained, facet_is_constrained_map)
CGAL_add_named_parameter(smooth_constrained_edges_t, smooth_constrained_edges, smooth_constrained_edges)
// TMDS_3 parameters
// SMDS_3 parameters
CGAL_add_named_parameter(surface_facets_t, surface_facets, surface_facets)
CGAL_add_named_parameter(subdomain_indices_t, subdomain_indices, subdomain_indices)
CGAL_add_named_parameter(all_vertices_t, all_vertices, all_vertices)

View File

@ -475,7 +475,7 @@ A precise specification of those formats is available at
The following \cgal data structures can be exported into the `.VTU` file format:
- `CGAL::Mesh_complex_3_in_triangulation_3`, using \link PkgTMDS3IOFunctions `CGAL::IO::output_to_vtu()` \endlink
- `CGAL::Mesh_complex_3_in_triangulation_3`, using \link PkgSMDS3IOFunctions `CGAL::IO::output_to_vtu()` \endlink
- `CGAL::Constrained_Delaunay_triangulation_2`, using the function \link PkgMesh2IO `CGAL::IO::write_VTU()` \endlink

View File

@ -14,6 +14,6 @@ Point_set_processing_3
STL_Extension
Surface_mesh
Surface_mesher
TMDS_3
SMDS_3
Triangulation
Triangulation_2

View File

@ -8,4 +8,4 @@ Triangulation_3
BGL
Mesh_3
TDS_3
TMDS_3
SMDS_3

View File

@ -28,7 +28,7 @@
#include <utility>
#include <unordered_set>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/utility.h>
#include <CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h>
@ -109,7 +109,7 @@ public:
// finished
std::vector<Vertex_handle> new_vertices;
std::map<Facet, typename C3t3::Surface_patch_index> border_facets;
if (CGAL::TMDS_3::build_triangulation_impl(
if (CGAL::SMDS_3::build_triangulation_impl(
triangulation, points, finite_cells, subdomains, border_facets,
new_vertices /*, verbose*/))
{

View File

@ -23,7 +23,7 @@ Random_numbers
STL_Extension
Spatial_sorting
Stream_support
TMDS_3
SMDS_3
TDS_3
Tetrahedral_remeshing
Triangulation_3

View File

@ -10,7 +10,7 @@
#include <iostream>
#include <fstream>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
@ -23,7 +23,7 @@ int main(int argc, char* argv[])
Remeshing_triangulation tr;
std::ifstream in("data/sphere.mesh");
if (CGAL::TMDS_3::build_triangulation_from_file(in, tr))
if (CGAL::SMDS_3::build_triangulation_from_file(in, tr))
std::cout << "build triangulation ok" << std::endl;
CGAL::tetrahedral_isotropic_remeshing(tr, target_edge_length);