CVS tagged version V7_09_02

LLNL · Jun 5, 2020 · e41df74 · e41df74
1 parent 00172bd
commit e41df74
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 199 deletions.
diff --git a/bbb/bbb.v b/bbb/bbb.v
@@ -2036,6 +2036,7 @@ eqp(0:nx+1,0:ny+1)          _real [1/m**3]#Te,i equipart. fact; needs *(Te-Ti)*v
 eqpg(0:nx+1,0:ny+1,ngsp)    _real [1/m**3]#Tg,i equipart. fact; needs *(Tg-Ti)*vol
 engcoolm(0:nx+1,0:ny+1)     _real [J/s]   #cool rate ion/atoms by mols if ishymol=1
 eeli(0:nx+1,0:ny+1)         _real  [J]    #electron energy loss per ionization
+pradhyd(0:nx+1,0:ny+1)      _real [W/m**3] /0./#power radiated by hydrogen
 tdiflim                      real [s] /0./ #lim on hcxe/ne; reduces hcxe if >0
 lmfplim			     real [m] /1.e20/#hcxe,i -> hcxe,i/(1+lmfp/lmfelim)
 eta1(0:nx+1,0:ny+1)	    _real [J-s/m**3] #Braginskii ion visc coeff eta_1
@@ -3807,7 +3808,7 @@ yielh(imx+1)	       _real
 yielz(imx+1,lnst+1)    _real
 
 ***** Ident_vars:
-uedge_ver  character*80 /'$Name: V7_09_01 $'/
+uedge_ver  character*80 /'$Name: V7_09_02 $'/
 uedge_date character*80 /'Version date in README_Uedge_vers in dir uedge'/
 
 ***** Last_group_ex_sav_var:

diff --git a/bbb/bbb_basis.v b/bbb/bbb_basis.v
@@ -2057,6 +2057,7 @@ eqp(0:nx+1,0:ny+1)          _real [1/m**3]#Te,i equipart. fact; needs *(Te-Ti)*v
 eqpg(0:nx+1,0:ny+1,ngsp)    _real [1/m**3]#Tg,i equipart. fact; needs *(Tg-Ti)*vol
 engcoolm(0:nx+1,0:ny+1)     _real [J/s]   #cool rate ion/atoms by mols if ishymol=1
 eeli(0:nx+1,0:ny+1)         _real  [J]    #electron energy loss per ionization
+pradhyd(0:nx+1,0:ny+1)      _real [W/m**3] /0./#power radiated by hydrogen
 tdiflim                      real [s] /0./ #lim on hcxe/ne; reduces hcxe if >0
 lmfplim			     real [m] /1.e20/#hcxe,i -> hcxe,i/(1+lmfp/lmfelim)
 eta1(0:nx+1,0:ny+1)	    _real [J-s/m**3] #Braginskii ion visc coeff eta_1
@@ -3105,6 +3106,7 @@ ifexmain           integer /0/  #scalar to indicate if subroutine allocate
                                 #is called by exmain.
                                 #=1 means allocate is called by exmain,
                                 #=0 means it is not.
+exmain_aborted integer /.false./ # Set to .true. in Python version on control-C abort
 iallcall	   integer /0/  #flag to signal first call to allocate
 
 ***** RZ_cell_info:
@@ -3827,7 +3829,7 @@ yielh(imx+1)	       _real
 yielz(imx+1,lnst+1)    _real
 
 ***** Ident_vars:
-uedge_ver  character*80 /'$Name: V7_09_01 $'/
+uedge_ver  character*80 /'$Name: V7_09_02 $'/
 uedge_date character*80 /'Version date in README_Uedge_vers in dir uedge'/
 
 ***** Last_group_ex_sav_var:

diff --git a/bbb/boundary.m b/bbb/boundary.m
@@ -300,7 +300,7 @@ call xerrab ('** isnicore value not valid option **')
 
   274 continue  # ifld loop over ion species
 
-c...  Now do the parallel velocity BC at iy = 0
+c...  Now do the parallel velocity BC at iy = 0 for full mom eqn species
       do ifld = 1, nusp
          do ix = i4+1-ixmnbcl, i8-1+ixmxbcl  #large ix-loop for up
             if (isuponxy(ix,0,ifld) .eq. 1) then
@@ -1699,7 +1699,7 @@ ccc              yldot(iv2) = nurlxp*(phiwo(ix) - phi(ix,ny))/temp0
               iv1 = idxn(ixt,iy,ifld)
               if (isupgon(1)==1 .and. zi(ifld)==0.0) then   ## neutrals
                 if (recylb(iy,1,jx) .gt. 0.) then           # recycling
