Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Lukas Weber
load_leveller
Commits
1702f55b
Commit
1702f55b
authored
Aug 21, 2019
by
Lukas Weber
Browse files
make jobstatus work for pt and change parameter file name
parent
77c0d7da
Changes
3
Hide whitespace changes
Inline
Side-by-side
python/loadleveller/jobfile.py
View file @
1702f55b
...
...
@@ -32,10 +32,10 @@ class JobFile:
except
OSError
as
e
:
if
e
.
errno
!=
errno
.
EEXIST
:
raise
job_input_filename
=
os
.
path
.
join
(
datadir
,
'parameters.y
a
ml'
)
job_input_filename
=
os
.
path
.
join
(
datadir
,
'parameters.yml'
)
with
open
(
job_input_filename
,
'w'
)
as
f
:
f
.
write
(
self
.
raw_jobfile
)
except
Exception
as
e
:
raise
JobFileGenError
(
'Could not write parameters.y
a
ml: {}'
.
format
(
e
))
raise
JobFileGenError
(
'Could not write parameters.yml: {}'
.
format
(
e
))
return
job_input_filename
python/loadleveller/jobstatus.py
View file @
1702f55b
...
...
@@ -35,8 +35,10 @@ class JobProgress:
tp
.
num_runs
+=
1
with
h5py
.
File
(
runfile
,
'r'
)
as
f
:
tp
.
therm_sweeps
+=
f
[
'/thermalization_sweeps'
][
0
]
tp
.
sweeps
+=
f
[
'/sweeps'
][
0
]
-
f
[
'/thermalization_sweeps'
][
0
]
sweeps
=
f
[
'/sweeps'
][
0
]
//
jobfile
.
tasks
[
task
].
get
(
'pt_sweeps_per_global_update'
,
1
)
tp
.
therm_sweeps
+=
min
(
sweeps
,
tp
.
target_therm
)
tp
.
sweeps
+=
sweeps
-
tp
.
therm_sweeps
if
tp
.
sweeps
<
tp
.
target_sweeps
:
...
...
src/mc.cpp
View file @
1702f55b
...
...
@@ -93,7 +93,6 @@ void mc::_write(const std::string &dir) {
g
.
write
(
"max_meas_time"
,
max_meas_time_
);
g
.
write
(
"sweeps"
,
sweep_
);
g
.
write
(
"thermalization_sweeps"
,
std
::
min
(
therm_
,
sweep_
));
// only for convenience
}
rename
((
dir
+
".dump.h5.tmp"
).
c_str
(),
(
dir
+
".dump.h5"
).
c_str
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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