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
fcf344d1
Commit
fcf344d1
authored
9 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Better way of switching between SPH definition for the i/o routines.
parent
a79f2f23
No related branches found
No related tags found
2 merge requests
!136
Master
,
!85
Tiny fixes to correctly accomodate the switch between SPH variations
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/Makefile.am
+1
-1
1 addition, 1 deletion
src/Makefile.am
src/hydro_io.h
+31
-0
31 additions, 0 deletions
src/hydro_io.h
src/parallel_io.c
+4
-5
4 additions, 5 deletions
src/parallel_io.c
src/serial_io.c
+2
-5
2 additions, 5 deletions
src/serial_io.c
src/single_io.c
+1
-5
1 addition, 5 deletions
src/single_io.c
with
39 additions
and
16 deletions
src/Makefile.am
+
1
−
1
View file @
fcf344d1
...
...
@@ -46,7 +46,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
# Include files for distribution, not installation.
noinst_HEADERS
=
atomic.h cycle.h error.h inline.h kernel.h vector.h
\
runner_doiact.h runner_doiact_grav.h units.h intrinsics.h
\
hydro.h gravity.h hydro/
*
/
*
.h gravity/
*
/
*
.h
hydro.h
hydro_io.h
gravity.h hydro/
*
/
*
.h gravity/
*
/
*
.h
# Sources and flags for regular library
libswiftsim_la_SOURCES
=
$(
AM_SOURCES
)
...
...
This diff is collapsed.
Click to expand it.
src/hydro_io.h
0 → 100644
+
31
−
0
View file @
fcf344d1
/*******************************************************************************
* This file is part of SWIFT.
* Coypright (c) 2016 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#ifndef SWIFT_HYDRO_IO_H
#define SWIFT_HYDRO_IO_H
#include
"./const.h"
/* Import the right functions */
#ifdef LEGACY_GADGET2_SPH
#include
"./hydro/Gadget2/hydro_io.h"
#else
#include
"./hydro/Default/hydro_io.h"
#endif
#endif
This diff is collapsed.
Click to expand it.
src/parallel_io.c
+
4
−
5
View file @
fcf344d1
...
...
@@ -337,12 +337,11 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
mpi_rank, offset, (char*)(&(part[0]).field), us, \
convFactor)
/* Import the right hydro definition */
#ifdef LEGACY_GADGET2_SPH
#include
"./hydro/Gadget2/hydro_io.h"
#else
#include
"./hydro/Default/hydro_io.h"
#endif
#include
"hydro_io.h"
/**
...
...
This diff is collapsed.
Click to expand it.
src/serial_io.c
+
2
−
5
View file @
fcf344d1
...
...
@@ -358,11 +358,8 @@ void writeArrayBackEnd(hid_t grp, char* name,
/* Import the right hydro definition */
#ifdef LEGACY_GADGET2_SPH
#include
"./hydro/Gadget2/hydro_io.h"
#else
#include
"./hydro/Default/hydro_io.h"
#endif
#include
"hydro_io.h"
/**
...
...
This diff is collapsed.
Click to expand it.
src/single_io.c
+
1
−
5
View file @
fcf344d1
...
...
@@ -280,11 +280,7 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
/* Import the right hydro definition */
#ifdef LEGACY_GADGET2_SPH
#include
"./hydro/Gadget2/hydro_io.h"
#else
#include
"./hydro/Default/hydro_io.h"
#endif
#include
"hydro_io.h"
...
...
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