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
b4243314
Commit
b4243314
authored
8 months ago
by
boson112358
Browse files
Options
Downloads
Patches
Plain Diff
correct the mu_j term and add scale factor in balsara
parent
fdc427f5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/hydro/REMIX/hydro.h
+10
-6
10 additions, 6 deletions
src/hydro/REMIX/hydro.h
src/hydro/REMIX/hydro_visc_difn.h
+1
-1
1 addition, 1 deletion
src/hydro/REMIX/hydro_visc_difn.h
with
11 additions
and
7 deletions
src/hydro/REMIX/hydro.h
+
10
−
6
View file @
b4243314
...
@@ -669,12 +669,16 @@ __attribute__((always_inline)) INLINE static void hydro_prepare_force(
...
@@ -669,12 +669,16 @@ __attribute__((always_inline)) INLINE static void hydro_prepare_force(
const
float
soundspeed
=
const
float
soundspeed
=
gas_soundspeed_from_internal_energy
(
p
->
rho_evol
,
p
->
u
);
gas_soundspeed_from_internal_energy
(
p
->
rho_evol
,
p
->
u
);
float
div_v
=
p
->
dv_norm_kernel
[
0
][
0
]
+
p
->
dv_norm_kernel
[
1
][
1
]
+
/* Compute balsara switch including scale factor*/
p
->
dv_norm_kernel
[
2
][
2
];
const
float
a_inv2
=
cosmo
->
a2_inv
;
const
float
fac_B
=
cosmo
->
a_factor_Balsara_eps
;
float
div_v
=
(
p
->
dv_norm_kernel
[
0
][
0
]
+
p
->
dv_norm_kernel
[
1
][
1
]
+
p
->
dv_norm_kernel
[
2
][
2
])
*
a_inv2
+
cosmo
->
H
*
hydro_dimension
;
float
curl_v
[
3
];
float
curl_v
[
3
];
curl_v
[
0
]
=
p
->
dv_norm_kernel
[
1
][
2
]
-
p
->
dv_norm_kernel
[
2
][
1
];
curl_v
[
0
]
=
(
p
->
dv_norm_kernel
[
1
][
2
]
-
p
->
dv_norm_kernel
[
2
][
1
]
)
*
a_inv2
;
curl_v
[
1
]
=
p
->
dv_norm_kernel
[
2
][
0
]
-
p
->
dv_norm_kernel
[
0
][
2
];
curl_v
[
1
]
=
(
p
->
dv_norm_kernel
[
2
][
0
]
-
p
->
dv_norm_kernel
[
0
][
2
]
)
*
a_inv2
;
curl_v
[
2
]
=
p
->
dv_norm_kernel
[
0
][
1
]
-
p
->
dv_norm_kernel
[
1
][
0
];
curl_v
[
2
]
=
(
p
->
dv_norm_kernel
[
0
][
1
]
-
p
->
dv_norm_kernel
[
1
][
0
]
)
*
a_inv2
;
float
mod_curl_v
=
sqrtf
(
curl_v
[
0
]
*
curl_v
[
0
]
+
curl_v
[
1
]
*
curl_v
[
1
]
+
float
mod_curl_v
=
sqrtf
(
curl_v
[
0
]
*
curl_v
[
0
]
+
curl_v
[
1
]
*
curl_v
[
1
]
+
curl_v
[
2
]
*
curl_v
[
2
]);
curl_v
[
2
]
*
curl_v
[
2
]);
...
@@ -684,7 +688,7 @@ __attribute__((always_inline)) INLINE static void hydro_prepare_force(
...
@@ -684,7 +688,7 @@ __attribute__((always_inline)) INLINE static void hydro_prepare_force(
balsara
=
0
.
f
;
balsara
=
0
.
f
;
}
else
{
}
else
{
balsara
=
fabsf
(
div_v
)
/
balsara
=
fabsf
(
div_v
)
/
(
fabsf
(
div_v
)
+
mod_curl_v
+
0
.
0001
f
*
soundspeed
/
p
->
h
);
(
fabsf
(
div_v
)
+
mod_curl_v
+
0
.
0001
f
*
soundspeed
*
fac_B
/
p
->
h
);
}
}
/* Compute the pressure */
/* Compute the pressure */
...
...
This diff is collapsed.
Click to expand it.
src/hydro/REMIX/hydro_visc_difn.h
+
1
−
1
View file @
b4243314
...
@@ -305,7 +305,7 @@ __attribute__((always_inline)) INLINE static void hydro_set_Qi_Qj(
...
@@ -305,7 +305,7 @@ __attribute__((always_inline)) INLINE static void hydro_set_Qi_Qj(
float
mu_j
=
float
mu_j
=
fac_mu
*
min
(
0
.
f
,
((
vtilde_i
[
0
]
-
vtilde_j
[
0
])
*
dx
[
0
]
+
fac_mu
*
min
(
0
.
f
,
((
vtilde_i
[
0
]
-
vtilde_j
[
0
])
*
dx
[
0
]
+
(
vtilde_i
[
1
]
-
vtilde_j
[
1
])
*
dx
[
1
]
+
(
vtilde_i
[
1
]
-
vtilde_j
[
1
])
*
dx
[
1
]
+
(
vtilde_i
[
2
]
-
vtilde_j
[
2
])
*
dx
[
2
])
*
(
vtilde_i
[
2
]
-
vtilde_j
[
2
])
*
dx
[
2
]
+
a2_Hubble
*
r2
)
*
hj_inv
/
(
r2
*
hj_inv
*
hj_inv
+
epsilon
*
epsilon
));
hj_inv
/
(
r2
*
hj_inv
*
hj_inv
+
epsilon
*
epsilon
));
const
float
ci
=
pi
->
force
.
soundspeed
;
const
float
ci
=
pi
->
force
.
soundspeed
;
...
...
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