Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue#154 #68

Merged
merged 3 commits into from
Jan 8, 2025
Merged

Issue#154 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40dc92d
Fix issue#156
lelandaisb Dec 2, 2024
998b864
Merge branch 'main' into issue#156
lelandaisb Jan 6, 2025
62b2f45
Fix issue#154 : remove Face meshing properties directional, orthogona…
lelandaisb Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Docs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,11 @@ set(DOXYGEN_DIRS
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyGlobalInterpolate.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyTabulated.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyBeta.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/FaceMeshingPropertyDirectional.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/FaceMeshingPropertyOrthogonal.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/FaceMeshingPropertyRotational.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/FaceMeshingPropertyTransfinite.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/FaceMeshingPropertyDelaunayGMSH.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/FaceMeshingPropertyQuadPairing.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/BlockMeshingPropertyDirectional.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/BlockMeshingPropertyOrthogonal.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/BlockMeshingPropertyRotational.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/BlockMeshingPropertyTransfinite.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/BlockMeshingPropertyDelaunayTetgen.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/BlockMeshingPropertyInsertion.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Mesh/MeshManagerIfc.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Mesh/MeshModificationBySepa.h
${PROJECT_SOURCE_DIR}/src/Core/protected/Smoothing/SurfacicSmoothing.h
Expand Down
1 change: 0 additions & 1 deletion src/Core/Internal/ImportMDLImplementation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@ void ImportMDLImplementation::performTopo(Internal::InfoCommand* icmd)
}
// sélection de la méthode transfinie ou directionnelle si possible
m_icmd->addTopoInfoEntity (coface, Internal::InfoCommand::CREATED);
coface->selectBasicMeshLaw(m_icmd);

} else {
// cas non-structuré
Expand Down
12 changes: 0 additions & 12 deletions src/Core/Internal/ServiceGeomToTopo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "Topo/Vertex.h"
#include "Topo/EdgeMeshingPropertyUniform.h"
#include "Topo/CoEdgeMeshingProperty.h"
#include "Topo/BlockMeshingPropertyInsertion.h"

#include "Geom/Volume.h"
#include "Geom/Surface.h"
Expand Down Expand Up @@ -74,8 +73,6 @@ bool ServiceGeomToTopo::convertBlockStructured(const int ni, const int nj, const
if (bloc->structurable()){
bloc->structure(m_icmd);

bloc->selectBasicMeshLaw(m_icmd);

// cas où le nombre de bras est donné par l'utilisateur
if (ni>0 && nj>0 && nk>0){
std::vector<Topo::CoEdge*> coedges;
Expand All @@ -102,13 +99,6 @@ bool ServiceGeomToTopo::convertBlockStructured(const int ni, const int nj, const
return true;
}
/*----------------------------------------------------------------------------*/
void ServiceGeomToTopo::convertInsertionBlock()
{
Topo::Block* bloc = getBlock();
Topo::BlockMeshingPropertyInsertion mp;
bloc->switchBlockMeshingProperty(m_icmd, &mp);
}
/*----------------------------------------------------------------------------*/
Topo::Block* ServiceGeomToTopo::getBlock()
{
return getBlock(m_volume);
Expand All @@ -122,8 +112,6 @@ bool ServiceGeomToTopo::convertCoFaceStructured()
if (coface->structurable()){
coface->structure(m_icmd);

coface->selectBasicMeshLaw(m_icmd);

return false; // ok
}
else
Expand Down
22 changes: 5 additions & 17 deletions src/Core/Mesh/MeshImplementation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,14 +1082,11 @@ void MeshImplementation::mesh(Mesh::CommandCreateMesh* command, Topo::Block* bl)
if (getContext().getMeshDim() == Internal::ContextIfc::MESH2D)
throw TkUtil::Exception (TkUtil::UTF8String ("Il n'est pas possible de mailler des blocs alors que le maillage n'est pas 3D en sortie", TkUtil::Charset::UTF_8));

if (Topo::BlockMeshingProperty::insertion != bl->getMeshLaw()){

std::vector<Topo::Face* > faces;
bl->getFaces(faces);
for (uint i=0; i<faces.size(); i++) {
mesh(command, faces[i]);
}
}
std::vector<Topo::Face* > faces;
bl->getFaces(faces);
for (uint i=0; i<faces.size(); i++) {
mesh(command, faces[i]);
}

bl->saveBlockMeshingData(&command->getInfoCommand());

Expand All @@ -1099,20 +1096,11 @@ void MeshImplementation::mesh(Mesh::CommandCreateMesh* command, Topo::Block* bl)
else if (bl->getMeshLaw() == Topo::BlockMeshingProperty::delaunayTetgen){
meshDelaunayTetgen(command,bl);
}
else if (bl->getMeshLaw() == Topo::BlockMeshingProperty::insertion){
meshInsertion(command,bl);
}
else {
throw TkUtil::Exception (TkUtil::UTF8String ("MeshImplementation::mesh(Topo::Block* bl) pour une méthode inconnue", TkUtil::Charset::UTF_8));
}
bl->getMeshingData()->setMeshed(true);
} // end if (!bl->isMeshed())
else {
if (bl->getMeshLaw() == Topo::BlockMeshingProperty::insertion) {
throw TkUtil::Exception (TkUtil::UTF8String ("MeshImplementation::mesh(Topo::Block* bl) pour la méthode "
"insertion alors que le bloc est déjà maillé", TkUtil::Charset::UTF_8));
}
}

}
/*----------------------------------------------------------------------------*/
Expand Down
1 change: 0 additions & 1 deletion src/Core/Mesh/MeshImplementationInsertion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "Topo/Block.h"
#include "Topo/Face.h"
#include "Topo/Edge.h"
#include "Topo/BlockMeshingPropertyInsertion.h"

#include "Utils/Common.h"
#include "Internal/Context.h"
Expand Down
Loading
Loading