Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sfx
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
inmcm-mirror
sfx
Commits
c639aa34
Commit
c639aa34
authored
8 months ago
by
数学の武士
Browse files
Options
Downloads
Patches
Plain Diff
Arithmetic fabs fix
parent
c9f3ad26
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#1567
failed
8 months ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
includeCU/sfx-model-compute-subfunc.cuh
+5
-5
5 additions, 5 deletions
includeCU/sfx-model-compute-subfunc.cuh
srcCU/sfx-sheba.cu
+1
-1
1 addition, 1 deletion
srcCU/sfx-sheba.cu
srcCXX/sfx-sheba.cpp
+1
-1
1 addition, 1 deletion
srcCXX/sfx-sheba.cpp
with
7 additions
and
7 deletions
includeCU/sfx-model-compute-subfunc.cuh
+
5
−
5
View file @
c639aa34
...
@@ -18,7 +18,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_convection_lim(T &zeta_lim, T &Rib_lim,
...
@@ -18,7 +18,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_convection_lim(T &zeta_lim, T &Rib_lim,
f_m
=
zeta_lim
/
h0_m
;
f_m
=
zeta_lim
/
h0_m
;
f_h
=
zeta_lim
/
h0_t
;
f_h
=
zeta_lim
/
h0_t
;
if
(
fabs
(
B
)
<
1.0e-10
)
f_h
=
f_m
;
if
(
fabs
f
(
B
)
<
1.0e-10
)
f_h
=
f_m
;
f_m
=
powf
(
1.0
-
param
.
alpha_m
*
f_m
,
0.25
);
f_m
=
powf
(
1.0
-
param
.
alpha_m
*
f_m
,
0.25
);
f_h
=
sqrtf
(
1.0
-
param
.
alpha_h_fix
*
f_h
);
f_h
=
sqrtf
(
1.0
-
param
.
alpha_h_fix
*
f_h
);
...
@@ -67,7 +67,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_convection(T &psi_m, T &psi_h, T &ze
...
@@ -67,7 +67,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_convection(T &psi_m, T &psi_h, T &ze
{
{
zeta0_m
=
zeta
/
h0_m
;
zeta0_m
=
zeta
/
h0_m
;
zeta0_h
=
zeta
/
h0_t
;
zeta0_h
=
zeta
/
h0_t
;
if
(
fabs
(
B
)
<
1.0e-10
)
if
(
fabs
f
(
B
)
<
1.0e-10
)
zeta0_h
=
zeta0_m
;
zeta0_h
=
zeta0_m
;
f0_m
=
powf
(
1.0
-
param
.
alpha_m
*
zeta0_m
,
0.25
);
f0_m
=
powf
(
1.0
-
param
.
alpha_m
*
zeta0_m
,
0.25
);
...
@@ -97,7 +97,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_neutral(T &psi_m, T &psi_h, T &zeta,
...
@@ -97,7 +97,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_neutral(T &psi_m, T &psi_h, T &zeta,
zeta
=
0.0
;
zeta
=
0.0
;
psi_m
=
logf
(
h0_m
);
psi_m
=
logf
(
h0_m
);
psi_h
=
logf
(
h0_t
)
/
param
.
Pr_t_0_inv
;
psi_h
=
logf
(
h0_t
)
/
param
.
Pr_t_0_inv
;
if
(
fabs
(
B
)
<
1.0e-10
)
if
(
fabs
f
(
B
)
<
1.0e-10
)
psi_h
=
psi_m
/
param
.
Pr_t_0_inv
;
psi_h
=
psi_m
/
param
.
Pr_t_0_inv
;
}
}
...
@@ -112,7 +112,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_semi_convection(T &psi_m, T &psi_h,
...
@@ -112,7 +112,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_semi_convection(T &psi_m, T &psi_h,
psi_m
=
logf
(
h0_m
);
psi_m
=
logf
(
h0_m
);
psi_h
=
logf
(
h0_t
);
psi_h
=
logf
(
h0_t
);
if
(
fabs
(
B
)
<
1.0e-10
)
if
(
fabs
f
(
B
)
<
1.0e-10
)
psi_h
=
psi_m
;
psi_h
=
psi_m
;
zeta
=
Rib
*
param
.
Pr_t_0_inv
*
psi_m
*
psi_m
/
psi_h
;
zeta
=
Rib
*
param
.
Pr_t_0_inv
*
psi_m
*
psi_m
/
psi_h
;
...
@@ -121,7 +121,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_semi_convection(T &psi_m, T &psi_h,
...
@@ -121,7 +121,7 @@ FUCNTION_DECLARATION_SPECIFIER void get_psi_semi_convection(T &psi_m, T &psi_h,
{
{
zeta0_m
=
zeta
/
h0_m
;
zeta0_m
=
zeta
/
h0_m
;
zeta0_h
=
zeta
/
h0_t
;
zeta0_h
=
zeta
/
h0_t
;
if
(
fabs
(
B
)
<
1.0e-10
)
if
(
fabs
f
(
B
)
<
1.0e-10
)
zeta0_h
=
zeta0_m
;
zeta0_h
=
zeta0_m
;
f_m
=
powf
(
1.0
-
param
.
alpha_m
*
zeta
,
0.25e0
);
f_m
=
powf
(
1.0
-
param
.
alpha_m
*
zeta
,
0.25e0
);
...
...
This diff is collapsed.
Click to expand it.
srcCU/sfx-sheba.cu
+
1
−
1
View file @
c639aa34
...
@@ -79,7 +79,7 @@ __global__ void sfx_kernel::compute_flux(sfxDataVecTypeC sfx,
...
@@ -79,7 +79,7 @@ __global__ void sfx_kernel::compute_flux(sfxDataVecTypeC sfx,
if
(
U
>
0.0
)
if
(
U
>
0.0
)
Cm
=
Udyn
/
U
;
Cm
=
Udyn
/
U
;
Ct
=
0.0
;
Ct
=
0.0
;
if
(
fabs
(
dT
)
>
0.0
)
if
(
fabs
f
(
dT
)
>
0.0
)
Ct
=
Tdyn
/
dT
;
Ct
=
Tdyn
/
dT
;
// --- define eddy viscosity & inverse Prandtl number
// --- define eddy viscosity & inverse Prandtl number
...
...
This diff is collapsed.
Click to expand it.
srcCXX/sfx-sheba.cpp
+
1
−
1
View file @
c639aa34
...
@@ -82,7 +82,7 @@ void FluxSheba<T, memIn, memOut, MemType::CPU>::compute_flux()
...
@@ -82,7 +82,7 @@ void FluxSheba<T, memIn, memOut, MemType::CPU>::compute_flux()
if
(
U
>
0.0
)
if
(
U
>
0.0
)
Cm
=
Udyn
/
U
;
Cm
=
Udyn
/
U
;
Ct
=
0.0
;
Ct
=
0.0
;
if
(
fabs
(
dT
)
>
0.0
)
if
(
fabs
f
(
dT
)
>
0.0
)
Ct
=
Tdyn
/
dT
;
Ct
=
Tdyn
/
dT
;
// --- define eddy viscosity & inverse Prandtl number
// --- define eddy viscosity & inverse Prandtl number
...
...
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