Skip to content
Snippets Groups Projects
Commit ccc455f2 authored by Antoine Cyril David Hoffmann's avatar Antoine Cyril David Hoffmann
Browse files

changed the writing in advancing the moments

parent 22e728b5
No related branches found
No related tags found
No related merge requests found
...@@ -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 )
......
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment