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
11855145
Commit
11855145
authored
2 years ago
by
Antoine Cyril David Hoffmann
Browse files
Options
Downloads
Patches
Plain Diff
phi_EM is now called phi_NZ
parent
5a8c7041
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/array_mod.F90
+1
-1
1 addition, 1 deletion
src/array_mod.F90
src/memory.F90
+1
-1
1 addition, 1 deletion
src/memory.F90
src/numerical_experiments_mod.F90
+5
-5
5 additions, 5 deletions
src/numerical_experiments_mod.F90
with
7 additions
and
7 deletions
src/array_mod.F90
+
1
−
1
View file @
11855145
...
...
@@ -27,7 +27,7 @@ MODULE array
! non-zonal modes (kx=0)
COMPLEX
(
dp
),
DIMENSION
(:,:,:,:),
ALLOCATABLE
::
moments_e_NZ
COMPLEX
(
dp
),
DIMENSION
(:,:,:,:),
ALLOCATABLE
::
moments_i_NZ
COMPLEX
(
dp
),
DIMENSION
(:,:),
ALLOCATABLE
::
phi_
EM
COMPLEX
(
dp
),
DIMENSION
(:,:),
ALLOCATABLE
::
phi_
NZ
! Non linear term array (ip,ij,iky,ikx,iz)
COMPLEX
(
dp
),
DIMENSION
(:,:,:,:,:),
ALLOCATABLE
::
Sepj
! electron
...
...
This diff is collapsed.
Click to expand it.
src/memory.F90
+
1
−
1
View file @
11855145
...
...
@@ -16,7 +16,7 @@ SUBROUTINE memory
CALL
allocate_array
(
phi
,
ikys
,
ikye
,
ikxs
,
ikxe
,
izgs
,
izge
)
CALL
allocate_array
(
psi
,
ikys
,
ikye
,
ikxs
,
ikxe
,
izgs
,
izge
)
CALL
allocate_array
(
phi_ZF
,
ikxs
,
ikxe
,
izs
,
ize
)
CALL
allocate_array
(
phi_
EM
,
ikys
,
ikye
,
izs
,
ize
)
CALL
allocate_array
(
phi_
NZ
,
ikys
,
ikye
,
izs
,
ize
)
CALL
allocate_array
(
inv_poisson_op
,
ikys
,
ikye
,
ikxs
,
ikxe
,
izs
,
ize
)
CALL
allocate_array
(
inv_ampere_op
,
ikys
,
ikye
,
ikxs
,
ikxe
,
izs
,
ize
)
CALL
allocate_array
(
inv_pol_ion
,
ikys
,
ikye
,
ikxs
,
ikxe
,
izs
,
ize
)
...
...
This diff is collapsed.
Click to expand it.
src/numerical_experiments_mod.F90
+
5
−
5
View file @
11855145
...
...
@@ -17,7 +17,7 @@ CONTAINS
!******************************************************************************!
SUBROUTINE
save_EM_ZF_modes
USE
fields
USE
array
,
ONLY
:
moments_e_ZF
,
moments_i_ZF
,
phi_ZF
,
moments_e_NZ
,
moments_i_NZ
,
phi_
EM
USE
array
,
ONLY
:
moments_e_ZF
,
moments_i_ZF
,
phi_ZF
,
moments_e_NZ
,
moments_i_NZ
,
phi_
NZ
USE
grid
USE
time_integration
,
ONLY
:
updatetlevel
USE
model
,
ONLY
:
KIN_E
...
...
@@ -38,18 +38,18 @@ SUBROUTINE save_EM_ZF_modes
IF
(
KIN_E
)
&
moments_e_NZ
(
ips_e
:
ipe_e
,
ijs_e
:
ije_e
,
ikys
:
ikye
,
izs
:
ize
)
=
moments_e
(
ips_e
:
ipe_e
,
ijs_e
:
ije_e
,
ikys
:
ikye
,
ikx_0
,
izs
:
ize
,
updatetlevel
)
moments_i_NZ
(
ips_i
:
ipe_i
,
ijs_i
:
ije_i
,
ikys
:
ikye
,
izs
:
ize
)
=
moments_i
(
ips_i
:
ipe_i
,
ijs_i
:
ije_i
,
ikys
:
ikye
,
ikx_0
,
izs
:
ize
,
updatetlevel
)
phi_
EM
(
ikys
:
ikye
,
izs
:
ize
)
=
phi
(
ikys
:
ikye
,
ikx_0
,
izs
:
ize
)
phi_
NZ
(
ikys
:
ikye
,
izs
:
ize
)
=
phi
(
ikys
:
ikye
,
ikx_0
,
izs
:
ize
)
ELSE
IF
(
KIN_E
)
&
moments_e_NZ
(
ips_e
:
ipe_e
,
ijs_e
:
ije_e
,
ikys
:
ikye
,
izs
:
ize
)
=
0._dp
moments_i_NZ
(
ips_e
:
ipe_e
,
ijs_i
:
ije_i
,
ikys
:
ikye
,
izs
:
ize
)
=
0._dp
phi_
EM
(
ikys
:
ikye
,
izs
:
ize
)
=
0._dp
phi_
NZ
(
ikys
:
ikye
,
izs
:
ize
)
=
0._dp
ENDIF
END
SUBROUTINE
SUBROUTINE
play_with_modes
USE
fields
USE
array
,
ONLY
:
moments_e_ZF
,
moments_i_ZF
,
phi_ZF
,
moments_e_NZ
,
moments_i_NZ
,
phi_
EM
USE
array
,
ONLY
:
moments_e_ZF
,
moments_i_ZF
,
phi_ZF
,
moments_e_NZ
,
moments_i_NZ
,
phi_
NZ
USE
grid
USE
time_integration
,
ONLY
:
updatetlevel
USE
initial_par
,
ONLY
:
ACT_ON_MODES
...
...
@@ -100,7 +100,7 @@ SUBROUTINE play_with_modes
IF
(
KIN_E
)
&
moments_e
(
ips_e
:
ipe_e
,
ijs_e
:
ije_e
,
ikys
:
ikye
,
ikx_0
,
izs
:
ize
,
updatetlevel
)
=
moments_e_NZ
(
ips_e
:
ipe_e
,
ijs_e
:
ije_e
,
ikys
:
ikye
,
izs
:
ize
)
moments_i
(
ips_i
:
ipe_i
,
ijs_i
:
ije_i
,
ikys
:
ikye
,
ikx_0
,
izs
:
ize
,
updatetlevel
)
=
moments_i_NZ
(
ips_i
:
ipe_i
,
ijs_i
:
ije_i
,
ikys
:
ikye
,
izs
:
ize
)
phi
(
ikys
:
ikye
,
ikx_0
,
izs
:
ize
)
=
phi_
EM
(
ikys
:
ikye
,
izs
:
ize
)
phi
(
ikys
:
ikye
,
ikx_0
,
izs
:
ize
)
=
phi_
NZ
(
ikys
:
ikye
,
izs
:
ize
)
ENDIF
CASE
(
'amplify_zonal'
)
IF
(
KIN_E
)
&
...
...
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