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
Open sidebar
Xavier Garrido
CAMEL
Commits
2b456219
Commit
2b456219
authored
Aug 30, 2017
by
Plaszczynski Stephane
Browse files
remove _nonlin
parent
b5c4ec5c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
src/camel/Class/ClassEngine.cc
src/camel/Class/ClassEngine.cc
+3
-3
src/camel/Class/ClassEngine.hh
src/camel/Class/ClassEngine.hh
+0
-1
src/camel/Engine.cc
src/camel/Engine.cc
+1
-1
src/camel/Engine.hh
src/camel/Engine.hh
+0
-1
No files found.
src/camel/Class/ClassEngine.cc
View file @
2b456219
...
...
@@ -112,7 +112,7 @@ ClassEngine::ClassEngine(const ClassParams& pars): cl(0),dofree(true),pvecback(0
if
(
pars
.
key
(
i
)
==
"output"
)
_output
=
pars
.
value
(
i
);
//is nonlinear set
if
(
pars
.
key
(
i
)
==
"non linear"
)
_nonlin
=
true
;
//
if (pars.key(i)=="non linear") _nonlin=true;
}
//input
...
...
@@ -165,7 +165,7 @@ ClassEngine::ClassEngine(const ClassParams& pars,const string & precision_file):
//store class output
if
(
pars
.
key
(
i
)
==
"output"
)
_output
=
pars
.
value
(
i
);
//is nonlinear set?
if
(
pars
.
key
(
i
)
==
"non linear"
)
_nonlin
=
true
;
//
if (pars.key(i)=="non linear") _nonlin=true;
}
...
...
@@ -728,7 +728,7 @@ double ClassEngine::get_DMod(double z){
bool
ClassEngine
::
get_Pkvec
(
const
std
::
vector
<
double
>&
knodes
,
const
std
::
vector
<
double
>&
zvec
,
std
::
vector
<
double
>&
pks
)
{
return
(
_nonlin
?
return
(
has_PkNL
()
?
(
spectra_fast_pk_nl_at_kvec_and_zvec
(
&
ba
,
&
sp
,
const_cast
<
double
*>
(
&
knodes
[
0
]),
knodes
.
size
(),
const_cast
<
double
*>
(
&
zvec
[
0
]),
zvec
.
size
(),
&
pks
[
0
])
==
_TRUE_
)
:
(
spectra_fast_pk_at_kvec_and_zvec
(
&
ba
,
&
sp
,
const_cast
<
double
*>
(
&
knodes
[
0
]),
knodes
.
size
(),
const_cast
<
double
*>
(
&
zvec
[
0
]),
zvec
.
size
(),
&
pks
[
0
])
==
_TRUE_
)
);
...
...
src/camel/Class/ClassEngine.hh
View file @
2b456219
...
...
@@ -260,7 +260,6 @@ private:
protected:
std
::
string
_output
;
double
*
pvecback
;
// helper to avoid too much allocations
...
...
src/camel/Engine.cc
View file @
2b456219
...
...
@@ -31,7 +31,7 @@ using namespace std;
//---------------
// Constructors --
//----------------
Engine
::
Engine
()
:
_lmax
(
-
1
)
,
_nonlin
(
false
)
Engine
::
Engine
()
:
_lmax
(
-
1
)
{
}
//--------------
...
...
src/camel/Engine.hh
View file @
2b456219
...
...
@@ -129,7 +129,6 @@ public:
protected:
int
_lmax
;
bool
_nonlin
;
virtual
double
undef
(
const
char
*
msg
)
const
;
};
...
...
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