Skip to content
Snippets Groups Projects
Commit a6eb7b69 authored by Koen Hillewaert's avatar Koen Hillewaert
Browse files

bug fix: parsing error for edge without transformation

parent f021e4b3
No related branches found
No related tags found
No related merge requests found
......@@ -339,7 +339,7 @@ int GModel::importGEOInternals()
GEO_Internals::MasterEdge& me = peIter->second;
int iSource = me.tag;
GEdge* target = getEdgeByTag(iTarget);
GEdge* source = getEdgeByTag(iSource);
GEdge* source = getEdgeByTag(abs(iSource));
if (!target)
Msg::Error("Unknown target line for periodic connection from %d to %d",
iTarget, iSource);
......
This diff is collapsed.
......@@ -4050,14 +4050,16 @@ Constraints :
"slaves (%d) ", List_Nbr($8), List_Nbr($4));
}
else{
std::vector<double> transfo;
if (List_Nbr($10) != 0) {
if (List_Nbr($10) < 12){
// FIXME Koen restore full automatic case here if List_Nbr($10) == 0)
yymsg(0, "Affine transformation requires at least 12 entries");
yymsg(0, "Affine transformation requires at least 12 entries (we have %d)",List_Nbr($10));
}
else {
std::vector<double> transfo(16,0);
for(int i = 0; i < List_Nbr($10); i++)
List_Read($10, i, &transfo[i]);
transfo.resize(List_Nbr($10));
for(int i = 0; i < List_Nbr($10); i++) List_Read($10, i, &transfo[i]);
}
}
for(int i = 0; i < List_Nbr($4); i++){
double d_master, d_slave;
List_Read($8, i, &d_master);
......@@ -4067,7 +4069,6 @@ Constraints :
addPeriodicEdge(j_slave,j_master,transfo);
}
}
}
List_Delete($4);
List_Delete($8);
}
......@@ -6060,7 +6061,7 @@ void addPeriodicEdge(int iTarget,int iSource,
if (!target || !source)
Msg::Error("Could not find surface %d or %d for periodic copy",
iTarget,iSource);
if (affineTransform.size() == 16) {
if (affineTransform.size() >= 12) {
target->setMeshMaster(source,affineTransform);
}
else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment