Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openfpm_numerics
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
yaskovet
openfpm_numerics
Commits
05dc042b
Commit
05dc042b
authored
6 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Patches
Plain Diff
Numerics fixed test for GCC7
parent
362f5173
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/FiniteDifference/eq_unit_test.cpp
+6
-1
6 additions, 1 deletion
src/FiniteDifference/eq_unit_test.cpp
src/FiniteDifference/eq_unit_test_3d.cpp
+6
-1
6 additions, 1 deletion
src/FiniteDifference/eq_unit_test_3d.cpp
src/Vector/Vector_petsc.hpp
+2
-3
2 additions, 3 deletions
src/Vector/Vector_petsc.hpp
with
14 additions
and
5 deletions
src/FiniteDifference/eq_unit_test.cpp
+
6
−
1
View file @
05dc042b
...
@@ -249,7 +249,12 @@ template<typename solver_type,typename lid_nn> void lid_driven_cavity_2d()
...
@@ -249,7 +249,12 @@ template<typename solver_type,typename lid_nn> void lid_driven_cavity_2d()
#else
#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
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"
;
std
::
string
file2
=
s
+
"lid_driven_cavity_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
".vtk"
;
...
...
This diff is collapsed.
Click to expand it.
src/FiniteDifference/eq_unit_test_3d.cpp
+
6
−
1
View file @
05dc042b
...
@@ -214,7 +214,12 @@ template<typename solver_type,typename lid_nn_3d> void lid_driven_cavity_3d()
...
@@ -214,7 +214,12 @@ template<typename solver_type,typename lid_nn_3d> void lid_driven_cavity_3d()
#else
#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
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"
;
std
::
string
file2
=
s
+
"lid_driven_cavity_3d_p"
+
std
::
to_string
(
v_cl
.
getProcessingUnits
())
+
"_grid_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
".vtk"
;
...
...
This diff is collapsed.
Click to expand it.
src/Vector/Vector_petsc.hpp
+
2
−
3
View file @
05dc042b
...
@@ -106,7 +106,7 @@ class Vector<T,PETSC_BASE>
...
@@ -106,7 +106,7 @@ class Vector<T,PETSC_BASE>
mutable
Vec
v
;
mutable
Vec
v
;
//! Mutable row value vector
//! 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
//! Global to local map
mutable
std
::
unordered_map
<
size_t
,
size_t
>
map
;
mutable
std
::
unordered_map
<
size_t
,
size_t
>
map
;
...
@@ -123,11 +123,10 @@ class Vector<T,PETSC_BASE>
...
@@ -123,11 +123,10 @@ class Vector<T,PETSC_BASE>
if
(
v_created
==
false
)
if
(
v_created
==
false
)
{
PETSC_SAFE_CALL
(
VecSetType
(
v
,
VECMPI
));}
{
PETSC_SAFE_CALL
(
VecSetType
(
v
,
VECMPI
));}
// set the vector
// set the vector
if
(
row_val
.
size
()
!=
0
)
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
(
VecAssemblyBegin
(
v
));
PETSC_SAFE_CALL
(
VecAssemblyEnd
(
v
));
PETSC_SAFE_CALL
(
VecAssemblyEnd
(
v
));
...
...
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