Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SWIFTsim
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

9ab8173e

Commit 9ab8173e authored 9 years ago by Peter W. Draper

Downloads
- Plain Diff

Merge branch 'master' into root-level-parts

 Conflicts:
	src/partition.h

Parameter handling imported from old main.c.

parents 4ad7e742 cbefe349

No related branches found

No related tags found

1 merge request!112Root level parts

Changes 108

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/part.c 24 additions, 25 deletions

src/part.c
src/part.h 7 additions, 3 deletions

src/part.h
src/partition.c 109 additions, 2 deletions

src/partition.c
src/partition.h 5 additions, 0 deletions

src/partition.h
src/proxy.c 98 additions, 29 deletions

src/proxy.c
src/proxy.h 12 additions, 3 deletions

src/proxy.h
src/queue.c 6 additions, 3 deletions

src/queue.c
src/riemann/riemann_exact.h 2 additions, 0 deletions

src/riemann/riemann_exact.h
src/runner.c 186 additions, 56 deletions

src/runner.c
src/runner_doiact.h 1 addition, 1 deletion

src/runner_doiact.h
src/runner_doiact_grav.h 3 additions, 4 deletions

src/runner_doiact_grav.h
src/scheduler.c 102 additions, 106 deletions

src/scheduler.c
src/scheduler.h 1 addition, 7 deletions

src/scheduler.h
src/serial_io.c 251 additions, 110 deletions

src/serial_io.c
src/serial_io.h 3 additions, 2 deletions

src/serial_io.h
src/single_io.c 77 additions, 57 deletions

src/single_io.c
src/single_io.h 1 addition, 1 deletion

src/single_io.h
src/space.c 331 additions, 223 deletions

src/space.c
src/space.h 13 additions, 10 deletions

src/space.h
src/swift.h 3 additions, 3 deletions

src/swift.h

with 1235 additions and 645 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment