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
8a9087ec
Commit
8a9087ec
authored
1 year ago
by
Antoine Cyril David Hoffmann
Browse files
Options
Downloads
Patches
Plain Diff
Advancing ExB implementation
parent
45ec2316
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+5
-4
5 additions, 4 deletions
Makefile
src/ExB_shear_flow_mod.F90
+11
-7
11 additions, 7 deletions
src/ExB_shear_flow_mod.F90
with
16 additions
and
11 deletions
Makefile
+
5
−
4
View file @
8a9087ec
...
@@ -147,7 +147,8 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
...
@@ -147,7 +147,8 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
$(OBJDIR)/auxval.o
:
src/auxval.F90
\
$(OBJDIR)/auxval.o
:
src/auxval.F90
\
$(OBJDIR)/fourier_mod.o $(OBJDIR)/memory.o $(OBJDIR)/model_mod.o
\
$(OBJDIR)/fourier_mod.o $(OBJDIR)/memory.o $(OBJDIR)/model_mod.o
\
$(OBJDIR)/geometry_mod.o $(OBJDIR)/grid_mod.o $(OBJDIR)/numerics_mod.o
\
$(OBJDIR)/geometry_mod.o $(OBJDIR)/grid_mod.o $(OBJDIR)/numerics_mod.o
\
$(OBJDIR)/parallel_mod.o $(OBJDIR)/processing_mod.o $(OBJDIR)/CLA_mod.o
$(OBJDIR)/parallel_mod.o $(OBJDIR)/processing_mod.o $(OBJDIR)/CLA_mod.o
\
$(OBJDIR)/ExB_shear_flow_mod.o
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/auxval.F90
-o
$@
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/auxval.F90
-o
$@
$(OBJDIR)/basic_mod.o
:
src/basic_mod.F90
\
$(OBJDIR)/basic_mod.o
:
src/basic_mod.F90
\
...
@@ -227,7 +228,7 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
...
@@ -227,7 +228,7 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/geometry_mod.F90
-o
$@
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/geometry_mod.F90
-o
$@
$(OBJDIR)/ghosts_mod.o
:
src/ghosts_mod.F90
\
$(OBJDIR)/ghosts_mod.o
:
src/ghosts_mod.F90
\
$(OBJDIR)/basic_mod.o $(OBJDIR)/fields_mod.o $(OBJDIR)/grid_mod.o
\
$(OBJDIR)/basic_mod.o $(OBJDIR)/fields_mod.o $(OBJDIR)/grid_mod.o
\
$(OBJDIR)/geometry_mod.o $(OBJDIR)/prec_const_mod.o $(OBJDIR)/time_integration_mod.o
$(OBJDIR)/geometry_mod.o $(OBJDIR)/prec_const_mod.o $(OBJDIR)/time_integration_mod.o
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/ghosts_mod.F90
-o
$@
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/ghosts_mod.F90
-o
$@
...
@@ -256,7 +257,7 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
...
@@ -256,7 +257,7 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
$(OBJDIR)/memory.o
:
src/memory.F90 $
\
$(OBJDIR)/memory.o
:
src/memory.F90 $
\
$(OBJDIR)/array_mod.o $(OBJDIR)/basic_mod.o $(OBJDIR)/collision_mod.o
\
$(OBJDIR)/array_mod.o $(OBJDIR)/basic_mod.o $(OBJDIR)/collision_mod.o
\
$(OBJDIR)/fields_mod.o $(OBJDIR)/model_mod.o $(OBJDIR)/time_integration_mod.o
\
$(OBJDIR)/fields_mod.o $(OBJDIR)/model_mod.o $(OBJDIR)/time_integration_mod.o
\
$(OBJDIR)/grid_mod.o
$(OBJDIR)/grid_mod.o
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/memory.F90
-o
$@
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/memory.F90
-o
$@
...
@@ -327,7 +328,7 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
...
@@ -327,7 +328,7 @@ $(OBJDIR)/time_integration_mod.o $(OBJDIR)/utility_mod.o $(OBJDIR)/CLA_mod.o
$(OBJDIR)/array_mod.o $(OBJDIR)/numerics_mod.o $(OBJDIR)/fields_mod.o
\
$(OBJDIR)/array_mod.o $(OBJDIR)/numerics_mod.o $(OBJDIR)/fields_mod.o
\
$(OBJDIR)/ghosts_mod.o $(OBJDIR)/moments_eq_rhs_mod.o $(OBJDIR)/solve_EM_fields.o
\
$(OBJDIR)/ghosts_mod.o $(OBJDIR)/moments_eq_rhs_mod.o $(OBJDIR)/solve_EM_fields.o
\
$(OBJDIR)/utility_mod.o $(OBJDIR)/model_mod.o $(OBJDIR)/time_integration_mod.o
\
$(OBJDIR)/utility_mod.o $(OBJDIR)/model_mod.o $(OBJDIR)/time_integration_mod.o
\
$(OBJDIR)/CLA_mod.o
$(OBJDIR)/CLA_mod.o
$(OBJDIR)/ExB_shear_flow_mod.o
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/stepon.F90
-o
$@
$(
F90
)
-c
$(
F90FLAGS
)
$(
FPPFLAGS
)
$(
EXTMOD
)
$(
EXTINC
)
src/stepon.F90
-o
$@
$(OBJDIR)/tesend.o
:
src/tesend.F90
\
$(OBJDIR)/tesend.o
:
src/tesend.F90
\
...
...
This diff is collapsed.
Click to expand it.
src/ExB_shear_flow_mod.F90
+
11
−
7
View file @
8a9087ec
...
@@ -39,7 +39,7 @@ CONTAINS
...
@@ -39,7 +39,7 @@ CONTAINS
SUBROUTINE
Apply_ExB_shear_flow
SUBROUTINE
Apply_ExB_shear_flow
USE
basic
,
ONLY
:
chrono_ExBs
,
start_chrono
,
stop_chrono
USE
basic
,
ONLY
:
chrono_ExBs
,
start_chrono
,
stop_chrono
USE
grid
,
ONLY
:
local_nky
,
kxarray
,
update_grids
,
&
USE
grid
,
ONLY
:
local_nky
,
kxarray
,
update_grids
,
&
loc
al_nkx
,
deltakx
,
kx_min
,
kx_max
tot
al_nkx
,
deltakx
,
kx_min
,
kx_max
USE
prec_const
,
ONLY
:
PI
USE
prec_const
,
ONLY
:
PI
USE
geometry
,
ONLY
:
gxx
,
gxy
,
inv_hatB2
,
evaluate_magn_curv
USE
geometry
,
ONLY
:
gxx
,
gxy
,
inv_hatB2
,
evaluate_magn_curv
USE
numerics
,
ONLY
:
evaluate_EM_op
,
evaluate_kernels
USE
numerics
,
ONLY
:
evaluate_EM_op
,
evaluate_kernels
...
@@ -55,13 +55,17 @@ CONTAINS
...
@@ -55,13 +55,17 @@ CONTAINS
IF
(
shiftnow_ExB
(
iky
))
THEN
IF
(
shiftnow_ExB
(
iky
))
THEN
print
*
,
"SHIFT ARRAYS"
print
*
,
"SHIFT ARRAYS"
! shift all fields
! shift all fields
DO
ikx
=
1
,
loc
al_nkx
DO
ikx
=
1
,
tot
al_nkx
ikx_s
=
ikx
+
jump_ExB
(
iky
)
ikx_s
=
ikx
+
jump_ExB
(
iky
)
IF
(
(
kxarray
(
iky
,
ikx
)
.GE.
kx_min
)
.AND.
(
kxarray
(
iky
,
ikx
)
.LE.
kx_max
)
)
THEN
! We test if the shifted modes are still in contained in our resolution
! IF( (kxarray(iky,ikx)-sky_ExB(iky) .GE. kx_min) .AND. (kxarray(iky,ikx)-sky_ExB(iky) .LE. kx_max) ) THEN
IF
(
((
ikx_s
.GT.
0
)
.AND.
(
ikx_s
.LE.
total_nkx
))
.AND.
&
(((
ikx
.LE.
(
total_nkx
/
2+1
))
.AND.
(
ikx_s
.LE.
(
total_nkx
/
2+1
)))
.OR.
&
((
ikx
.GT.
(
total_nkx
/
2+1
))
.AND.
(
ikx_s
.GT.
(
total_nkx
/
2+1
))))
)
THEN
moments
(:,:,:,
iky
,
ikx
,:,:)
=
moments
(:,:,:,
iky
,
ikx_s
,:,:)
moments
(:,:,:,
iky
,
ikx
,:,:)
=
moments
(:,:,:,
iky
,
ikx_s
,:,:)
phi
(
iky
,
ikx
,:)
=
phi
(
iky
,
ikx_s
,:)
phi
(
iky
,
ikx
,:)
=
phi
(
iky
,
ikx_s
,:)
psi
(
iky
,
ikx
,:)
=
psi
(
iky
,
ikx_s
,:)
psi
(
iky
,
ikx
,:)
=
psi
(
iky
,
ikx_s
,:)
ELSE
ELSE
! if it is not, it is lost (~dissipation for high modes)
moments
(:,:,:,
iky
,
ikx
,:,:)
=
0._xp
moments
(:,:,:,
iky
,
ikx
,:,:)
=
0._xp
phi
(
iky
,
ikx
,:)
=
0._xp
phi
(
iky
,
ikx
,:)
=
0._xp
psi
(
iky
,
ikx
,:)
=
0._xp
psi
(
iky
,
ikx
,:)
=
0._xp
...
@@ -76,9 +80,9 @@ CONTAINS
...
@@ -76,9 +80,9 @@ CONTAINS
CALL
update_grids
(
sky_ExB
,
gxx
,
gxy
,
inv_hatB2
)
CALL
update_grids
(
sky_ExB
,
gxx
,
gxy
,
inv_hatB2
)
! update the EM op., the kernels and the curvature op.
! update the EM op., the kernels and the curvature op.
CALL
evaluate_kernels
!
CALL evaluate_kernels
CALL
evaluate_EM_op
!
CALL evaluate_EM_op
CALL
evaluate_magn_curv
!
CALL evaluate_magn_curv
CALL
stop_chrono
(
chrono_ExBs
)
CALL
stop_chrono
(
chrono_ExBs
)
END
SUBROUTINE
Apply_ExB_shear_flow
END
SUBROUTINE
Apply_ExB_shear_flow
...
...
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