Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
0440234a
Commit
0440234a
authored
1 year ago
by
Matthieu Schaller
Browse files
Options
Downloads
Plain Diff
Merge branch '888-enable-timers-causes-compilation-error-on-master' into 'master'
Resolve "--enable-timers causes compilation error on master" Closes
#888
See merge request
!1909
parents
7b01a76b
a373892a
Branches
Branches containing commit
Tags
Tags containing commit
9 merge requests
!1997
Yet another master into zoom buffer branch merge (with formatting all done!)
,
!1994
Draft: Testing master -> zoom merge
,
!1987
Update zoom_merge with master updates (after wrangling immense conflicts)
,
!1982
Update zoom merge branch with latest master developments
,
!1956
Rename space_getsid to space_getsid_and_swap_cells() to try to prevent...
,
!1945
Another master->zoom_merge update
,
!1921
Mhd canvas
,
!1910
Master -> zoom_merge update
,
!1909
Resolve "--enable-timers causes compilation error on master"
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/runner_neutrino.c
+1
-1
1 addition, 1 deletion
src/runner_neutrino.c
src/runner_time_integration.c
+2
-0
2 additions, 0 deletions
src/runner_time_integration.c
src/timers.c
+2
-0
2 additions, 0 deletions
src/timers.c
src/timers.h
+2
-0
2 additions, 0 deletions
src/timers.h
with
7 additions
and
1 deletion
src/runner_neutrino.c
+
1
−
1
View file @
0440234a
...
@@ -89,5 +89,5 @@ void runner_do_neutrino_weighting(struct runner *r, struct cell *c, int timer) {
...
@@ -89,5 +89,5 @@ void runner_do_neutrino_weighting(struct runner *r, struct cell *c, int timer) {
}
}
}
}
if
(
timer
)
TIMER_TOC
(
timer_weight
);
if
(
timer
)
TIMER_TOC
(
timer_
neutrino_
weight
ing
);
}
}
This diff is collapsed.
Click to expand it.
src/runner_time_integration.c
+
2
−
0
View file @
0440234a
...
@@ -1706,6 +1706,8 @@ void runner_do_rt_advance_cell_time(struct runner *r, struct cell *c,
...
@@ -1706,6 +1706,8 @@ void runner_do_rt_advance_cell_time(struct runner *r, struct cell *c,
void
runner_do_collect_rt_times
(
struct
runner
*
r
,
struct
cell
*
c
,
void
runner_do_collect_rt_times
(
struct
runner
*
r
,
struct
cell
*
c
,
const
int
timer
)
{
const
int
timer
)
{
TIMER_TIC
;
const
struct
engine
*
e
=
r
->
e
;
const
struct
engine
*
e
=
r
->
e
;
size_t
rt_updated
=
0
;
size_t
rt_updated
=
0
;
...
...
This diff is collapsed.
Click to expand it.
src/timers.c
+
2
−
0
View file @
0440234a
...
@@ -142,6 +142,8 @@ const char* timers_names[timer_count] = {
...
@@ -142,6 +142,8 @@ const char* timers_names[timer_count] = {
"rt_tchem"
,
"rt_tchem"
,
"rt_advance_cell_time"
,
"rt_advance_cell_time"
,
"rt_collect_times"
,
"rt_collect_times"
,
"do_sync"
,
"neutrino_weighting"
,
};
};
/* File to store the timers */
/* File to store the timers */
...
...
This diff is collapsed.
Click to expand it.
src/timers.h
+
2
−
0
View file @
0440234a
...
@@ -142,6 +142,8 @@ enum {
...
@@ -142,6 +142,8 @@ enum {
timer_do_rt_tchem
,
timer_do_rt_tchem
,
timer_do_rt_advance_cell_time
,
timer_do_rt_advance_cell_time
,
timer_do_rt_collect_times
,
timer_do_rt_collect_times
,
timer_do_sync
,
timer_neutrino_weighting
,
timer_count
,
timer_count
,
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment