Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
qbox-public
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
qbox
qbox-public
Compare Revisions
40e81ab374c6c4a3b971fbe88f2920f2788f1ed4...07b367619a6176a06d9a0ddeb796a92b14560388
Source
07b367619a6176a06d9a0ddeb796a92b14560388
Select Git revision
...
Target
40e81ab374c6c4a3b971fbe88f2920f2788f1ed4
Select Git revision
Compare
Commits (6)
Update release.C
· 3be61852
Francois Gygi
committed
May 02, 2020
3be61852
Remove tabs in ExchangeOperator.C
· 9f4d98fd
Francois Gygi
committed
May 02, 2020
9f4d98fd
Fix gaussian normalization in SpectrumCmd.C
· 94915e6e
Francois Gygi
committed
May 02, 2020
94915e6e
Fix output formatting in SpectrumCmd.C
· cb15c6c0
Francois Gygi
committed
May 02, 2020
cb15c6c0
Merge branch 'develop'
· e971a4a6
Francois Gygi
committed
May 02, 2020
e971a4a6
rel1_69_1
· 07b36761
Francois Gygi
committed
May 02, 2020
07b36761
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
5 deletions
+13
-5
ExchangeOperator.C
src/ExchangeOperator.C
+3
-3
SpectrumCmd.C
src/SpectrumCmd.C
+3
-1
notes
src/notes
+6
-0
release.C
src/release.C
+1
-1
No files found.
src/ExchangeOperator.C
View file @
07b36761
...
@@ -293,7 +293,7 @@ void ExchangeOperator::apply_VXC_(double mix, Wavefunction& wf_ref,
...
@@ -293,7 +293,7 @@ void ExchangeOperator::apply_VXC_(double mix, Wavefunction& wf_ref,
DoubleMatrix
cref_proxy
(
wf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
DoubleMatrix
cref_proxy
(
wf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
DoubleMatrix
dcref_proxy
(
dwf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
DoubleMatrix
dcref_proxy
(
dwf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
int
nb
=
c_proxy
.
nb
();
int
nb
=
c_proxy
.
nb
();
DoubleMatrix
matproj1
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
DoubleMatrix
matproj1
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
DoubleMatrix
matproj2
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
DoubleMatrix
matproj2
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
DoubleMatrix
matenergy
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
DoubleMatrix
matenergy
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
...
@@ -325,8 +325,8 @@ void ExchangeOperator::apply_VXC_(double mix, Wavefunction& wf_ref,
...
@@ -325,8 +325,8 @@ void ExchangeOperator::apply_VXC_(double mix, Wavefunction& wf_ref,
ComplexMatrix
&
dc
(
dwf
.
sd
(
ispin
,
ikp
)
->
c
());
ComplexMatrix
&
dc
(
dwf
.
sd
(
ispin
,
ikp
)
->
c
());
ComplexMatrix
&
cref
(
wf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
ComplexMatrix
&
cref
(
wf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
ComplexMatrix
&
dcref
(
dwf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
ComplexMatrix
&
dcref
(
dwf_ref
.
sd
(
ispin
,
ikp
)
->
c
());
int
nb
=
c
.
nb
();
int
nb
=
c
.
nb
();
ComplexMatrix
matproj1
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
ComplexMatrix
matproj1
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
ComplexMatrix
matproj2
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
ComplexMatrix
matproj2
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
ComplexMatrix
matenergy
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
ComplexMatrix
matenergy
(
ctxt
,
nst
,
nst
,
nb
,
nb
);
...
...
src/SpectrumCmd.C
View file @
07b36761
...
@@ -68,6 +68,8 @@ int SpectrumCmd::action(int argc, char **argv)
...
@@ -68,6 +68,8 @@ int SpectrumCmd::action(int argc, char **argv)
if
(
ui
->
onpe0
()
)
if
(
ui
->
onpe0
()
)
{
{
cout
.
setf
(
ios
::
fixed
,
ios
::
floatfield
);
cout
.
setf
(
ios
::
right
,
ios
::
adjustfield
);
cout
<<
"<eigenset>"
<<
endl
;
cout
<<
"<eigenset>"
<<
endl
;
// print eigenvalues
// print eigenvalues
for
(
int
ispin
=
0
;
ispin
<
wf
.
nspin
();
ispin
++
)
for
(
int
ispin
=
0
;
ispin
<
wf
.
nspin
();
ispin
++
)
...
@@ -210,7 +212,7 @@ int SpectrumCmd::action(int argc, char **argv)
...
@@ -210,7 +212,7 @@ int SpectrumCmd::action(int argc, char **argv)
for
(
int
ie
=
0
;
ie
<
np
;
ie
++
)
for
(
int
ie
=
0
;
ie
<
np
;
ie
++
)
{
{
const
double
t
=
(
emin
+
ie
*
de
-
delta_e
)
/
width
;
const
double
t
=
(
emin
+
ie
*
de
-
delta_e
)
/
width
;
sp
[
ispin
][
ie
]
+=
w
*
width
*
sqrt
(
M_PI
)
*
exp
(
-
t
*
t
);
sp
[
ispin
][
ie
]
+=
w
*
(
sqrt
(
M_PI
)
/
width
)
*
exp
(
-
t
*
t
);
}
}
// only send if not on pe 0
// only send if not on pe 0
...
...
src/notes
View file @
07b36761
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
rel1_69_1
--------------------------------------------------------------------------------
cb15c6c Fix output formatting in SpectrumCmd.C
94915e6 Fix gaussian normalization in SpectrumCmd.C
9f4d98f Remove tabs in ExchangeOperator.C
--------------------------------------------------------------------------------
rel1_69_0
rel1_69_0
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
beb8bee Cleanup trailing spaces in util scripts
beb8bee Cleanup trailing spaces in util scripts
...
...
src/release.C
View file @
07b36761
...
@@ -19,5 +19,5 @@
...
@@ -19,5 +19,5 @@
#include "release.h"
#include "release.h"
std
::
string
release
(
void
)
std
::
string
release
(
void
)
{
{
return
std
::
string
(
"rel1_69_
0
"
);
return
std
::
string
(
"rel1_69_
1
"
);
}
}