Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
5714875a
Commit
5714875a
authored
Apr 26, 2018
by
Fanny CHOPOT
Browse files
Options
Downloads
Patches
Plain Diff
modification types sur Fl et Gl
parent
ee9eeaac
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/main.cpp
+2
-1
2 additions, 1 deletion
src/main.cpp
src/mesh/MeshData.hpp
+1
-1
1 addition, 1 deletion
src/mesh/MeshData.hpp
src/scheme/FiniteVolumesDiffusion.hpp
+39
-34
39 additions, 34 deletions
src/scheme/FiniteVolumesDiffusion.hpp
with
42 additions
and
36 deletions
src/main.cpp
+
2
−
1
View file @
5714875a
...
...
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
// }
{
// class for acoustic solver test
{
Kokkos
::
Timer
timer
;
timer
.
reset
();
Connectivity1D
connectivity
(
number
);
...
...
@@ -161,6 +161,7 @@ int main(int argc, char *argv[])
dt
=
tmax
-
t
;
}
std
::
cout
<<
"t="
<<
t
<<
" dt="
<<
dt
<<
'\n'
;
//acoustic_solver.computeNextStep(t,dt, unknowns);
finite_volumes_diffusion
.
computeNextStep
(
t
,
dt
,
unknowns
);
...
...
This diff is collapsed.
Click to expand it.
src/mesh/MeshData.hpp
+
1
−
1
View file @
5714875a
...
...
@@ -53,7 +53,7 @@ private:
}
KOKKOS_INLINE_FUNCTION
void
_updateVolume
()
void
_updateVolume
()
// A reflechir pour multiD
{
const
Kokkos
::
View
<
const
unsigned
int
**>&
cell_nodes
=
m_mesh
.
connectivity
().
cellNodes
();
...
...
This diff is collapsed.
Click to expand it.
src/scheme/FiniteVolumesDiffusion.hpp
+
39
−
34
View file @
5714875a
...
...
@@ -73,9 +73,9 @@ private:
}
};
// Calcule un F
jr
Kokkos
::
View
<
Rd
*
*>
computeF
jr
(
const
Kokkos
::
View
<
const
Rd
**>&
Cjr
,
// Calcule un F
l
Kokkos
::
View
<
Rd
d
*>
computeF
l
(
const
Kokkos
::
View
<
const
Rd
**>&
Cjr
,
const
Kokkos
::
View
<
const
Rd
*>&
uj
,
const
Kokkos
::
View
<
const
double
*>&
kj
)
{
const
Kokkos
::
View
<
const
unsigned
int
**>&
cell_nodes
=
m_connectivity
.
cellNodes
();
...
...
@@ -85,29 +85,29 @@ private:
Kokkos
::
parallel_for
(
m_mesh
.
numberOfCells
(),
KOKKOS_LAMBDA
(
const
int
&
j
)
{
for
(
int
r
=
0
;
r
<
cell_nb_nodes
[
j
];
++
r
)
{
m_F
jr
(
j
,
r
)
=
((
kj
(
cell_nodes
(
j
,
r
))
+
kj
(
cell_nodes
(
j
-
1
,
r
)))
/
(
2
*
Vl
(
j
)))
m_F
l
(
j
,
r
)
=
((
kj
(
cell_nodes
(
j
,
r
))
+
kj
(
cell_nodes
(
j
-
1
,
r
)))
/
(
2
*
Vl
(
j
)))
*
((
uj
(
j
,
r
),
Cjr
(
j
,
r
))
+
(
uj
(
j
-
1
,
r
),
Cjr
(
j
-
1
,
r
)))
;
//tensorProduct(uj(j,r),Cjr(j,r)) ?
}
});
return
m_F
jr
;
return
m_F
l
;
}
// Calcule un G
jr
Kokkos
::
View
<
d
ouble
*
*>
computeG
jr
(
const
Kokkos
::
View
<
const
Rd
*>&
uj
,
const
Kokkos
::
View
<
const
Rd
*
*>&
F
jr
)
{
// Calcule un G
l
Kokkos
::
View
<
R
d
*>
computeG
l
(
const
Kokkos
::
View
<
const
Rd
*>&
uj
,
const
Kokkos
::
View
<
const
Rd
d
*>&
F
l
)
{
const
Kokkos
::
View
<
const
unsigned
int
**>&
cell_nodes
=
m_connectivity
.
cellNodes
();
const
Kokkos
::
View
<
const
unsigned
short
*>
cell_nb_nodes
=
m_connectivity
.
cellNbNodes
();
Kokkos
::
parallel_for
(
m_mesh
.
numberOfCells
(),
KOKKOS_LAMBDA
(
const
int
&
j
)
{
for
(
int
r
=
0
;
r
<
cell_nb_nodes
[
j
];
++
r
)
{
m_G
jr
(
j
,
r
)
=
0.5
*
((
uj
(
cell_nodes
(
j
,
r
))
+
uj
(
cell_nodes
(
j
-
1
,
r
))),
Fjr
(
j
,
r
));
m_G
l
(
j
,
r
)
=
0.5
*
((
uj
(
cell_nodes
(
j
,
r
))
+
uj
(
cell_nodes
(
j
-
1
,
r
))),
Fjr
(
j
,
r
));
}
});
return
m_G
jr
;
return
m_G
l
;
}
// Calcule la liste des inverse d'une liste de matrices
...
...
@@ -134,14 +134,14 @@ private:
void
computeExplicitFluxes
(
const
Kokkos
::
View
<
const
Rd
*>&
uj
,
const
Kokkos
::
View
<
const
Rd
**>&
Cjr
,
const
Kokkos
::
View
<
const
double
*>&
kj
)
{
Kokkos
::
View
<
Rd
*
*>
F
jr
=
m_F
jr
;
F
jr
=
computeF
jr
(
Cjr
,
uj
,
kj
);
Kokkos
::
View
<
double
**>
G
jr
=
m_G
jr
;
G
jr
=
computeG
jr
(
uj
,
F
jr
);
Kokkos
::
View
<
Rd
d
*>
F
l
=
m_F
l
;
F
l
=
computeF
l
(
Cjr
,
uj
,
kj
);
Kokkos
::
View
<
double
**>
G
l
=
m_G
l
;
G
l
=
computeG
l
(
uj
,
F
l
);
}
Kokkos
::
View
<
Rd
*
*>
m_F
jr
;
Kokkos
::
View
<
d
ouble
*
*>
m_G
jr
;
Kokkos
::
View
<
Rd
d
*>
m_F
l
;
Kokkos
::
View
<
R
d
*>
m_G
l
;
public
:
FiniteVolumesDiffusion
(
MeshData
&
mesh_data
,
...
...
@@ -149,8 +149,8 @@ public:
:
m_mesh_data
(
mesh_data
),
m_mesh
(
mesh_data
.
mesh
()),
m_connectivity
(
m_mesh
.
connectivity
()),
m_F
jr
(
"F
jr
"
,
m_mesh
.
numberOf
Cells
(),
m_connectivity
.
maxNbNodePerCell
()),
m_G
jr
(
"G
jr
"
,
m_mesh
.
numberOf
Cells
(),
m_connectivity
.
maxNbNodePerCell
())
m_F
l
(
"F
l
"
,
m_mesh
.
numberOf
Faces
()),
m_G
l
(
"G
l
"
,
m_mesh
.
numberOf
Faces
())
{
;
}
...
...
@@ -160,28 +160,33 @@ public:
KOKKOS_INLINE_FUNCTION
double
diffusion_dt
(
const
Kokkos
::
View
<
const
double
*>&
rhoj
,
const
Kokkos
::
View
<
const
double
*>&
kj
)
const
{
Kokkos
::
View
<
double
*>
dt_j
(
"dt_j"
,
m_mesh
.
numberOfCells
());
const
Kokkos
::
View
<
const
Rd
**>
Cjr
=
m_mesh_data
.
Cjr
();
const
Kokkos
::
View
<
const
double
*>&
Vl
=
m_mesh_data
.
Vl
();
const
Kokkos
::
View
<
const
double
*>&
Vj
=
m_mesh_data
.
Vj
();
const
Kokkos
::
View
<
const
unsigned
int
**>&
cell_faces
=
m_connectivity
.
cellFaces
();
const
Kokkos
::
View
<
const
unsigned
short
*>
cell_nb_faces
=
m_connectivity
.
cellNbFaces
();
Kokkos
::
parallel_for
(
m_mesh
.
numberOfCells
(),
KOKKOS_LAMBDA
(
const
int
&
j
){
dt_j
[
j
]
=
0.5
*
rhoj
(
j
)
*
Vj
(
j
)
*
(
2.
/
(
kj
(
j
+
1
)
+
2
*
kj
(
j
)
+
kj
(
j
-
1
)))
*
std
::
min
(
Vl
(
j
),
Vl
(
j
-
1
));
// ATTENTION : kj != 0 !
// * std::min(xj(j+1)-xj(j), xj(j)-xj(j-1));
// * std::min((Dxj(j+1),Cjr(j,1)) + (xj(j),Cjr(j,0)),
//(xj(j),Cjr(j,1)) + (xj(j-1),Cjr(j,0)) );
//dt_j[j] = 0.0001;
std
::
cout
<<
Vl
(
j
)
<<
std
::
endl
;
//std::cout << std::min(Dj(j),Dj(j-1)) << std::endl;
// Le probleme vient aussi de Dj
});
double
minVl
=
std
::
numeric_limits
<
double
>::
max
();
for
(
int
ll
=
0
;
ll
<
cell_nb_faces
(
j
);
++
ll
)
{
minVl
=
std
::
min
(
minVl
,
Vl
(
cell_faces
(
j
,
ll
)));
}
// k=1 => (kj(j+1) + 2*kj(j) + kj(j-1)) = 4
dt_j
[
j
]
=
0.5
*
rhoj
(
j
)
*
Vj
(
j
)
*
(
2.
/
4
)
*
minVl
;
});
// for (int j=0; j<m_mesh.numberOfCells(); ++j) {
// std::cout << "dt_j[" << j << "]=" << dt_j[j] << '\n';
// }
double
dt
=
std
::
numeric_limits
<
double
>::
max
();
Kokkos
::
parallel_reduce
(
m_mesh
.
numberOfCells
(),
ReduceMin
(
dt_j
),
dt
);
// std::cout << dt << std::endl;
// std::exit(0);
return
dt
;
}
...
...
@@ -205,8 +210,8 @@ public:
// Calcule les flux
computeExplicitFluxes
(
uj
,
Cjr
,
kj
);
const
Kokkos
::
View
<
const
Rd
*
*>
F
jr
=
m_F
jr
;
const
Kokkos
::
View
<
const
double
*
*>
G
jr
=
m_G
jr
;
const
Kokkos
::
View
<
const
Rd
d
*>
F
l
=
m_F
l
;
const
Kokkos
::
View
<
const
Rd
*>
G
l
=
m_G
l
;
const
Kokkos
::
View
<
const
unsigned
short
*>
cell_nb_nodes
=
m_connectivity
.
cellNbNodes
();
...
...
@@ -216,8 +221,8 @@ public:
Rd
momentum_fluxes
=
zero
;
double
energy_fluxes
=
0
;
for
(
int
R
=
0
;
R
<
cell_nb_nodes
[
j
];
++
R
)
{
momentum_fluxes
+=
F
jr
(
j
,
R
);
energy_fluxes
+=
G
jr
(
j
,
R
);
momentum_fluxes
+=
F
l
(
j
,
R
);
energy_fluxes
+=
G
l
(
j
,
R
);
}
uj
[
j
]
-=
(
dt
*
inv_mj
[
j
])
*
momentum_fluxes
;
Ej
[
j
]
-=
(
dt
*
inv_mj
[
j
])
*
energy_fluxes
;
...
...
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