Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
4a31d4db
Commit
4a31d4db
authored
Mar 03, 2013
by
Chris Cantwell
Browse files
Fixed linking error on Ubuntu.
Fixed some compiler warnings related to FieldIO code.
parent
c7d3b72e
Changes
2
Hide whitespace changes
Inline
Side-by-side
library/LibUtilities/BasicUtils/FieldIO.cpp
View file @
4a31d4db
...
...
@@ -87,9 +87,10 @@ namespace Nektar
ASSERTL1
(
fielddata
[
f
].
size
()
>
0
,
"Fielddata vector must contain at least one value."
);
int
datasize
=
CheckFieldDefinition
(
fielddefs
[
f
]);
ASSERTL1
(
fielddata
[
f
].
size
()
==
fielddefs
[
f
]
->
m_fields
.
size
()
*
datasize
,
"Invalid size of fielddata vector."
);
ASSERTL1
(
fielddata
[
f
].
size
()
==
fielddefs
[
f
]
->
m_fields
.
size
()
*
CheckFieldDefinition
(
fielddefs
[
f
]),
"Invalid size of fielddata vector."
);
//---------------------------------------------
// Write ELEMENTS
...
...
@@ -868,19 +869,23 @@ namespace Nektar
switch
(
fielddefs
->
m_shapeType
)
{
case
eSegment
:
{
int
l
=
fielddefs
->
m_numModes
[
cnt
++
];
if
(
fielddefs
->
m_numHomogeneousDir
==
1
)
{
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
];
datasize
+=
l
*
fielddefs
->
m_numModes
[
cnt
++
];
}
else
if
(
fielddefs
->
m_numHomogeneousDir
==
2
)
{
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
];
int
m
=
fielddefs
->
m_numModes
[
cnt
++
];
datasize
+=
l
*
m
*
fielddefs
->
m_numModes
[
cnt
++
];
}
else
{
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
;
datasize
+=
l
;
}
break
;
}
break
;
case
eTriangle
:
{
int
l
=
fielddefs
->
m_numModes
[
cnt
++
];
...
...
@@ -888,7 +893,8 @@ namespace Nektar
if
(
fielddefs
->
m_numHomogeneousDir
==
1
)
{
datasize
+=
StdTriData
::
getNumberOfCoefficients
(
l
,
m
)
*
fielddefs
->
m_homogeneousZIDs
.
size
();
datasize
+=
StdTriData
::
getNumberOfCoefficients
(
l
,
m
)
*
fielddefs
->
m_homogeneousZIDs
.
size
();
}
else
{
...
...
@@ -898,17 +904,16 @@ namespace Nektar
break
;
case
eQuadrilateral
:
{
int
l
=
fielddefs
->
m_numModes
[
cnt
++
];
int
m
=
fielddefs
->
m_numModes
[
cnt
++
];
if
(
fielddefs
->
m_numHomogeneousDir
==
1
)
{
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_homogeneousZIDs
.
size
();
datasize
+=
l
*
m
*
fielddefs
->
m_homogeneousZIDs
.
size
();
}
else
{
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
];
}
datasize
+=
l
*
m
;
}
}
break
;
case
eTetrahedron
:
...
...
@@ -936,9 +941,12 @@ namespace Nektar
}
break
;
case
eHexahedron
:
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
];
{
int
l
=
fielddefs
->
m_numModes
[
cnt
++
];
int
m
=
fielddefs
->
m_numModes
[
cnt
++
];
int
n
=
fielddefs
->
m_numModes
[
cnt
++
];
datasize
+=
l
*
m
*
n
;
}
break
;
default:
ASSERTL0
(
false
,
"Unsupported shape type."
);
...
...
@@ -961,13 +969,16 @@ namespace Nektar
case
eTriangle
:
{
int
l
=
fielddefs
->
m_numModes
[
cnt
++
];
int
m
=
fielddefs
->
m_numModes
[
cnt
++
];
datasize
+=
StdTriData
::
getNumberOfCoefficients
(
l
,
m
);
}
break
;
int
m
=
fielddefs
->
m_numModes
[
cnt
++
];
datasize
+=
StdTriData
::
getNumberOfCoefficients
(
l
,
m
);
}
break
;
case
eQuadrilateral
:
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
];
{
int
l
=
fielddefs
->
m_numModes
[
cnt
++
];
int
m
=
fielddefs
->
m_numModes
[
cnt
++
];
datasize
+=
l
*
m
;
}
break
;
case
eTetrahedron
:
{
...
...
@@ -994,10 +1005,12 @@ namespace Nektar
}
break
;
case
eHexahedron
:
datasize
+=
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
]
*
fielddefs
->
m_numModes
[
cnt
++
];
{
int
l
=
fielddefs
->
m_numModes
[
cnt
++
];
int
m
=
fielddefs
->
m_numModes
[
cnt
++
];
int
n
=
fielddefs
->
m_numModes
[
cnt
++
];
datasize
+=
l
*
m
*
n
;
}
break
;
default:
ASSERTL0
(
false
,
"Unsupported shape type."
);
...
...
library/LibUtilities/CMakeLists.txt
View file @
4a31d4db
...
...
@@ -306,10 +306,12 @@ ADD_DEFINITIONS(-DLIB_UTILITIES_EXPORTS)
ADD_NEKTAR_LIBRARY
(
LibUtilities lib
${
NEKTAR_LIBRARY_TYPE
}
${
LibUtilitySources
}
${
LibUtilityHeaders
}
)
TARGET_LINK_LIBRARIES
(
LibUtilities
${
Boost_THREAD_LIBRARY
}
${
Boost_DATE_TIME_LIBRARY
}
${
Boost_THREAD_LIBRARY
}
${
Boost_IOSTREAMS_LIBRARY
}
${
Boost_DATE_TIME_LIBRARY
}
${
Boost_PROGRAM_OPTIONS_LIBRARY
}
${
TINYXML_LIB
}
${
Boost_ZLIB_LIBRARY
}
${
TINYXML_LIB
}
)
SET_LAPACK_LINK_LIBRARIES
(
LibUtilities
)
...
...
Write
Preview
Supports
Markdown
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