Skip to content

Commit

Permalink
Revert "Uses precomputed logti"
Browse files Browse the repository at this point in the history
This reverts commit d3983fb.
  • Loading branch information
holm10 committed Jan 16, 2025
1 parent 1f9a216 commit 4dad69a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
24 changes: 12 additions & 12 deletions bbb/oderhs.m
Original file line number Diff line number Diff line change
Expand Up @@ -4358,25 +4358,25 @@ c if (ifld .ne. iigsp) then
c --- Note: this four-point average results in not getting the full Jac. for
c --- a nonorthogonal mesh because of niy1,0 - see def. of hcyn

grdnv =( ( fym (ix,iy,1)*logti(ix2,iy1 ) +
. fy0 (ix,iy,1)*logti(ix2,iy ) +
. fyp (ix,iy,1)*logti(ix2,iy+1) +
. fymx(ix,iy,1)*logti(ix ,iy1 ) +
. fypx(ix,iy,1)*logti(ix ,iy+1) )
. -( fym (ix,iy,0)*logti(ix ,iy1 ) +
. fy0 (ix,iy,0)*logti(ix ,iy ) +
. fyp (ix,iy,0)*logti(ix ,iy+1) +
. fymx(ix,iy,0)*logti(ix4,iy1 ) +
. fypx(ix,iy,0)*logti(ix6,iy+1) ) ) /
grdnv =( ( fym (ix,iy,1)*log(ti(ix2,iy1 )) +
. fy0 (ix,iy,1)*log(ti(ix2,iy )) +
. fyp (ix,iy,1)*log(ti(ix2,iy+1)) +
. fymx(ix,iy,1)*log(ti(ix ,iy1 )) +
. fypx(ix,iy,1)*log(ti(ix ,iy+1)) )
. -( fym (ix,iy,0)*log(ti(ix ,iy1 )) +
. fy0 (ix,iy,0)*log(ti(ix ,iy )) +
. fyp (ix,iy,0)*log(ti(ix ,iy+1)) +
. fymx(ix,iy,0)*log(ti(ix4,iy1 )) +
. fypx(ix,iy,0)*log(ti(ix6,iy+1)) ) ) /
. dxnog(ix,iy)
feixy(ix,iy) = exp( 0.5*
. (logti(ix2,iy) + logti(ix,iy)) )*
. (log(ti(ix2,iy)) + log(ti(ix,iy))) )*
. ( (fcdif*kyi+kyi_use(ix,iy))*0.5*
. (nit(ix2,iy)+nit(ix,iy))
. + cftiexclg*cfneut*cfneutsor_ei*0.25*(hcyn(ix ,iy)+hcyn(ix ,iy1)
. +hcyn(ix2,iy)+hcyn(ix4,iy1)) ) *
. ( grdnv/cosangfx(ix,iy)
. - (logti(ix2,iy) - logti(ix,iy))*
. - (log(ti(ix2,iy)) - log(ti(ix,iy)))*
. gxf(ix,iy) )*sx(ix,iy)
c... Flux limit with flalftxt even though hcys have parallel FL built in
t0 = max(ti(ix,iy),temin*ev)
Expand Down
2 changes: 0 additions & 2 deletions bbb/odesetup.m
Original file line number Diff line number Diff line change
Expand Up @@ -1611,9 +1611,7 @@ call xerrab("")
logtg(ix,iy,igsp) = LOG(tg(ix,iy,igsp))
enddo
te(ix,iy) = tes(ix,iy)
logte(ix,iy) = log(te(ix,iy))
ti(ix,iy) = tis(ix,iy)
logti(ix,iy) = log(ti(ix,iy))
phi(ix,iy) = phis(ix,iy)
if (isimpon .eq. 2 .or. isimpon .eq. 7) then
if (afracs(1,1)+afracs(nx,ny).gt.1.e-20) then
Expand Down

0 comments on commit 4dad69a

Please sign in to comment.