Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Gyacomo
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
Antoine Cyril David Hoffmann
Gyacomo
Commits
56260f4e
Commit
56260f4e
authored
2 years ago
by
Antoine Cyril David Hoffmann
Browse files
Options
Downloads
Patches
Plain Diff
add coefficient for P,J diffusion
parent
13b3cf18
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/grid_mod.F90
+10
-3
10 additions, 3 deletions
src/grid_mod.F90
with
10 additions
and
3 deletions
src/grid_mod.F90
+
10
−
3
View file @
56260f4e
...
@@ -45,6 +45,8 @@ MODULE grid
...
@@ -45,6 +45,8 @@ MODULE grid
! local z weights for computing simpson rule
! local z weights for computing simpson rule
INTEGER
,
DIMENSION
(:),
ALLOCATABLE
,
PUBLIC
::
zweights_SR
INTEGER
,
DIMENSION
(:),
ALLOCATABLE
,
PUBLIC
::
zweights_SR
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
deltax
,
deltay
,
deltaz
,
inv_deltaz
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
deltax
,
deltay
,
deltaz
,
inv_deltaz
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
diff_pe_coeff
,
diff_je_coeff
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
diff_pi_coeff
,
diff_ji_coeff
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
diff_kx_coeff
,
diff_ky_coeff
,
diff_dz_coeff
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
diff_kx_coeff
,
diff_ky_coeff
,
diff_dz_coeff
INTEGER
,
PUBLIC
,
PROTECTED
::
ixs
,
ixe
,
iys
,
iye
,
izs
,
ize
INTEGER
,
PUBLIC
,
PROTECTED
::
ixs
,
ixe
,
iys
,
iye
,
izs
,
ize
INTEGER
,
PUBLIC
,
PROTECTED
::
izgs
,
izge
! ghosts
INTEGER
,
PUBLIC
,
PROTECTED
::
izgs
,
izge
! ghosts
...
@@ -241,8 +243,10 @@ CONTAINS
...
@@ -241,8 +243,10 @@ CONTAINS
IF
(((
ips_e
.EQ.
ip0_e
)
.OR.
(
ips_i
.EQ.
ip0_e
))
.AND.
((
ipe_e
.LT.
ip2_e
)
.OR.
(
ipe_i
.LT.
ip2_i
)))&
IF
(((
ips_e
.EQ.
ip0_e
)
.OR.
(
ips_i
.EQ.
ip0_e
))
.AND.
((
ipe_e
.LT.
ip2_e
)
.OR.
(
ipe_i
.LT.
ip2_i
)))&
WRITE
(
*
,
*
)
"Warning : distribution along p may not work with DGGK"
WRITE
(
*
,
*
)
"Warning : distribution along p may not work with DGGK"
! Precomputations
! Precomputations
pmaxe_dp
=
real
(
pmaxe
,
dp
)
pmaxe_dp
=
real
(
pmaxe
,
dp
)
pmaxi_dp
=
real
(
pmaxi
,
dp
)
pmaxi_dp
=
real
(
pmaxi
,
dp
)
diff_pe_coeff
=
(
1._dp
/
pmaxe_dp
)
**
4
diff_pi_coeff
=
(
1._dp
/
pmaxi_dp
)
**
4
! Overwrite SOLVE_AMPERE flag if beta is zero
! Overwrite SOLVE_AMPERE flag if beta is zero
IF
(
beta
.EQ.
0._dp
)
THEN
IF
(
beta
.EQ.
0._dp
)
THEN
...
@@ -280,6 +284,9 @@ CONTAINS
...
@@ -280,6 +284,9 @@ CONTAINS
maxj
=
MAX
(
jmaxi
,
jmaxe
)
maxj
=
MAX
(
jmaxi
,
jmaxe
)
jmaxe_dp
=
real
(
jmaxe
,
dp
)
jmaxe_dp
=
real
(
jmaxe
,
dp
)
jmaxi_dp
=
real
(
jmaxi
,
dp
)
jmaxi_dp
=
real
(
jmaxi
,
dp
)
diff_je_coeff
=
(
1._dp
/
jmaxe_dp
)
**
4
diff_ji_coeff
=
(
1._dp
/
jmaxi_dp
)
**
4
! j=0 indices
! j=0 indices
DO
ij
=
ijs_e
,
ije_e
;
IF
(
jarray_e
(
ij
)
.EQ.
0
)
ij0_e
=
ij
;
END
DO
DO
ij
=
ijs_e
,
ije_e
;
IF
(
jarray_e
(
ij
)
.EQ.
0
)
ij0_e
=
ij
;
END
DO
DO
ij
=
ijs_i
,
ije_i
;
IF
(
jarray_i
(
ij
)
.EQ.
0
)
ij0_i
=
ij
;
END
DO
DO
ij
=
ijs_i
,
ije_i
;
IF
(
jarray_i
(
ij
)
.EQ.
0
)
ij0_i
=
ij
;
END
DO
...
@@ -563,7 +570,7 @@ CONTAINS
...
@@ -563,7 +570,7 @@ CONTAINS
contains_zmin
=
.TRUE.
contains_zmin
=
.TRUE.
IF
(
abs
(
zarray
(
ize
,
0
)
-
zmax
)
.LT.
EPSILON
(
zmax
))
&
IF
(
abs
(
zarray
(
ize
,
0
)
-
zmax
)
.LT.
EPSILON
(
zmax
))
&
contains_zmax
=
.TRUE.
contains_zmax
=
.TRUE.
! Wei
t
ghs for Simpson rule
! Weigh
t
s for Simpson rule
ALLOCATE
(
zweights_SR
(
izs
:
ize
))
ALLOCATE
(
zweights_SR
(
izs
:
ize
))
DO
iz
=
izs
,
ize
DO
iz
=
izs
,
ize
IF
(
MODULO
(
iz
,
2
)
.EQ.
1
)
THEN
! odd iz
IF
(
MODULO
(
iz
,
2
)
.EQ.
1
)
THEN
! odd iz
...
...
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