songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SMDS_3 - fix `output_to_vtu()` when `Subdomain_index` is `int` (#8926) 

## Summary of Changes

This PR fixes issue #8901
that happened when `Subdomain_index` was an `int` (and probably anything
else than `double`)

## Release Management

* Affected package(s): SMDS_3
* Issue(s) solved (if any): fix #8901 
* License and copyright ownership: unchanged
This commit is contained in:
Sebastien Loriot 2025-06-10 14:06:56 +02:00 committed by GitHub
parent b00d1a7d6c 3ab0737d4f
commit 50f59129e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SMDS_3/include/CGAL/IO/output_to_vtu.h
View File

@ -268,12 +268,16 @@ write_attributes(std::ostream& os,
}
enum VTU_ATTRIBUTE_TYPE{
DOUBLE=0,
INTEGER = 0,
DOUBLE,
UNIT_8,
SIZE_TYPE
};
typedef std::variant<const std::vector<double>*, const std::vector<uint8_t>*, const std::vector<std::size_t>* > Vtu_attributes;
typedef std::variant<const std::vector<int>*,
const std::vector<double>*,
const std::vector<uint8_t>*,
const std::vector<std::size_t>* > Vtu_attributes;
template <class C3T3>
void output_to_vtu_with_attributes(std::ostream& os,
@ -284,6 +288,7 @@ void output_to_vtu_with_attributes(std::ostream& os,
//CGAL_assertion(attributes.size() == attribute_types.size());
typedef typename C3T3::Triangulation Tr;
typedef typename Tr::Vertex_handle Vertex_handle;
const Tr& tr = c3t3.triangulation();
std::map<Vertex_handle, std::size_t> V;
//write header
@ -316,9 +321,12 @@ void output_to_vtu_with_attributes(std::ostream& os,
{
switch(attributes[i].second.index()){
case 0:
write_attribute_tag(os,attributes[i].first, *std::get<const std::vector<double>* >(attributes[i].second), binary,offset);
write_attribute_tag(os, attributes[i].first, *std::get<const std::vector<int>* >(attributes[i].second), binary, offset);
break;
case 1:
write_attribute_tag(os,attributes[i].first, *std::get<const std::vector<double>* >(attributes[i].second), binary,offset);
break;
case 2:
write_attribute_tag(os,attributes[i].first, *std::get<const std::vector<uint8_t>* >(attributes[i].second), binary,offset);
break;
default:
@ -336,9 +344,12 @@ void output_to_vtu_with_attributes(std::ostream& os,
for(std::size_t i = 0; i< attributes.size(); ++i) {
switch(attributes[i].second.index()){
case 0:
write_attributes(os, *std::get<const std::vector<double>* >(attributes[i].second));
write_attributes(os, *std::get<const std::vector<int>* >(attributes[i].second));
break;
case 1:
write_attributes(os, *std::get<const std::vector<double>* >(attributes[i].second));
break;
case 2:
write_attributes(os, *std::get<const std::vector<uint8_t>* >(attributes[i].second));
break;
default:
@ -371,14 +382,13 @@ void output_to_vtu(std::ostream& os,
const C3T3& c3t3,
Mode mode = BINARY)
{
typedef typename C3T3::Cells_in_complex_iterator Cell_iterator;
std::vector<double> mids;
for( Cell_iterator cit = c3t3.cells_in_complex_begin() ;
cit != c3t3.cells_in_complex_end() ;
++cit )
typedef typename C3T3::Cell_handle Cell_handle;
typedef typename C3T3::Subdomain_index Subdomain_index;
std::vector<Subdomain_index> mids;
for( Cell_handle c : c3t3.cells_in_complex())
{
double v = cit->subdomain_index();
mids.push_back(v);
mids.push_back(c->subdomain_index());
}
std::vector<std::pair<const char*, internal::Vtu_attributes > > atts;