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
Commits
f5018ad0
Commit
f5018ad0
authored
Aug 16, 2018
by
Francois Gygi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename file format variable
parent
9a9988cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
ExternalPotential.C
src/ExternalPotential.C
+2
-2
ExternalPotential.h
src/ExternalPotential.h
+4
-4
No files found.
src/ExternalPotential.C
View file @
f5018ad0
...
...
@@ -51,7 +51,7 @@ void ExternalPotential::update(const ChargeDensity& cd)
vector
<
double
>
vext_read
,
vext_read_loc
;
tm_read_vext
.
start
();
if
(
io
_
==
"cube"
)
if
(
fmt
_
==
"cube"
)
{
// read cube file, n_'s are determined by cube file
if
(
myrow
==
0
)
...
...
@@ -89,7 +89,7 @@ void ExternalPotential::update(const ChargeDensity& cd)
}
MPI_Bcast
(
&
n_
[
0
],
3
,
MPI_INT
,
0
,
vcomm
);
}
else
if
(
io_
==
"xml"
)
else
if
(
fmt_
==
"xml"
)
{
if
(
myrow
==
0
)
{
...
...
src/ExternalPotential.h
View file @
f5018ad0
...
...
@@ -39,15 +39,15 @@ class ExternalPotential
double
amplitude_
;
// overall scaling factor of external potential
vector
<
double
>
vext_r_
;
// vext in real space
std
::
string
filename_
;
// file name for external potential
std
::
string
io_
;
// "cube", "base64_serial" or "base64_paralle
l"
std
::
string
fmt_
;
// file format: "cube" or "xm
l"
public
:
ExternalPotential
(
Sample
&
s
,
std
::
string
name
,
std
::
string
io
=
"xml"
)
:
ExternalPotential
(
Sample
&
s
,
std
::
string
name
,
std
::
string
fmt
=
"xml"
)
:
s_
(
s
),
filename_
(
name
),
ecut_
(
0
.
0
),
amplitude_
(
1
.
0
),
magnitude_
(
0
.
0
),
io_
(
io
)
fmt_
(
fmt
)
{
assert
(
io_
==
"cube"
||
io
==
"xml"
);
assert
(
fmt_
==
"cube"
||
fmt_
==
"xml"
);
}
~
ExternalPotential
()
{}
...
...
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