Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
f0198314
Commit
f0198314
authored
Sep 11, 2017
by
Matthieu Schaller
Browse files
Removed all the old vectorized interaction routines.
parent
62555575
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
src/hydro/Default/hydro_iact.h
View file @
f0198314
This diff is collapsed.
Click to expand it.
src/hydro/Gadget2/hydro_iact.h
View file @
f0198314
This diff is collapsed.
Click to expand it.
src/hydro/Gizmo/hydro_iact.h
View file @
f0198314
...
@@ -594,37 +594,3 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
...
@@ -594,37 +594,3 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
runner_iact_fluxes_common
(
r2
,
dx
,
hi
,
hj
,
pi
,
pj
,
0
);
runner_iact_fluxes_common
(
r2
,
dx
,
hi
,
hj
,
pi
,
pj
,
0
);
}
}
//// EMPTY VECTORIZED VERSIONS (gradients methods are missing...)
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorised versions of the Gizmo interaction functions do not exist "
"yet!"
);
}
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorised versions of the Gizmo interaction functions do not exist "
"yet!"
);
}
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorised versions of the Gizmo interaction functions do not exist "
"yet!"
);
}
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorised versions of the Gizmo interaction functions do not exist "
"yet!"
);
}
src/hydro/Minimal/hydro_iact.h
View file @
f0198314
...
@@ -70,17 +70,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density(
...
@@ -70,17 +70,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density(
pj
->
density
.
wcount_dh
-=
(
hydro_dimension
*
wj
+
uj
*
wj_dx
);
pj
->
density
.
wcount_dh
-=
(
hydro_dimension
*
wj
+
uj
*
wj_dx
);
}
}
/**
* @brief Density loop (Vectorized version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"A vectorised version of the Minimal density interaction function does "
"not exist yet!"
);
}
/**
/**
* @brief Density loop (non-symmetric version)
* @brief Density loop (non-symmetric version)
*/
*/
...
@@ -105,17 +94,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
...
@@ -105,17 +94,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
pi
->
density
.
wcount_dh
-=
(
hydro_dimension
*
wi
+
ui
*
wi_dx
);
pi
->
density
.
wcount_dh
-=
(
hydro_dimension
*
wi
+
ui
*
wi_dx
);
}
}
/**
* @brief Density loop (non-symmetric vectorized version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"A vectorised version of the Minimal non-symmetric density interaction "
"function does not exist yet!"
);
}
/**
/**
* @brief Force loop
* @brief Force loop
*/
*/
...
@@ -216,17 +194,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_force(
...
@@ -216,17 +194,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_force(
pj
->
force
.
v_sig
=
max
(
pj
->
force
.
v_sig
,
v_sig
);
pj
->
force
.
v_sig
=
max
(
pj
->
force
.
v_sig
,
v_sig
);
}
}
/**
* @brief Force loop (Vectorized version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"A vectorised version of the Minimal force interaction function does not "
"exist yet!"
);
}
/**
/**
* @brief Force loop (non-symmetric version)
* @brief Force loop (non-symmetric version)
*/
*/
...
@@ -318,15 +285,4 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
...
@@ -318,15 +285,4 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
pi
->
force
.
v_sig
=
max
(
pi
->
force
.
v_sig
,
v_sig
);
pi
->
force
.
v_sig
=
max
(
pi
->
force
.
v_sig
,
v_sig
);
}
}
/**
* @brief Force loop (Vectorized non-symmetric version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"A vectorised version of the Minimal non-symmetric force interaction "
"function does not exist yet!"
);
}
#endif
/* SWIFT_MINIMAL_HYDRO_IACT_H */
#endif
/* SWIFT_MINIMAL_HYDRO_IACT_H */
src/hydro/PressureEntropy/hydro_iact.h
View file @
f0198314
...
@@ -110,16 +110,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density(
...
@@ -110,16 +110,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density(
pj
->
density
.
rot_v
[
2
]
+=
facj
*
curlvr
[
2
];
pj
->
density
.
rot_v
[
2
]
+=
facj
*
curlvr
[
2
];
}
}
/**
* @brief Density loop (Vectorized version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorized version of Pressure-Entropy SPH routine not existant yet."
);
}
/**
/**
* @brief Density loop (non-symmetric version)
* @brief Density loop (non-symmetric version)
*/
*/
...
@@ -173,16 +163,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
...
@@ -173,16 +163,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
pi
->
density
.
rot_v
[
2
]
+=
fac
*
curlvr
[
2
];
pi
->
density
.
rot_v
[
2
]
+=
fac
*
curlvr
[
2
];
}
}
/**
* @brief Density loop (non-symmetric vectorized version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorized version of Pressure-Entropy SPH routine not existant yet."
);
}
/**
/**
* @brief Force loop
* @brief Force loop
*/
*/
...
@@ -284,16 +264,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_force(
...
@@ -284,16 +264,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_force(
pj
->
entropy_dt
+=
mi
*
visc_term
*
r_inv
*
dvdr
;
pj
->
entropy_dt
+=
mi
*
visc_term
*
r_inv
*
dvdr
;
}
}
/**
* @brief Force loop (Vectorized version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorized version of Pressure-Entropy SPH routine not existant yet."
);
}
/**
/**
* @brief Force loop (non-symmetric version)
* @brief Force loop (non-symmetric version)
*/
*/
...
@@ -388,14 +358,4 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
...
@@ -388,14 +358,4 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
pi
->
entropy_dt
+=
mj
*
visc_term
*
r_inv
*
dvdr
;
pi
->
entropy_dt
+=
mj
*
visc_term
*
r_inv
*
dvdr
;
}
}
/**
* @brief Force loop (Vectorized non-symmetric version)
*/
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{
error
(
"Vectorized version of Pressure-Entropy SPH routine not existant yet."
);
}
#endif
/* SWIFT_PRESSURE_ENTROPY_HYDRO_IACT_H */
#endif
/* SWIFT_PRESSURE_ENTROPY_HYDRO_IACT_H */
src/hydro/Shadowswift/hydro_iact.h
View file @
f0198314
...
@@ -346,20 +346,3 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
...
@@ -346,20 +346,3 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
runner_iact_fluxes_common
(
r2
,
dx
,
hi
,
hj
,
pi
,
pj
,
0
);
runner_iact_fluxes_common
(
r2
,
dx
,
hi
,
hj
,
pi
,
pj
,
0
);
}
}
//// EMPTY VECTORIZED VERSIONS (gradients methods are missing...)
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{}
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_density
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{}
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{}
__attribute__
((
always_inline
))
INLINE
static
void
runner_iact_nonsym_vec_force
(
float
*
R2
,
float
*
Dx
,
float
*
Hi
,
float
*
Hj
,
struct
part
**
pi
,
struct
part
**
pj
)
{}
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