Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
openfpm_numerics
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openfpm
openfpm_numerics
Commits
05dc042b
Commit
05dc042b
authored
Dec 01, 2018
by
incardon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Numerics fixed test for GCC7
parent
362f5173
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
src/FiniteDifference/eq_unit_test.cpp
src/FiniteDifference/eq_unit_test.cpp
+6
-1
src/FiniteDifference/eq_unit_test_3d.cpp
src/FiniteDifference/eq_unit_test_3d.cpp
+6
-1
src/Vector/Vector_petsc.hpp
src/Vector/Vector_petsc.hpp
+2
-3
No files found.
src/FiniteDifference/eq_unit_test.cpp
View file @
05dc042b
...
...
@@ -249,7 +249,12 @@ template<typename solver_type,typename lid_nn> void lid_driven_cavity_2d()
#else
#if __GNUC__ == 6
#if __GNUC__ == 7
std
::
string
file1
=
std
::
string
(
"test/"
)
+
s
+
"lid_driven_cavity_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
"_test_GCC7.vtk"
;
std
::
string
file2
=
s
+
"lid_driven_cavity_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
".vtk"
;
#elif __GNUC__ == 6
std
::
string
file1
=
std
::
string
(
"test/"
)
+
s
+
"lid_driven_cavity_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
"_test_GCC6.vtk"
;
std
::
string
file2
=
s
+
"lid_driven_cavity_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
".vtk"
;
...
...
src/FiniteDifference/eq_unit_test_3d.cpp
View file @
05dc042b
...
...
@@ -214,7 +214,12 @@ template<typename solver_type,typename lid_nn_3d> void lid_driven_cavity_3d()
#else
#if __GNUC__ == 5
#if __GNUC__ == 7
std
::
string
file1
=
std
::
string
(
"test/"
)
+
s
+
"lid_driven_cavity_3d_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
"_test_GCC7.vtk"
;
std
::
string
file2
=
s
+
"lid_driven_cavity_3d_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
".vtk"
;
#elif __GNUC__ == 5
std
::
string
file1
=
std
::
string
(
"test/"
)
+
s
+
"lid_driven_cavity_3d_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
"_test_GCC5.vtk"
;
std
::
string
file2
=
s
+
"lid_driven_cavity_3d_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
".vtk"
;
...
...
src/Vector/Vector_petsc.hpp
View file @
05dc042b
...
...
@@ -106,7 +106,7 @@ class Vector<T,PETSC_BASE>
mutable
Vec
v
;
//! Mutable row value vector
mutable
openfpm
::
vector
<
rval
<
PetscScalar
,
PETSC_RVAL
>
,
HeapMemory
,
typename
memory_traits_inte
<
rval
<
PetscScalar
,
PETSC_RVAL
>>::
type
>
row_val
;
mutable
openfpm
::
vector
<
rval
<
PetscScalar
,
PETSC_RVAL
>
,
HeapMemory
,
typename
memory_traits_inte
<
rval
<
PetscScalar
,
PETSC_RVAL
>>::
type
,
memory_traits_inte
>
row_val
;
//! Global to local map
mutable
std
::
unordered_map
<
size_t
,
size_t
>
map
;
...
...
@@ -123,11 +123,10 @@ class Vector<T,PETSC_BASE>
if
(
v_created
==
false
)
{
PETSC_SAFE_CALL
(
VecSetType
(
v
,
VECMPI
));}
// set the vector
if
(
row_val
.
size
()
!=
0
)
PETSC_SAFE_CALL
(
VecSetValues
(
v
,
row_val
.
size
(),
&
row_val
.
template
get
<
row_id
>(
0
),
&
row_val
.
template
get
<
val_id
>(
0
),
INSERT_VALUES
))
{
PETSC_SAFE_CALL
(
VecSetValues
(
v
,
row_val
.
size
(),
&
row_val
.
template
get
<
row_id
>(
0
),
&
row_val
.
template
get
<
val_id
>(
0
),
INSERT_VALUES
))}
PETSC_SAFE_CALL
(
VecAssemblyBegin
(
v
));
PETSC_SAFE_CALL
(
VecAssemblyEnd
(
v
));
...
...
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