-                  t0 = max(ti(ixt1,iy),temin*ev)
+                  t0 = max(tg(ixt1,iy,1),temin*ev)
                   vxn = 0.25 * sqrt( 8*t0/(pi*mi(ifld)) )
                   yldot(iv1) = -nurlxg *
      .             (fnix(ixt,iy,ifld) + recylb(iy,1,jx)*fnix(ixt,iy,1) -
@@ -1708,7 +1708,7 @@ ccc              yldot(iv2) = nurlxp*(phiwo(ix) - phi(ix,ny))/temp0
      .                 fngxslb(iy,1,jx) ) / (vpnorm*n0(ifld)*sx(ixt,iy))
                 elseif (recylb(iy,1,jx) <=  0. .and. 
      .                  recylb(iy,1,jx) >= -1.) then  # recylb is albedo
-                  t0 = max(ti(ixt,iy),temin*ev)
+                  t0 = max(tg(ixt,iy,1),temin*ev)
                   vyn = sqrt( 0.5*t0/(pi*mi(1)) )
                   yldot(iv1) = -nurlxg * ( fnix(ixt,iy,ifld) +
      .             (1+recylb(iy,1,jx))*ni(ixt,iy,ifld)*vyn*sx(ixt,iy) )/
@@ -2305,7 +2305,7 @@ ccc          yldot(iv) = -nurlxp*(phi(0,iy)-phi(1,iy))/temp0
               iv1 = idxn(ixt,iy,ifld)
               if (isupgon(1)==1 .and. zi(ifld)==0.0) then   ## neutrals
                 if (recyrb(iy,1,jx) .gt. 0.) then           # recycling
-                  t0 = max(ti(ixt1,iy),temin*ev)
+                  t0 = max(tg(ixt1,iy,1),temin*ev)
                   vxn = 0.25 * sqrt( 8*t0/(pi*mi(ifld)) )
                   yldot(iv1) = nurlxg *
      .               (fnix(ixt1,iy,ifld) + recyrb(iy,1,jx)*fnix(ixt1,iy,1) +
@@ -2314,7 +2314,7 @@ ccc          yldot(iv) = -nurlxp*(phi(0,iy)-phi(1,iy))/temp0
      .                - fngxsrb(iy,1,jx) ) / (vpnorm*n0(ifld)*sx(ixt1,iy))
                 elseif (recyrb(iy,1,jx) <=  0. .and. 
      .                  recyrb(iy,1,jx) >= -1.) then   # recyrb is albedo
-                  t0 = max(ti(ixt1,iy),temin*ev)
+                  t0 = max(tg(ixt1,iy,1),temin*ev)
                   vyn = sqrt( 0.5*t0/(pi*mi(1)) )
                   yldot(iv1) = nurlxg * ( fnix(ixt1,iy,ifld) -
      .                 (1+recyrb(iy,1,jx))*ni(ixt,iy,ifld)*vyn*sx(ixt1,iy) )/

diff --git a/bbb/oderhs.m b/bbb/oderhs.m
@@ -3095,6 +3095,13 @@ ccc          iysptrx is the last closed flux surface (see S.R. nphygeo)
               fnix(nxc-1,iy,ifld)=0.
               fnix(nxc,  iy,ifld)=0.
               fnix(nxc+1,iy,ifld)=0.
+              uu(nxc-1,iy,ifld) = 0.
+              uu(nxc  ,iy,ifld) = 0.
+              uu(nxc+1,iy,ifld) = 0.
+              vytan(nxc-1,iy,ifld) = 0.
+              vytan(nxc  ,iy,ifld) = 0.
+              vytan(nxc+1,iy,ifld) = 0.
+ 
            endif
            if (islimon.ne.0 .and. iy.ge.iy_lims) fnix(ix_lim,iy,ifld)=0.
            if (nxpt==2 .and. ixmxbcl==1) fnix(ixrb(1)+1,iy,ifld)=0.
@@ -4317,6 +4324,9 @@ c               if (ifld .ne. iigsp) then
                   if (icnuiz.le.1 .and. psor(ix,iy,1).ne.0.) 
      .                                           eeli(ix,iy) = 13.6*ev + 
      .                               erliz(ix,iy)/(fac2sp*psor(ix,iy,1))
+
+                  pradhyd(ix,iy)= ( (eeli(ix,iy)-ebind*ev)*psor(ix,iy,1)+
+     .                                         erlrc(ix,iy) )/vol(ix,iy)
  315           continue
  316        continue
 
@@ -8123,6 +8133,7 @@ cc      real(Size4) ranf
 c ... Count Jacobian evaluations, both for total and for this case
       ijactot = ijactot + 1   #note: ijactot set 0 in exmain if icntnunk=0
       ijac(ig) = ijac(ig) + 1
+
       if (svrpkg.eq.'nksol') write(*,*) ' Updating Jacobian, npe =  ', 
      .                                                          ijac(ig)
 

diff --git a/pyscripts/__version__.py b/pyscripts/__version__.py
@@ -1 +1 @@
-__version__ = '7.0.9.1.0rc1'
+__version__ = '7.0.9.2.0rc1'