Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Docker-in-Docker (DinD) capabilities of public runners deactivated.
More info
Open sidebar
Xavier Garrido
CAMEL
Commits
756f870e
Commit
756f870e
authored
Sep 04, 2017
by
Plaszczynski Stephane
Browse files
un peu d'ordre c'est la rentree
parent
2b456219
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
8 deletions
+11
-8
src/camel/Class/ClassEngine.cc
src/camel/Class/ClassEngine.cc
+1
-3
src/camel/Class/ClassEngine.hh
src/camel/Class/ClassEngine.hh
+1
-0
src/camel/Class/MnClassEngine.hh
src/camel/Class/MnClassEngine.hh
+1
-0
src/camel/exec/writePk.cc
src/camel/exec/writePk.cc
+8
-5
No files found.
src/camel/Class/ClassEngine.cc
View file @
756f870e
...
...
@@ -760,13 +760,11 @@ ClassEngine::get_PkNLNodes(std::vector<double>& knodes,std::vector<double>& pkno
knodes
.
resize
(
sp
.
ln_k_size
);
pknodes
.
resize
(
sp
.
ln_k_size
);
int
index_mode
=
0
;
int
index_ic1_ic2
=
0
;
int
index_eta
=
sp
.
ln_tau_size
-
1
;
for
(
int
index_k
=
0
;
index_k
<
sp
.
ln_k_size
;
index_k
++
){
knodes
[
index_k
]
=
std
::
exp
(
sp
.
ln_k
[
index_k
]);
pknodes
[
index_k
]
=
std
::
exp
(
sp
.
ln_pk_nl
[
(
index_eta
*
sp
.
ln_k_size
+
index_k
)
*
sp
.
ic_ic_size
[
index_mode
]
+
index_ic1_ic2
]);
pknodes
[
index_k
]
=
std
::
exp
(
sp
.
ln_pk_nl
[
index_eta
*
sp
.
ln_k_size
+
index_k
]);
}
return
_SUCCESS_
;
...
...
src/camel/Class/ClassEngine.hh
View file @
756f870e
...
...
@@ -193,6 +193,7 @@ public:
//expansion
inline
double
get_H0
()
const
{
return
ba
.
H0
*
_c_
/
1e3
;}
inline
double
get_h
()
const
{
return
get_H0
()
/
100.
;}
inline
double
theta
()
const
{
return
th
.
rs_rec
/
th
.
ra_rec
;}
inline
double
Omega_m
()
const
{
return
ba
.
Omega0_b
+
ba
.
Omega0_cdm
+
ba
.
Omega0_ncdm_tot
;}
...
...
src/camel/Class/MnClassEngine.hh
View file @
756f870e
...
...
@@ -84,6 +84,7 @@ public:
double
get_tau_reio
()
const
{
return
klass
->
get_tau_reio
();}
double
get_z_reio
()
const
{
return
klass
->
get_z_reio
();}
double
get_H0
()
const
{
return
klass
->
get_H0
();}
double
get_h
()
const
{
return
klass
->
get_h
();}
double
theta
()
const
{
return
klass
->
theta
();}
double
YHe
()
const
{
return
klass
->
YHe
();}
double
Omega_m
()
const
{
return
klass
->
Omega_m
();}
...
...
src/camel/exec/writePk.cc
View file @
756f870e
...
...
@@ -59,7 +59,7 @@ int main(int argc,char** argv){
float
z0
=
0.
;
if
(
argc
==
4
)
z0
=
atof
(
argv
[
3
]);
//decodage arguments
Parser
parser
(
argv
[
1
]);
...
...
@@ -146,6 +146,7 @@ int main(int argc,char** argv){
cout
<<
"Computing P(k) at z="
<<
z0
<<
endl
;
ClassEngine
*
klass
=
e
->
getClass
();
cout
<<
"Omega_m="
<<
e
->
Omega_m
()
<<
"
\t
omega_m="
<<
e
->
Omega_m
()
*
e
->
get_h
()
*
e
->
get_h
()
<<
endl
;
cout
<<
"sigma8(0)="
<<
e
->
get_sigma8
(
0
)
<<
"
\t
sigma8("
<<
z0
<<
")="
<<
e
->
get_sigma8
(
z0
)
<<
endl
;
...
...
@@ -188,13 +189,15 @@ int main(int argc,char** argv){
{
std
::
vector
<
fitscolumn
>
pkcols
;
pkcols
.
push_back
(
fitscolumn
(
"knode"
,
"1/Mpc"
,
1
,
TDOUBLE
));
pkcols
.
push_back
(
fitscolumn
(
"pklin
node
"
,
"(Mpc)^3"
,
1
,
TDOUBLE
));
if
(
do_nl
)
pkcols
.
push_back
(
fitscolumn
(
"pkn
oden
l"
,
"(Mpc)^3"
,
1
,
TDOUBLE
));
pkcols
.
push_back
(
fitscolumn
(
"pklin"
,
"(Mpc)^3"
,
1
,
TDOUBLE
));
if
(
do_nl
)
pkcols
.
push_back
(
fitscolumn
(
"pknl"
,
"(Mpc)^3"
,
1
,
TDOUBLE
));
fout
.
insert_bintab
(
pkcols
);
vector
<
double
>
knode
,
pknode
,
pknodeNL
;
klass
->
get_PkNodes
(
knode
,
pknode
);
if
(
do_nl
)
klass
->
get_PkNLNodes
(
knode
,
pknodeNL
);
klass
->
get_PklinNodes
(
knode
,
pknode
);
if
(
do_nl
)
klass
->
get_PkNLNodes
(
knode
,
pknodeNL
);
for
(
size_t
i
=
0
;
i
<
knode
.
size
();
i
++
){
fout
.
write_column
(
1
,
knode
[
i
],
i
);
...
...
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