Skip to content
GitLab
Explore
Sign in
Giacomo Mulas
NP_TMcode
Compare revisions
f88ad025d4f52271ab01529af42177af5d7c558a to 7a63a072a17ca1b22613e27aa858db026944b9a3
Commits on Source (2)
Fix valgrind detected invalid read
· 6231c601
Giovanni La Mura
authored
Apr 19, 2024
6231c601
Always use a proprietary vector to define configuration scales
· 7a63a072
Giovanni La Mura
authored
Apr 19, 2024
7a63a072
Hide whitespace changes
Inline
Side-by-side
src/libnptm/Configuration.cpp
View file @
7a63a072
...
@@ -297,9 +297,10 @@ ScattererConfiguration::ScattererConfiguration(
...
@@ -297,9 +297,10 @@ ScattererConfiguration::ScattererConfiguration(
exdc
=
ex
;
exdc
=
ex
;
wp
=
w
;
wp
=
w
;
xip
=
x
;
xip
=
x
;
if
(
variable_name
==
"XIV"
)
scale_vec
=
scale_vector
;
scale_vec
=
new
double
[
number_of_scales
]();
else
{
if
(
variable_name
==
"XIV"
)
{
scale_vec
=
new
double
[
number_of_scales
]();
for
(
int
xi
=
0
;
xi
<
nxi
;
xi
++
)
scale_vec
[
xi
]
=
scale_vector
[
xi
];
}
else
{
const
double
pi2
=
2.0
*
acos
(
-
1.0
);
const
double
pi2
=
2.0
*
acos
(
-
1.0
);
const
double
evc
=
6.5821188e-16
;
const
double
evc
=
6.5821188e-16
;
for
(
int
si
=
0
;
si
<
number_of_scales
;
si
++
)
{
for
(
int
si
=
0
;
si
<
number_of_scales
;
si
++
)
{
...
@@ -312,6 +313,7 @@ ScattererConfiguration::ScattererConfiguration(
...
@@ -312,6 +313,7 @@ ScattererConfiguration::ScattererConfiguration(
}
}
}
}
}
}
ScattererConfiguration
::
ScattererConfiguration
(
const
ScattererConfiguration
&
rhs
)
ScattererConfiguration
::
ScattererConfiguration
(
const
ScattererConfiguration
&
rhs
)
{
{
number_of_spheres
=
rhs
.
number_of_spheres
;
number_of_spheres
=
rhs
.
number_of_spheres
;
...
@@ -642,6 +644,7 @@ ScattererConfiguration* ScattererConfiguration::from_dedfb(string dedfb_file_nam
...
@@ -642,6 +644,7 @@ ScattererConfiguration* ScattererConfiguration::from_dedfb(string dedfb_file_nam
_xip
_xip
);
);
delete
[]
file_lines
;
delete
[]
file_lines
;
delete
[]
variable_vector
;
return
config
;
return
config
;
}
}
...
...
src/sphere/sphere.cpp
View file @
7a63a072
...
@@ -225,7 +225,7 @@ void sphere(string config_file, string data_file, string output_path) {
...
@@ -225,7 +225,7 @@ void sphere(string config_file, string data_file, string output_path) {
c1
->
rc
[
i116
][
j115
]
=
sconf
->
get_rcf
(
i116
,
j115
)
*
c1
->
ros
[
i116
];
c1
->
rc
[
i116
][
j115
]
=
sconf
->
get_rcf
(
i116
,
j115
)
*
c1
->
ros
[
i116
];
}
}
}
}
gcs
+=
c1
->
gcsv
[
iogi
];
gcs
+=
c1
->
gcsv
[
iogi
-
1
];
}
}
double
****
zpv
=
new
double
***
[
l_max
];
//[l_max][3][2][2]; // Matrix: dim[LM x 3 x 2 x 2]
double
****
zpv
=
new
double
***
[
l_max
];
//[l_max][3][2][2]; // Matrix: dim[LM x 3 x 2 x 2]
for
(
int
zi
=
0
;
zi
<
l_max
;
zi
++
)
{
for
(
int
zi
=
0
;
zi
<
l_max
;
zi
++
)
{
...
...