Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fluidparticles
MigFlow
Commits
fd9ce46f
Commit
fd9ce46f
authored
Oct 06, 2020
by
Michel Henry
Browse files
retrait des print inutiles
parent
7791a184
Pipeline
#8460
failed with stages
in 4 minutes and 26 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
fluid/fluid_problem.c
View file @
fd9ce46f
...
...
@@ -1211,9 +1211,9 @@ void fluid_problem_apply_boundary_conditions(FluidProblem *problem)
static
void
fluid_problem_compute_node_volume
(
FluidProblem
*
problem
)
{
free
(
problem
->
node_volume
);
Mesh
*
mesh
=
problem
->
mesh
;
problem
->
node_volume
=
(
double
*
)
malloc
(
sizeof
(
double
)
*
mesh
->
n_nodes
);
problem
->
node_volume
=
malloc
(
sizeof
(
double
)
*
mesh
->
n_nodes
);
int
independent_nodes
=
mesh
->
n_nodes
-
mesh
->
n_periodic
;
double
*
periodic_node_volume
=
(
double
*
)
malloc
(
sizeof
(
double
)
*
independent_nodes
);
double
*
periodic_node_volume
=
malloc
(
sizeof
(
double
)
*
independent_nodes
);
for
(
int
i
=
0
;
i
<
independent_nodes
;
++
i
){
periodic_node_volume
[
i
]
=
0
;
}
...
...
@@ -1223,9 +1223,10 @@ static void fluid_problem_compute_node_volume(FluidProblem *problem) {
const
int
*
el
=
&
mesh
->
elements
[
iel
*
N_N
];
const
double
detj
=
mesh_dxidx
(
mesh
,
iel
,
dxidx
);
const
double
vol
=
node_volume_from_detj
(
detj
);
for
(
int
i
=
0
;
i
<
N_N
;
++
i
)
// problem->node_volume[el[i]] += vol;
for
(
int
i
=
0
;
i
<
N_N
;
++
i
){
periodic_node_volume
[
periodic_mapping
[
el
[
i
]]]
+=
vol
;
// problem->node_volume[el[i]] += vol;
}
}
for
(
int
i
=
0
;
i
<
problem
->
mesh
->
n_nodes
;
++
i
){
problem
->
node_volume
[
i
]
=
periodic_node_volume
[
periodic_mapping
[
i
]];
...
...
@@ -1236,7 +1237,7 @@ static void fluid_problem_compute_node_volume(FluidProblem *problem) {
static
void
compute_porosity
(
Mesh
*
mesh
,
double
*
node_volume
,
double
*
porosity
,
int
n_particles
,
double
*
particle_position
,
double
*
particle_volume
,
int
*
particle_element_id
,
double
*
particle_uvw
)
{
int
independent_nodes
=
mesh
->
n_nodes
-
mesh
->
n_periodic
;
double
*
periodic_porosity
=
(
double
*
)
malloc
(
sizeof
(
double
)
*
independent_nodes
);
double
*
periodic_porosity
=
malloc
(
sizeof
(
double
)
*
independent_nodes
);
for
(
int
i
=
0
;
i
<
independent_nodes
;
++
i
){
periodic_porosity
[
i
]
=
0
;
}
...
...
fluid/mesh.c
View file @
fd9ce46f
...
...
@@ -182,7 +182,6 @@ Mesh *mesh_load_msh(const char *filename)
}
for
(
int
i
=
0
;
i
<
n_enodes
;
++
i
)
{
m
->
elements
[
i
]
=
get_node_id
(
m
->
elements
[
i
],
nodes_map
,
m
->
n_nodes
);
printf
(
"m->elements[%d] = %d
\n
"
,
i
,
m
->
elements
[
i
]);
}
...
...
testcases/periodicTest/mesh.geo
View file @
fd9ce46f
L = 1;
H = 1;
y = 0;
lc =
1;//
0.05;
lc = 0.05;
Point(1) = {0,0,0,lc};
Point(2) = {L,0,0,lc};
...
...
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