Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
9a32dc04
Commit
9a32dc04
authored
Jul 07, 2017
by
Michael Turner
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/varopti-2d' into 'master'
Fix 2D varopti code See merge request
!806
parents
b149b3a1
7209ec33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
utilities/NekMesh/ProcessModules/ProcessVarOpti/NodeOpti.h
utilities/NekMesh/ProcessModules/ProcessVarOpti/NodeOpti.h
+5
-5
utilities/NekMesh/ProcessModules/ProcessVarOpti/NodeOptiCAD.h
...ities/NekMesh/ProcessModules/ProcessVarOpti/NodeOptiCAD.h
+2
-2
No files found.
utilities/NekMesh/ProcessModules/ProcessVarOpti/NodeOpti.h
View file @
9a32dc04
...
...
@@ -59,7 +59,7 @@ public:
NodeOpti
(
NodeSharedPtr
n
,
std
::
vector
<
ElUtilSharedPtr
>
e
,
ResidualSharedPtr
r
,
std
::
map
<
LibUtilities
::
ShapeType
,
DerivUtilSharedPtr
>
d
,
optiType
o
)
optiType
o
,
int
dim
)
:
m_node
(
n
),
m_res
(
r
),
m_derivUtils
(
d
),
m_opti
(
o
)
{
// filter element types within d vector
...
...
@@ -79,12 +79,12 @@ public:
const
int
nElmt
=
typeIt
->
second
.
size
();
storageCount
=
std
::
max
(
storageCount
,
3
*
m_derivUtils
[
typeIt
->
first
]
->
ptsStd
*
dim
*
m_derivUtils
[
typeIt
->
first
]
->
ptsStd
*
typeIt
->
second
.
size
());
m_derivs
.
insert
(
std
::
make_pair
(
typeIt
->
first
,
DerivArray
(
boost
::
extents
[
3
][
nElmt
][
3
][
pts
])));
DerivArray
(
boost
::
extents
[
dim
][
nElmt
][
dim
][
pts
])));
}
m_tmpStore
.
resize
(
storageCount
);
...
...
@@ -148,7 +148,7 @@ public:
ResidualSharedPtr
r
,
std
::
map
<
LibUtilities
::
ShapeType
,
DerivUtilSharedPtr
>
d
,
optiType
o
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
,
3
)
{
}
...
...
@@ -174,7 +174,7 @@ public:
ResidualSharedPtr
r
,
std
::
map
<
LibUtilities
::
ShapeType
,
DerivUtilSharedPtr
>
d
,
optiType
o
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
,
2
)
{
}
...
...
utilities/NekMesh/ProcessModules/ProcessVarOpti/NodeOptiCAD.h
View file @
9a32dc04
...
...
@@ -52,7 +52,7 @@ public:
ResidualSharedPtr
r
,
std
::
map
<
LibUtilities
::
ShapeType
,
DerivUtilSharedPtr
>
d
,
optiType
o
,
CADCurveSharedPtr
c
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
),
curve
(
c
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
,
3
),
curve
(
c
)
{
}
...
...
@@ -81,7 +81,7 @@ public:
ResidualSharedPtr
r
,
std
::
map
<
LibUtilities
::
ShapeType
,
DerivUtilSharedPtr
>
d
,
optiType
o
,
CADSurfSharedPtr
s
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
),
surf
(
s
)
:
NodeOpti
(
n
,
e
,
r
,
d
,
o
,
3
),
surf
(
s
)
{
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment