Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
models
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
documentation
models
Commits
a5b48637
Commit
a5b48637
authored
5 years ago
by
Guillaume Demesy
Browse files
Options
Downloads
Patches
Plain Diff
for curved elements, mid-edge nodes are already included in BF_Node (TODO : check P3 and P4)
parent
2e7cdcef
No related branches found
Branches containing commit
No related tags found
1 merge request
!1
Debug curved mesh
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NonLinearEVP/NonLinearEVP.pro
+31
-23
31 additions, 23 deletions
NonLinearEVP/NonLinearEVP.pro
NonLinearEVP/NonLinearEVP_data.geo
+1
-1
1 addition, 1 deletion
NonLinearEVP/NonLinearEVP_data.geo
with
32 additions
and
24 deletions
NonLinearEVP/NonLinearEVP.pro
+
31
−
23
View file @
a5b48637
...
...
@@ -163,42 +163,50 @@ FunctionSpace {
{
Name
Hgrad_perp
;
Type
Form1P
;
BasisFunction
{
{
Name
un
;
NameOfCoef
un
;
Function
BF_PerpendicularEdge_1N
;
Support
Region
[
Om
];
Entity
NodesOf
[
Om
];
}
// { Name un2; NameOfCoef un2; Function BF_PerpendicularEdge_2E; Support Region[Om]; Entity EdgesOf[Om]; }
If
(
flag_o2i
==
1
)
{
Name
un3
;
NameOfCoef
un3
;
Function
BF_PerpendicularEdge_2F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
Om
];
}
{
Name
un4
;
NameOfCoef
un4
;
Function
BF_PerpendicularEdge_3E
;
Support
Region
[
Om
];
Entity
EdgesOf
[
Om
];
}
{
Name
un5
;
NameOfCoef
un5
;
Function
BF_PerpendicularEdge_3F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
Om
];
}
{
Name
sn
;
NameOfCoef
un
;
Function
BF_PerpendicularEdge_1N
;
Support
Region
[
Om
];
Entity
NodesOf
[
All
];
}
If
(
flag_o2g
==
0
)
// for curved elements, mid-edge nodes are already included in BF_PerpendicularEdge_1N
{
Name
sn2
;
NameOfCoef
un2
;
Function
BF_PerpendicularEdge_2E
;
Support
Region
[
Om
];
Entity
EdgesOf
[
All
];
}
EndIf
If
(
flag_o2i
==
1
)
// TODO: Check P3 and P4 (_3E)
{
Name
sn3
;
NameOfCoef
un3
;
Function
BF_PerpendicularEdge_2F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
All
];
}
// { Name sn4; NameOfCoef un4; Function BF_PerpendicularEdge_3E; Support Region[Om]; Entity EdgesOf[All]; }
{
Name
sn5
;
NameOfCoef
un5
;
Function
BF_PerpendicularEdge_3F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
All
];
}
EndIf
}
Constraint
{
{
NameOfCoef
un
;
EntityType
NodesOf
;
NameOfConstraint
BlochX
;
}
// { NameOfCoef un2; EntityType EdgesOf ; NameOfConstraint BlochX; }
If
(
flag_o2i
==
1
)
//{ NameOfCoef un3; EntityType FacetsOf ; NameOfConstraint BlochX; }
{
NameOfCoef
un4
;
EntityType
EdgesOf
;
NameOfConstraint
BlochX
;
}
//{ NameOfCoef un5; EntityType FacetsOf ; NameOfConstraint BlochX; }
If
(
flag_o2g
==
0
)
{
NameOfCoef
un2
;
EntityType
EdgesOf
;
NameOfConstraint
BlochX
;
}
EndIf
If
(
flag_o2i
==
1
)
// TODO: Check P3 and P4 (_3E)
// //{ NameOfCoef un3; EntityType FacetsOf ; NameOfConstraint BlochX; }
// { NameOfCoef un4; EntityType EdgesOf ; NameOfConstraint BlochX; }
// //{ NameOfCoef un5; EntityType FacetsOf ; NameOfConstraint BlochX; }
EndIf
}
}
{
Name
Hgrad
;
Type
Form0
;
BasisFunction
{
{
Name
un
;
NameOfCoef
un
;
Function
BF_Node
;
Support
Region
[
Om
];
Entity
NodesOf
[
Om
];
}
// { Name un2; NameOfCoef un2; Function BF_Node_2E; Support Region[Om]; Entity EdgesOf[Om]; }
If
(
flag_o2i
==
1
)
{
Name
un3
;
NameOfCoef
un3
;
Function
BF_Node_2F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
Om
];
}
{
Name
un4
;
NameOfCoef
un4
;
Function
BF_Node_3E
;
Support
Region
[
Om
];
Entity
EdgesOf
[
Om
];
}
{
Name
un5
;
NameOfCoef
un5
;
Function
BF_Node_3F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
Om
];
}
{
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
{
Name
sn2
;
NameOfCoef
un2
;
Function
BF_Node_2E
;
Support
Region
[
Om
];
Entity
EdgesOf
[
All
];
}
EndIf
If
(
flag_o2i
==
1
)
// TODO: Check P3 and P4 (_3E)
{
Name
sn3
;
NameOfCoef
un3
;
Function
BF_Node_2F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
All
];
}
// { Name sn4; NameOfCoef un4; Function BF_PerpendicularEdge_3E; Support Region[Om]; Entity EdgesOf[All]; }
{
Name
sn5
;
NameOfCoef
un5
;
Function
BF_Node_3F
;
Support
Region
[
Om
];
Entity
FacetsOf
[
All
];
}
EndIf
}
Constraint
{
{
NameOfCoef
un
;
EntityType
NodesOf
;
NameOfConstraint
BlochX
;
}
// { NameOfCoef un2; EntityType EdgesOf ; NameOfConstraint BlochX; }
If
(
flag_o2i
==
1
)
//{ NameOfCoef un3; EntityType FacetsOf ; NameOfConstraint BlochX; }
{
NameOfCoef
un4
;
EntityType
EdgesOf
;
NameOfConstraint
BlochX
;
}
//{ NameOfCoef un5; EntityType FacetsOf ; NameOfConstraint BlochX; }
If
(
flag_o2g
==
0
)
{
NameOfCoef
un2
;
EntityType
EdgesOf
;
NameOfConstraint
BlochX
;
}
EndIf
If
(
flag_o2i
==
1
)
// TODO: Check P3 and P4 (_3E)
// //{ NameOfCoef un3; EntityType FacetsOf ; NameOfConstraint BlochX; }
// { NameOfCoef un4; EntityType EdgesOf ; NameOfConstraint BlochX; }
// //{ NameOfCoef un5; EntityType FacetsOf ; NameOfConstraint BlochX; }
EndIf
}
}
...
...
@@ -408,7 +416,7 @@ Resolution {
}
Operation
{
GenerateSeparate
[
M1
];
EigenSolve
[
M1
,
neig
,
eig_target_re
,
eig_target_im
];
//
Print[M1];
EigenSolve
[
M1
,
neig
,
eig_target_re
,
eig_target_im
];
Print
[
M1
];
}
}
...
...
This diff is collapsed.
Click to expand it.
NonLinearEVP/NonLinearEVP_data.geo
+
1
−
1
View file @
a5b48637
...
...
@@ -55,7 +55,7 @@ DefineConstant[
paramaille
=
{
4
,
Name
StrCat
[
pp4
,
"0number of mesh elements per period []"
]
,
Highlight
Str
[
colorpp4
],
Min
2
,
Max
10
}
,
flag_Tmesh
=
{
0
,
Name
StrCat
[
pp4
,
"2locally structured mesh?"
]
,
Choices
{
0
=
"unstruct"
,
1
=
"struct"
}
},
flag_o2g
=
{
1
,
Name
StrCat
[
pp4
,
"3Geometrical order"
]
,
Choices
{
0
=
"order 1 (linear)"
,
1
=
"order 2 (curved)"
}
},
flag_o2g
=
{
0
,
Name
StrCat
[
pp4
,
"3Geometrical order"
]
,
Choices
{
0
=
"order 1 (linear)"
,
1
=
"order 2 (curved)"
}
},
flag_o2i
=
{
1
,
Name
StrCat
[
pp4
,
"4Interpolation order"
]
,
Choices
{
0
=
"order 1"
,
1
=
"full order 2"
},
ServerAction
"ResetDatabase"
},
flag_rounding
=
{
1
,
Name
StrCat
[
pp4
,
"5Corner rounding/0Do it!"
],
Choices
{
0
,
1
},
ServerAction
"ResetDatabase"
},
corner_rad_frac
=
{
0.1
,
Name
StrCat
[
pp4
,
"5Corner rounding/1corner radius (fraction of square side)"
]
,
Highlight
Str
[
colorpp2
]
,
Min
0.01
,
Max
0.49
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment