Skip to content
Permalink
Browse files

Merge pull request #8 from evanoconnor/M1_reconstruct

making M1 reconstruction separate from hydro
  • Loading branch information...
evanoconnor committed Jul 13, 2017
2 parents 1e20db1 + b4aec0e commit c206d97fc515ad386778677c758c86fac7c43938
Showing with 7 additions and 9 deletions.
  1. +1 −0 src/GR1D_module.F90
  2. +3 −3 src/M1/M1_control.F90
  3. +2 −2 src/M1/M1_reconstruct.F90
  4. +1 −0 src/initialize_vars.F90
  5. +0 −4 src/input_parser.F90
@@ -93,6 +93,7 @@ module GR1D_module
integer iorder_hydro
character*80 hydro_formulation
character*80 reconstruction_method
character*80 M1_reconstruction_method

character*80 flux_type

@@ -28,7 +28,7 @@ subroutine M1_control
endif

if (phase.eq.1) then
reconstruction_method = M1_phase1_reconstruction
M1_reconstruction_method = M1_phase1_reconstruction
cffac = M1_phase1_cffac
number_species_to_evolve = M1_phase1_ns
if (M1_phase1_ies_way.eq.0) then
@@ -56,7 +56,7 @@ subroutine M1_control
stop "encpl_way not supported"
endif
else if (phase.eq.2) then
reconstruction_method = M1_phase2_reconstruction
M1_reconstruction_method = M1_phase2_reconstruction
cffac = M1_phase2_cffac
number_species_to_evolve = M1_phase2_ns
if (M1_phase2_ies_way.eq.0) then
@@ -84,7 +84,7 @@ subroutine M1_control
stop "encpl_way not supported"
endif
else
reconstruction_method = M1_phase3_reconstruction
M1_reconstruction_method = M1_phase3_reconstruction
cffac = M1_phase3_cffac
number_species_to_evolve = M1_phase3_ns
if (M1_phase3_ies_way.eq.0) then
@@ -65,10 +65,10 @@ subroutine M1_reconstruct
M1flux_space = M1flux_space/M1en_space

!reconstruct
if (reconstruction_method.eq.'tvd') then
if (M1_reconstruction_method.eq.'tvd') then
call tvd_reconstruction(n1,ghosts1,M1en_space,M1en_space_plus,M1en_space_minus,'minmod')
call tvd_reconstruction(n1,ghosts1,M1flux_space,M1flux_space_plus,M1flux_space_minus,'minmod')
else if (reconstruction_method.eq.'ppm') then
else if (M1_reconstruction_method.eq.'ppm') then
call ppm_interpolate(M1en_space,M1en_space_plus,M1en_space_minus)
call ppm_interpolate(M1flux_space,M1flux_space_plus,M1flux_space_minus)
call ppm_monotonize(M1en_space,M1en_space_plus,M1en_space_minus)
@@ -24,6 +24,7 @@ subroutine initialize_vars
ppm_origin_TVD = 0

reconstruction_method = " "
M1_reconstruction_method = " "
tvd_limiter = " "
flux_type = " "
fake_neutrinos = .false.
@@ -203,10 +203,6 @@ subroutine input_parser
call get_integer_parameter('M1_phase1_ies_way',M1_phase1_ies_way)
call get_integer_parameter('M1_phase1_encpl_way',M1_phase1_encpl_way)

if (M1_phase1_reconstruction.ne.reconstruction_method) then
write(*,*) "Initial M1 reconstruction method not the same as specified in main parameters"
stop
endif
if ((M1_phase1_ies_way.eq.0).and.(include_Ielectron_exp.or.include_Ielectron_imp)) then
write(*,*) "Initial M1 inelastic electron scattering method not the same as specified in main parameters"
stop

0 comments on commit c206d97

Please sign in to comment.
You can’t perform that action at this time.