Merge branch 'master' of github.com:danieljprice/splash

danieljprice · Jul 3, 2024 · 3970b06 · 3970b06
2 parents e915f1c + 1f8a9a7
commit 3970b06
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/labels.f90 b/src/labels.f90
@@ -43,7 +43,7 @@ module labels
  integer :: ipmass,ike,ispsound,itemp,ikappa
  integer :: idivb,iJfirst,irhostar,ipmomx
  integer :: iacplane,ipowerspec
- integer :: icv,iradenergy
+ integer :: icv,iradenergy,iradFx
  integer :: isurfdens,itoomre
  integer :: ipdf,icolpixmap
  integer :: irhorestframe,idustfrac,ideltav
@@ -87,6 +87,7 @@ subroutine reset_columnids
  ivrel = 0      ! relative velocity
  itemp = 0      ! temperature
  ikappa = 0     ! opacity
+ iradFx = 0
  iacplane = 0
  ike = 0
  idivB = 0

diff --git a/src/read_data_sphNG.f90 b/src/read_data_sphNG.f90
@@ -2563,7 +2563,7 @@ subroutine set_labels_sphNG
  use labels, only:label,unitslabel=>unitslabel_default,&
               labelzintegration=>labelzintegration_default,labeltype,labelvec,iamvec, &
               ix,ipmass,irho,ih,iutherm,ipr,ivx,iBfirst,idivB,iJfirst,icv,iradenergy,&
-              idustfrac,ideltav,idustfracsum,ideltavsum,igrainsize,igraindens, &
+              idustfrac,ideltav,idustfracsum,ideltavsum,igrainsize,igraindens,iradFx, &
               ivrel,make_vector_label,get_label_grain_size,itemp,ikappa,ipmomx,irhorestframe
  use params
  use settings_data,   only:ndim,ndimV,ntypes,ncolumns,UseTypeInRenderings,debugmode
@@ -2684,6 +2684,8 @@ subroutine set_labels_sphNG
        case('kappa')
           unitslabel(i) = ' [cm^2/g]'
           units(i) = udist**2/umass
+       case('radFx')
+          iradFx = i
        case('radP')
           label(i) = 'radiation pressure'
           unitslabel(i) = ' [g / (cm s^2)]'
@@ -2778,6 +2780,7 @@ subroutine set_labels_sphNG
  call make_vector_label('B',iBfirst,ndimV,iamvec,labelvec,label,labelcoord(:,1))
  call make_vector_label('J',iJfirst,ndimV,iamvec,labelvec,label,labelcoord(:,1))
  call make_vector_label('p',ipmomx,ndimV,iamvec,labelvec,label,labelcoord(:,1))
+ call make_vector_label('grad E',iradFx,ndimV,iamvec,labelvec,label,labelcoord(:,1))
  !
  !--ensure labels are unique by appending numbers where necessary
  !
@@ -2805,6 +2808,10 @@ subroutine set_labels_sphNG
     units(ivx:ivx+ndimV-1) = unitvel
     unitslabel(ivx:ivx+ndimV-1) = unitlabelv
  endif
+ if (iradFx > 0) then
+    units(iradFx:iradFx+ndimV-1) = umass/(udist*utime)**2
+    unitslabel(iradFx:iradFx+ndimV-1) = ' [erg/cm^4]'
+ endif
  if (ipmomx > 0) then
     units(ipmomx:ipmomx+ndimV-1) = unitvel
     unitslabel(ipmomx:ipmomx+ndimV-1) = unitlabelv