Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
SWIFTsim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Milestones
Merge Requests
13
Merge Requests
13
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
SWIFT
SWIFTsim
Commits
65e0568d
Commit
65e0568d
authored
Mar 19, 2018
by
lhausamm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change chemistry_data -> chemistry_global_data
parent
1d36b82d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
src/chemistry.c
src/chemistry.c
+3
-3
src/chemistry.h
src/chemistry.h
+2
-2
src/engine.c
src/engine.c
+1
-1
src/engine.h
src/engine.h
+2
-2
src/space.c
src/space.c
+1
-1
src/space.h
src/space.h
+1
-1
No files found.
src/chemistry.c
View file @
65e0568d
...
...
@@ -36,7 +36,7 @@
void
chemistry_init
(
const
struct
swift_params
*
parameter_file
,
const
struct
unit_system
*
us
,
const
struct
phys_const
*
phys_const
,
struct
chemistry_data
*
data
)
{
struct
chemistry_
global_
data
*
data
)
{
chemistry_init_backend
(
parameter_file
,
us
,
phys_const
,
data
);
}
...
...
@@ -46,9 +46,9 @@ void chemistry_init(const struct swift_params* parameter_file,
*
* Calls chemistry_print_backend for the chosen chemistry model.
*
* @brief The #chemistry_data containing information about the current model.
* @brief The #chemistry_
global_
data containing information about the current model.
*/
void
chemistry_print
(
const
struct
chemistry_data
*
data
)
{
void
chemistry_print
(
const
struct
chemistry_
global_
data
*
data
)
{
chemistry_print_backend
(
data
);
}
...
...
src/chemistry.h
View file @
65e0568d
...
...
@@ -46,9 +46,9 @@
void
chemistry_init
(
const
struct
swift_params
*
parameter_file
,
const
struct
unit_system
*
us
,
const
struct
phys_const
*
phys_const
,
struct
chemistry_data
*
data
);
struct
chemistry_
global_
data
*
data
);
void
chemistry_print
(
const
struct
chemistry_data
*
data
);
void
chemistry_print
(
const
struct
chemistry_
global_
data
*
data
);
/* Dump/restore. */
void
chemistry_struct_dump
(
const
struct
chemistry_data
*
chemistry
,
...
...
src/engine.c
View file @
65e0568d
...
...
@@ -5202,7 +5202,7 @@ void engine_init(
const
struct
hydro_props
*
hydro
,
struct
gravity_props
*
gravity
,
const
struct
external_potential
*
potential
,
const
struct
cooling_function_data
*
cooling_func
,
const
struct
chemistry_data
*
chemistry
,
struct
sourceterms
*
sourceterms
)
{
const
struct
chemistry_
global_
data
*
chemistry
,
struct
sourceterms
*
sourceterms
)
{
/* Clean-up everything */
bzero
(
e
,
sizeof
(
struct
engine
));
...
...
src/engine.h
View file @
65e0568d
...
...
@@ -287,7 +287,7 @@ struct engine {
const
struct
cooling_function_data
*
cooling_func
;
/* Properties of the chemistry model */
const
struct
chemistry_data
*
chemistry
;
const
struct
chemistry_
global_
data
*
chemistry
;
/* Properties of source terms */
struct
sourceterms
*
sourceterms
;
...
...
@@ -338,7 +338,7 @@ void engine_init(
const
struct
hydro_props
*
hydro
,
struct
gravity_props
*
gravity
,
const
struct
external_potential
*
potential
,
const
struct
cooling_function_data
*
cooling_func
,
const
struct
chemistry_data
*
chemistry
,
struct
sourceterms
*
sourceterms
);
const
struct
chemistry_
global_
data
*
chemistry
,
struct
sourceterms
*
sourceterms
);
void
engine_config
(
int
restart
,
struct
engine
*
e
,
const
struct
swift_params
*
params
,
int
nr_nodes
,
int
nodeID
,
int
nr_threads
,
int
with_aff
,
int
verbose
,
...
...
src/space.c
View file @
65e0568d
...
...
@@ -2640,7 +2640,7 @@ void space_synchronize_particle_positions(struct space *s) {
* Calls chemistry_first_init_part() on all the particles
*/
void
space_first_init_parts
(
struct
space
*
s
,
const
struct
chemistry_data
*
chemistry
,
const
struct
chemistry_
global_
data
*
chemistry
,
const
struct
cooling_function_data
*
cool_func
)
{
const
size_t
nr_parts
=
s
->
nr_parts
;
...
...
src/space.h
View file @
65e0568d
...
...
@@ -226,7 +226,7 @@ void space_do_parts_sort();
void
space_do_gparts_sort
();
void
space_do_sparts_sort
();
void
space_first_init_parts
(
struct
space
*
s
,
const
struct
chemistry_data
*
chemistry
,
const
struct
chemistry_
global_
data
*
chemistry
,
const
struct
cooling_function_data
*
cool_func
);
void
space_first_init_gparts
(
struct
space
*
s
,
const
struct
gravity_props
*
grav_props
);
...
...
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