Skip to content
Permalink
Browse files

Merge branch 'effectivepotential' of fermi.tapir.caltech.edu:GR1D int…

…o effectivepotential
  • Loading branch information...
Evan O'Connor
Evan O'Connor committed Nov 5, 2015
2 parents dbffc85 + 353f7ef commit 4ac2ae42f46c9e2b6476dafa6ee6a42bfda7d309
Showing with 58 additions and 8 deletions.
  1. +14 −0 githints.txt
  2. +8 −6 src/M1/M1_implicitstep.F90
  3. +36 −2 src/output_control.F90
@@ -0,0 +1,14 @@
useful git command, feel free to add more

to checkout a particular branch

> git checkout somebranch

to make a new branch

> git branch mynewbranch
> git checkout mynewbranch

to push a new branch back to fermi

> git push origin mynewbranch
@@ -1021,28 +1021,30 @@ subroutine M1_implicitstep(dts,implicit_factor)
inverse(j+number_groups,j) = -NL_jacobian(j+number_groups,j)/det
enddo

!if things are implicit beyond E and F coupling in the same
!group, then must use the full formalism, otherwise, do the
!simple way, this can make a big difference if number of
!groups is large
new_NL_jacobian = 0.0d0

if (include_Ielectron_imp.or.include_energycoupling_imp.or.include_epannihil_kernels) then
do j=1,2*number_groups
do j_prime=1,2*number_groups
new_NL_jacobian(j,j_prime) = sum(inverse(j,:)*NL_jacobian(:,j_prime))
enddo
new_RF(j) = sum(inverse(j,:)*RF(:))
new_RF(j) = sum(inverse(j,:)*RF(:))
enddo
else
do j=1,number_groups
new_NL_jacobian(j,j) = inverse(j,j)*NL_jacobian(j,j) + &
inverse(j,j+number_groups)*NL_jacobian(j+number_groups,j)
new_NL_jacobian(j,j+number_groups) = inverse(j,j)*NL_jacobian(j,j+number_groups) + &
inverse(j,j+number_groups)*NL_jacobian(j+number_groups,j+number_groups)


new_NL_jacobian(j+number_groups,j) = inverse(j+number_groups,j)*NL_jacobian(j,j) + &
inverse(j+number_groups,j+number_groups)*NL_jacobian(j+number_groups,j)
new_NL_jacobian(j+number_groups,j) = inverse(j+number_groups,j)*NL_jacobian(j,j) + &
inverse(j+number_groups,j+number_groups)*NL_jacobian(j+number_groups,j)

new_NL_jacobian(j+number_groups,j+number_groups) = &
inverse(j+number_groups,j)*NL_jacobian(j,j+number_groups) + &
inverse(j+number_groups,j+number_groups)*NL_jacobian(j+number_groups,j+number_groups)

new_RF(j) = inverse(j,j)*RF(j)+inverse(j,j+number_groups)*RF(j+number_groups)
new_RF(j+number_groups) = inverse(j+number_groups,j)*RF(j) + &
@@ -5,7 +5,9 @@ subroutine output_control
implicit none

real*8 t_pb, minalp
integer i
integer i,ig
character*1024 filename
logical temp_vs_mass

! switch back to normal output after this
! amount of time
@@ -56,11 +58,43 @@ subroutine output_control
bounce = .true.
t_bounce = time
write(*,"(A20,1P10E15.6)") "bounce! NUCEOS, entropy > 3 in inner core", t_bounce

!find xi_{2.5}
ig = 1
do while(mass(ig) .le. 2.5d0 .and. ig.lt.n1)
ig = ig+1
enddo

open(unit=666,file=trim(adjustl(outdir))//"/tbounce.dat", &
status='unknown',form='formatted',position='rewind')
write(666,"(E27.18)") t_bounce
write(666,"(E27.18)") t_bounce,x1i(ig)/length_gf, mass(ig) / (x1i(ig)/length_gf/1.0d8), &
mass(i),mass(ig)
close(666)

i = n1-ghosts1

! write mbary vs. radius profile for compactness parameter
! evaluation
temp_vs_mass = vs_mass
vs_mass = .false.
filename = trim(adjustl(outdir))//"/mass_bary_at_bounce.xg"
call output_single(mass/mass_gf,filename)

vs_mass = .true.

filename = trim(adjustl(outdir))//"/rho_at_bounce.xg"
call output_single(rho/rho_gf,filename)
filename = trim(adjustl(outdir))//"/v_at_bounce.xg"
call output_single(v*clite,filename)
filename = trim(adjustl(outdir))//"/temperature_at_bounce.xg"
call output_single(temp,filename)
filename = trim(adjustl(outdir))//"/entropy_at_bounce.xg"
call output_single(entropy,filename)
filename = trim(adjustl(outdir))//"/ye_at_bounce.xg"
call output_single(ye,filename)

vs_mass = temp_vs_mass

else
i = i+1
endif

0 comments on commit 4ac2ae4

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