Skip to content
Snippets Groups Projects
Commit c42a3ee9 authored by Guillaume Demesy's avatar Guillaume Demesy
Browse files

Integration: Just put Triangle2 in same Case as Triangle

parent a5b48637
No related branches found
No related tags found
1 merge request!1Debug curved mesh
...@@ -132,31 +132,19 @@ Jacobian { ...@@ -132,31 +132,19 @@ Jacobian {
} }
Integration { Integration {
If (flag_o2g==0)
{ Name Int_1 ; { Name Int_1 ;
Case { Case {
{ Type Gauss ; { Type Gauss ;
Case { Case {
{ GeoElement Point ; NumberOfPoints 1 ; } { GeoElement Point ; NumberOfPoints 1 ; }
{ GeoElement Line ; NumberOfPoints 4 ; } { GeoElement Line ; NumberOfPoints 4 ; }
{ GeoElement Triangle ; NumberOfPoints 6 ; }
}
}
}
}
Else
{ Name Int_1 ;
Case {
{ Type Gauss ;
Case {
{ GeoElement Point ; NumberOfPoints 1 ; }
{ GeoElement Line2 ; NumberOfPoints 4 ; } { GeoElement Line2 ; NumberOfPoints 4 ; }
{ GeoElement Triangle ; NumberOfPoints 6 ; }
{ GeoElement Triangle2; NumberOfPoints 12 ; } { GeoElement Triangle2; NumberOfPoints 12 ; }
} }
} }
} }
} }
EndIf
} }
FunctionSpace { FunctionSpace {
...@@ -189,7 +177,7 @@ FunctionSpace { ...@@ -189,7 +177,7 @@ FunctionSpace {
{ Name Hgrad; Type Form0; { Name Hgrad; Type Form0;
BasisFunction { BasisFunction {
{ Name sn; NameOfCoef un; Function BF_Node; Support Region[Om]; Entity NodesOf[All]; } { Name sn; NameOfCoef un; Function BF_Node; Support Region[Om]; Entity NodesOf[All]; }
If(flag_o2g==0) // for curved elements, mid-edge nodes are already included in BF_PerpendicularEdge_1N If(flag_o2g==0) // for curved elements, mid-edge nodes are already included in BF_Node
{ Name sn2; NameOfCoef un2; Function BF_Node_2E; Support Region[Om]; Entity EdgesOf[All]; } { Name sn2; NameOfCoef un2; Function BF_Node_2E; Support Region[Om]; Entity EdgesOf[All]; }
EndIf EndIf
If(flag_o2i==1) // TODO: Check P3 and P4 (_3E) If(flag_o2i==1) // TODO: Check P3 and P4 (_3E)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment