Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Micropp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ggiuntol
Micropp
Commits
8bb43b8f
Commit
8bb43b8f
authored
Aug 10, 2019
by
Guido Giuntoli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing some warnings
parent
3cd117f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
src/micro_common.cpp
src/micro_common.cpp
+8
-7
test/benchmark-mic-4.cpp
test/benchmark-mic-4.cpp
+2
-2
No files found.
src/micro_common.cpp
View file @
8bb43b8f
...
...
@@ -355,7 +355,7 @@ void micropp<tdim>::calc_ctan_lin_mixture_rule_Chamis(double ctan[nvoi * nvoi])
ctan
[
1
*
nvoi
+
1
]
=
c11
/
det
;
ctan
[
1
*
nvoi
+
2
]
=
c12
/
det
;
ctan
[
2
*
nvoi
+
0
]
=
c
12
/
det
;
ctan
[
2
*
nvoi
+
0
]
=
c
20
/
det
;
ctan
[
2
*
nvoi
+
1
]
=
c21
/
det
;
ctan
[
2
*
nvoi
+
2
]
=
c22
/
det
;
...
...
@@ -479,7 +479,7 @@ int micropp<tdim>::get_elem_type(int ex, int ey, int ez) const
const
double
rad
=
geo_params
[
0
];
const
double
center
[
3
]
=
{
lx
/
2
,
ly
/
2
,
lz
/
2
};
// 2D lz = 0
double
tmp
=
0.
;
return
point_inside_sphere
(
center
,
rad
,
coor
);
}
else
if
(
micro_type
==
MIC_LAYER_Y
)
{
// 2 flat layers in y dir
...
...
@@ -678,10 +678,10 @@ int micropp<tdim>::get_elem_type(int ex, int ey, int ez) const
/*
* returns
* 0 : for the
cilinders
* 1 : for the
layer around the
cilinders
*
1 : for the flat layer
* 2 : for the
matrix
* 0 : for the
matrix
* 1 : for the cilinders
*
2 : for the layer around the cilinders
* 2 : for the
flat layer
*
*/
...
...
@@ -708,7 +708,8 @@ int micropp<tdim>::get_elem_type(int ex, int ey, int ez) const
if
(
point_inside_cilinder_inf
(
dir_z
,
cen_1
,
rad_cilinder
+
width_cili_layer
,
coor
)
||
point_inside_cilinder_inf
(
dir_z
,
cen_2
,
rad_cilinder
+
width_cili_layer
,
coor
)
||
point_inside_cilinder_inf
(
dir_x
,
cen_3
,
rad_cilinder
+
width_cili_layer
,
coor
)
||
point_inside_cilinder_inf
(
dir_x
,
cen_4
,
rad_cilinder
+
width_cili_layer
,
coor
))
{
point_inside_cilinder_inf
(
dir_x
,
cen_4
,
rad_cilinder
+
width_cili_layer
,
coor
)
||
fabs
(
coor
[
1
]
-
ly
/
2
)
<
width_flat_layer
)
{
return
2
;
}
...
...
test/benchmark-mic-4.cpp
View file @
8bb43b8f
...
...
@@ -98,6 +98,7 @@ int main(int argc, char **argv)
ofstream
file
;
file
.
open
(
"result.dat"
);
file
<<
scientific
<<
setw
(
14
);
auto
start
=
high_resolution_clock
::
now
();
...
...
@@ -150,8 +151,7 @@ int main(int argc, char **argv)
micro
.
update_vars
();
file
<<
setw
(
14
)
<<
eps
[
dir
]
<<
"
\t
"
file
<<
eps
[
dir
]
<<
"
\t
"
<<
sig
[
dir
]
<<
"
\t
"
<<
endl
;
if
(
print
)
{
...
...
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