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
ccc455f2
Commit
ccc455f2
authored
3 years ago
by
Antoine Cyril David Hoffmann
Browse files
Options
Downloads
Patches
Plain Diff
changed the writing in advancing the moments
parent
22e728b5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/advance_field.F90
+2
-2
2 additions, 2 deletions
src/advance_field.F90
src/stepon.F90
+22
-21
22 additions, 21 deletions
src/stepon.F90
with
24 additions
and
23 deletions
src/advance_field.F90
+
2
−
2
View file @
ccc455f2
...
@@ -14,7 +14,7 @@ CONTAINS
...
@@ -14,7 +14,7 @@ CONTAINS
CALL
set_updatetlevel
(
mod
(
updatetlevel
,
ntimelevel
)
+1
)
CALL
set_updatetlevel
(
mod
(
updatetlevel
,
ntimelevel
)
+1
)
END
SUBROUTINE
advance_time_level
END
SUBROUTINE
advance_time_level
SUBROUTINE
advance_moments
_explicit
SUBROUTINE
advance_moments
USE
basic
USE
basic
USE
time_integration
USE
time_integration
...
@@ -56,7 +56,7 @@ CONTAINS
...
@@ -56,7 +56,7 @@ CONTAINS
! Execution time end
! Execution time end
CALL
cpu_time
(
t1_adv_field
)
CALL
cpu_time
(
t1_adv_field
)
tc_adv_field
=
tc_adv_field
+
(
t1_adv_field
-
t0_adv_field
)
tc_adv_field
=
tc_adv_field
+
(
t1_adv_field
-
t0_adv_field
)
END
SUBROUTINE
advance_moments
_explicit
END
SUBROUTINE
advance_moments
SUBROUTINE
advance_field
(
f
,
f_rhs
)
SUBROUTINE
advance_field
(
f
,
f_rhs
)
...
...
This diff is collapsed.
Click to expand it.
src/stepon.F90
+
22
−
21
View file @
ccc455f2
SUBROUTINE
stepon
SUBROUTINE
stepon
! Advance one time step, (num_step=4 for Runge Kutta 4 scheme)
! Advance one time step, (num_step=4 for Runge Kutta 4 scheme)
USE
advance_field_routine
,
ONLY
:
advance_time_level
,
advance_field
USE
advance_field_routine
,
ONLY
:
advance_time_level
,
advance_field
,
advance_moments_explicit
USE
array
,
ONLY
:
moments_rhs_e
,
moments_rhs_i
,
Sepj
,
Sipj
USE
array
,
ONLY
:
moments_rhs_e
,
moments_rhs_i
,
Sepj
,
Sipj
USE
basic
USE
basic
USE
closure
USE
closure
...
@@ -31,7 +31,8 @@ SUBROUTINE stepon
...
@@ -31,7 +31,8 @@ SUBROUTINE stepon
CALL
advance_time_level
CALL
advance_time_level
! Update moments with the hierarchy RHS (step by step)
! Update moments with the hierarchy RHS (step by step)
! N_n+1 = N_n + N_rhs(n)
! N_n+1 = N_n + N_rhs(n)
CALL
advance_moments
! CALL advance_moments
CALL
advance_moments_explicit
! Closure enforcement of N_n+1
! Closure enforcement of N_n+1
CALL
apply_closure_model
CALL
apply_closure_model
! Exchanges the ghosts values of N_n+1
! Exchanges the ghosts values of N_n+1
...
@@ -59,25 +60,25 @@ SUBROUTINE stepon
...
@@ -59,25 +60,25 @@ SUBROUTINE stepon
CONTAINS
CONTAINS
SUBROUTINE
advance_moments
!
SUBROUTINE advance_moments
! Execution time start
!
! Execution time start
CALL
cpu_time
(
t0_adv_field
)
!
CALL cpu_time(t0_adv_field)
!
DO
ip
=
ips_e
,
ipe_e
!
DO ip=ips_e,ipe_e
DO
ij
=
ijs_e
,
ije_e
!
DO ij=ijs_e,ije_e
CALL
advance_field
(
moments_e
(
ip
,
ij
,:,:,:),
moments_rhs_e
(
ip
,
ij
,:,:,:))
!
CALL advance_field(moments_e(ip,ij,:,:,:),moments_rhs_e(ip,ij,:,:,:))
ENDDO
!
ENDDO
ENDDO
!
ENDDO
DO
ip
=
ips_i
,
ipe_i
!
DO ip=ips_i,ipe_i
DO
ij
=
ijs_i
,
ije_i
!
DO ij=ijs_i,ije_i
CALL
advance_field
(
moments_i
(
ip
,
ij
,:,:,:),
moments_rhs_i
(
ip
,
ij
,:,:,:))
!
CALL advance_field(moments_i(ip,ij,:,:,:),moments_rhs_i(ip,ij,:,:,:))
ENDDO
!
ENDDO
ENDDO
!
ENDDO
!
! Execution time end
!
! Execution time end
CALL
cpu_time
(
t1_adv_field
)
!
CALL cpu_time(t1_adv_field)
tc_adv_field
=
tc_adv_field
+
(
t1_adv_field
-
t0_adv_field
)
!
tc_adv_field = tc_adv_field + (t1_adv_field - t0_adv_field)
END
SUBROUTINE
advance_moments
!
END SUBROUTINE advance_moments
SUBROUTINE
checkfield_all
! Check all the fields for inf or nan
SUBROUTINE
checkfield_all
! Check all the fields for inf or nan
...
...
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