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
68bac379
Commit
68bac379
authored
2 years ago
by
Antoine Cyril David Hoffmann
Browse files
Options
Downloads
Patches
Plain Diff
Correction of typos and bad variables types
parent
20ed4685
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/geometry_mod.F90
+1
-0
1 addition, 0 deletions
src/geometry_mod.F90
src/grid_mod.F90
+2
-2
2 additions, 2 deletions
src/grid_mod.F90
src/miller_mod.F90
+9
-8
9 additions, 8 deletions
src/miller_mod.F90
with
12 additions
and
10 deletions
src/geometry_mod.F90
+
1
−
0
View file @
68bac379
...
...
@@ -95,6 +95,7 @@ CONTAINS
IF
(
my_id
.eq.
0
)
WRITE
(
*
,
*
)
'Z-pinch geometry'
call
eval_zpinch_geometry
SHEARED
=
.FALSE.
shear
=
0._dp
CASE
(
'miller'
)
IF
(
my_id
.eq.
0
)
WRITE
(
*
,
*
)
'Miller geometry'
call
set_miller_parameters
(
kappa
,
s_kappa
,
delta
,
s_delta
,
zeta
,
s_zeta
)
...
...
This diff is collapsed.
Click to expand it.
src/grid_mod.F90
+
2
−
2
View file @
68bac379
...
...
@@ -20,7 +20,7 @@ MODULE grid
INTEGER
,
PUBLIC
,
PROTECTED
::
Ny
=
16
! Number of total internal grid points in y
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
Ly
=
1._dp
! vertical length of the spatial box
INTEGER
,
PUBLIC
,
PROTECTED
::
Nz
=
1
! Number of total perpendicular planes
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
Npol
=
1
._dp
! number of poloidal turns
INTEGER
,
PUBLIC
,
PROTECTED
::
Npol
=
1
! number of poloidal turns
INTEGER
,
PUBLIC
,
PROTECTED
::
Odz
=
4
! order of z interp and derivative schemes
INTEGER
,
PUBLIC
,
PROTECTED
::
Nkx
=
8
! Number of total internal grid points in kx
REAL
(
dp
),
PUBLIC
,
PROTECTED
::
Lkx
=
1._dp
! horizontal length of the fourier box
...
...
@@ -370,7 +370,7 @@ CONTAINS
REAL
(
dp
),
INTENT
(
IN
)
::
shear
REAL
::
Lx_adapted
INTEGER
::
i_
,
counter
IF
(
shear
.GT.
0
._dp
)
THEN
IF
(
shear
.GT.
0
)
THEN
IF
(
my_id
.EQ.
0
)
write
(
*
,
*
)
'Magnetic shear detected: set up sheared kx grid..'
! mininal size of box in x to respect dkx = 2pi shear dky
Lx_adapted
=
Ly
/(
2._dp
*
pi
*
shear
*
Npol
)
...
...
This diff is collapsed.
Click to expand it.
src/miller_mod.F90
+
9
−
8
View file @
68bac379
...
...
@@ -607,8 +607,8 @@ CONTAINS
!> Generate an equidistant array from min to max with n points
function
linspace
(
min
,
max
,
n
)
result
(
out
)
real
(
dp
)::
min
,
max
integer
::
n
real
(
dp
)
,
INTENT
(
IN
)
::
min
,
max
integer
,
INTENT
(
IN
)
::
n
real
(
dp
),
dimension
(
n
)::
out
do
i
=
1
,
n
...
...
@@ -618,20 +618,20 @@ CONTAINS
!> Weighted average
real
(
dp
)
function
average
(
var
,
weight
)
real
(
dp
),
dimension
(
np
)::
var
,
weight
real
(
dp
),
dimension
(
np
)
,
INTENT
(
IN
)
::
var
,
weight
average
=
sum
(
var
*
weight
)/
sum
(
weight
)
end
function
average
!> full theta integral with weight function dlp
real
(
dp
)
function
dlp_int
(
var
,
dlp
)
real
(
dp
),
dimension
(
np
)::
var
,
dlp
real
(
dp
),
dimension
(
np
)
,
INTENT
(
IN
)
::
var
,
dlp
dlp_int
=
sum
(
var
*
dlp
)
*
2
*
pi
*
Npol_ext
/
np
end
function
dlp_int
!> theta integral with weight function dlp, up to index 'ind'
real
(
dp
)
function
dlp_int_ind
(
var
,
dlp
,
ind
)
real
(
dp
),
dimension
(
np
)::
var
,
dlp
integer
::
ind
real
(
dp
),
dimension
(
np
)
,
INTENT
(
IN
)
::
var
,
dlp
integer
,
INTENT
(
IN
)
::
ind
dlp_int_ind
=
0.
if
(
ind
.gt.
1
)
then
...
...
@@ -643,8 +643,9 @@ CONTAINS
!> 1st derivative with 2nd order finite differences
function
deriv_fd
(
y
,
x
,
n
)
result
(
out
)
integer
,
intent
(
in
)
::
n
real
(
dp
),
dimension
(
n
)::
x
,
y
,
out
,
dx
integer
,
INTENT
(
IN
)
::
n
real
(
dp
),
dimension
(
n
),
INTENT
(
IN
)::
x
,
y
real
(
dp
),
dimension
(
n
)
::
out
,
dx
!call lag3deriv(y,x,n,out,x,n)
...
...
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