Pypi version 7.0.8.4.15rc1. This version contains the direct solver.

Author: llnl-fesp

MANIFEST

@@ -21,6 +21,7 @@ a.out
 convertor
 forthonf2c.h
 localrules.py
+localrules.pyc
 mppl.h
 pck
 setup.py
@@ -51,13 +52,6 @@ api/forthonf2c.h
 api/inelrates.m
 api/pck
 api/sputt.m
-bbb/.#bbb.v.7.10
-bbb/.#bbb.v.7.11
-bbb/.#bbb.v.7.13
-bbb/.#bbb.v.7.14
-bbb/.#bbb.v.7.19
-bbb/.#bbb.v.7.9
-bbb/.#geometry.m.7.6
 bbb/.odesolve.m.swp
 bbb/Package
 bbb/PackageMake
@@ -74,6 +68,7 @@ bbb/geometry.m
 bbb/griddubl.m
 bbb/lsodefix
 bbb/oderhs.m
+bbb/oderhs.m.sav
 bbb/odesetup.m
 bbb/odesolve.m
 bbb/pck
@@ -137,11 +132,14 @@ jupyter/PyUedge.ipynb
 jupyter/README
 jupyter/aeqdsk
 jupyter/case_setup.py
+jupyter/case_setup2.py
+jupyter/case_setup2.pyc
 jupyter/d3d.hdf5
 jupyter/d3d.pdb
 jupyter/gridue
 jupyter/junk.tris
 jupyter/neqdsk
+jupyter/rdd3d_cfdupg.8x4.hdf5
 jupyter/.ipynb_checkpoints/PyUedge-checkpoint.ipynb
 pyscripts/.#rdinitdt.py.7.0
 pyscripts/.#uedge_lists.py.7.2
@@ -159,10 +157,12 @@ pyscripts/bbb.dat
 pyscripts/cdf4.py
 pyscripts/com.dat
 pyscripts/convert.py
+pyscripts/convert.pyc
 pyscripts/convert1.py
 pyscripts/convertvsh5.py
 pyscripts/double.py
 pyscripts/filelists.py
+pyscripts/filelists.pyc
 pyscripts/flx.dat
 pyscripts/grd.dat
 pyscripts/hdf5.py
@@ -202,15 +202,20 @@ pyscripts/contrib/reconv.py
 pyscripts/contrib/ue_animate.py
 pyscripts/contrib/ue_plot.py
 pyscripts/contrib/utils.py
+pytests/README
 pytests/__init__.py
 pytests/__init__.pyc
 pytests/uedge_test.py
 pytests/uedge_test.pyc
 pytests/level_1/dotest.py
 pytests/level_1/template.py
 pytests/level_1/pyres/template.res
+pytests/level_2/aeqdsk
+pytests/level_2/aeqdskd3d
 pytests/level_2/dotest.py
 pytests/level_2/gridue
+pytests/level_2/neqdsk
+pytests/level_2/neqdskd3d
 pytests/level_2/rdd3d_cfdupg_8x4.py
 pytests/level_2/data/aeqdskd3d
 pytests/level_2/data/d3d_cfdupg.h5
@@ -227,6 +232,7 @@ svr/PackageMake
 svr/daspk.m
 svr/daux1.f
 svr/nksol.m
+svr/nksol.m.sav
 svr/pck
 svr/petsc-uedge.F90
 svr/svr.pack

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: uedge
-Version: 7.0.8.4.14
+Version: 7.0.8.4.15rc1
 Summary: 2D Fluid simulation of plasma and neutrals in magnetic fusion devices
 Home-page: UNKNOWN
 Author: Bill Meyer

bbb/oderhs.m

@@ -1 +1 @@
-__version__ = '7.0.8.4.14'
+__version__ = '7.0.8.4.15rc1'

jupyter/PyUedge.ipynb

@@ -10,7 +10,8 @@
 from uedge import *
 from numpy import sin, cos
 from scipy import spatial
-from scipy.misc import bytescale
+from skimage.util import img_as_ubyte as bytescale
+
 
 # This file defines a function to plot the UEDGE mesh, and # then calls the function to plot the entire mesh.
 # To use this file in a simple way, give the following ands:
@@ -222,7 +223,7 @@ def mkdensityfile(filename, ival, renmin=None, renmax=None, samples=[500, 500, 5
     val[:, -1] = 0
     vf = np.append(val.ravel(), [renmin])
     #dens = bytescale(np.average(vf[i],axis=1,weights=1./d),cmin=renmin,cmax=renmax)
-    dens = bytescale(vf[i], cmin=renmin, cmax=renmax)
+    dens = bytescale(vf[i] - renmin)
     file.write(dens)
     file.close()
 

localrules.pyc

@@ -10,7 +10,7 @@
 from Forthon.compilers import FCompiler
 import getopt
 
-version='7.0.8.4.14'
+version='7.0.8.4.15rc1'
 
 try:
     os.environ['PATH'] += os.pathsep + site.USER_BASE + '/bin'

pyscripts/__version__.py

@@ -1,5 +1,5 @@
 c
-c $Id: nksol.m,v 7.1 2019/10/14 22:59:29 meyer8 Exp $
+c $Id: nksol.m,v 7.2 2020/02/12 18:35:18 meyer8 Exp $
 c
 
 c!include "../mppl.h"
@@ -811,7 +811,9 @@ ccc      write(*,*) 'epsmch = ', epsmch
 c-----------------------------------------------------------------------
 c     initialize parameters.  check for illegal input.
 c-----------------------------------------------------------------------
-      if ( (iabs(mf) .lt. 1) .or. (iabs(mf) .gt. 3) ) then
+
+c:MVU 15-jan-2020      if ( (iabs(mf) .lt. 1) .or. (iabs(mf) .gt. 3) ) then
+      if ( (iabs(mf) .lt. 1) .or. (iabs(mf) .gt. 4) ) then
 c illegal value of method flag mf.
         iterm = -1
         ierr = 10
@@ -832,9 +834,21 @@ call errgen(ierr,zero,zero,0,0)
         elseif (mf .eq. -1) then
           methn = 0
           methk = 2
-        elseif (mf .ge. 2) then
+ccc MVU: 15-jan-2020					  
+c        elseif (mf .ge. 2) then
+c          methn = 2
+c          methk = mf - 1
+        elseif (mf .eq. 2) then
+          methn = 2
+          methk = 1
+        elseif (mf .eq. 3) then
           methn = 2
-          methk = mf - 1
+          methk = 2
+        elseif (mf .eq. 4) then
+c........ using direct solver
+          methn = 2
+          methk = 3
+ccc MVU: 15-jan-2020
         elseif (mf .le. -2) then
           methn = 0
           methk = -mf - 1
@@ -920,6 +934,10 @@ call errgen(ierr,rwork(i),zero,i,0)
           lenk = 1 + 3*n + 3 + n*mmax + n + mmax**2
         else if (methk .eq. 2) then
           lenk = 1 + 3*n + 3 + n*mmax + n + 2 + 2*mmax*(mmax+1) + mmax
+ccc MVU: 15-jan-2020
+        else if (methk .eq. 3) then
+          lenk = 1 + 3*n + 3 + n*mmax + n + 2 + 2*mmax*(mmax+1) + mmax
+ccc MVU: 15-jan-2020
         endif
       lenwm = lenk + lenwmp
       if (lenwmp .ne. 0) then
@@ -1565,6 +1583,9 @@ dimension u(*), savf(n), su(n), sf(n), wm(lenwm), iwm(leniwm),
 c methods used so far:
 c 1. methk = 1      ------> spiom
 c 2. methk = 2      ------> gmres
+ccc MVU: 15-jan-2020
+c 3. methk = 3      ------> direct
+ccc MVU: 15-jan-2020
 c-----------------------------------------------------------------------
       integer i, ib, iflag, ihes, iv, miom
       real bnrm
@@ -1578,7 +1599,7 @@ dimension u(*), savf(n), su(n), sf(n), wm(lenwm), iwm(leniwm),
       save
 c
       iersl = 0
-      go to (100,200), methk
+      go to (100,200,300), methk
 c-----------------------------------------------------------------------
 c use the spiom algorithm to solve the linear system j*x = -f.
 c-----------------------------------------------------------------------
@@ -1628,6 +1649,56 @@ call scopy (mmax, wm(ib), 1, wm(ihes), 1)
         iwm(1) = mgmr
         endif
       return
+
+ccc MVU: 15-jan-2020
+c-----------------------------------------------------------------------
+c use the direct algorithm to solve the linear system j*x = -f.
+c-----------------------------------------------------------------------
+ 300  continue
+      mmaxp1 = mmax + 1
+      iv = 3
+      ib = iv + n*mmax
+      ihes = ib + n + 1
+      ihsv = ihes + mmax*(mmaxp1+1) + 1
+      iwk = ihsv + mmax*mmaxp1
+      iq = iwk + n
+      do 310 i = 1,n
+ 310     wm(i+ib-1) = x(i)
+
+ccc - this is direct solver
+      do i=1,n
+       x(i)=x(i)*sf(i)/su(i)
+      enddo
+      call psol(n, u, savf, su, sf, f, jac, wm(iwk), wm(locwmp),
+     *          iwm(locimp), x, iflag)
+      npsl = 1
+      bnrm = 0.
+      mgmr = 1
+      rhom = 0.
+
+ccc - this way mfnksol=4 would identically match mfnksol=3
+c$$$      call spigmr (n, u, savf, wm(ib), su, sf, mmax, mmaxp1, kmp,
+c$$$     *   eps, f, jac, psol, npsl, x, wm(iv), wm(ihes), wm(iq),
+c$$$     *   wm(ihsv), mgmr, wm(locwmp), iwm(locimp), wm(iwk), methn,
+c$$$     *   bnrm, ipflg, iflag, rhom)
+
+      nni = nni + 1
+      nli = nli + mgmr
+      nps = nps + npsl
+      if (iflag .ne. 0) ncfl = ncfl + 1
+      if (iflag .ge. 2) iersl = 1
+      if (iflag .lt. 0) iersl = -1
+      if (iersl .eq. 0) then
+        call scopy (mmax, wm(ib), 1, wm(ihes), 1)
+        wm(1) = bnrm
+        iwm(1) = mgmr
+        endif
+      return
+ccc MVU: 15-jan-2020
+
+
+
+
 c----------------------- end of subroutine solpk -----------------------
       end
       subroutine spiom (n, u, savf, b, su, sf, mmax, iomp, eps,
@@ -3186,6 +3257,9 @@ call cnstrt (n, u, p, icnstr, tau, rlx, iret, ivar)
       slpi = -two*f1nrm*ratio
 CCC should an adjf1 be used for f1nrm above??
       if (methk .eq. 2) slpi = slpi + rhom*rhom*ratio
+ccc MVU: 15-jan-2020
+      if (methk .eq. 3) slpi = slpi + rhom*rhom*ratio
+ccc MVU: 15-jan-2020
       call slngth(n, u, p, su, rlngth)
       rlmin = stptol/rlngth
       rl = one
@@ -3368,7 +3442,7 @@ subroutine errgen (ierr, v1, v2, i1, i2)
 c-----------------------------------------------------------------------
  9000   format(//
      * ' nksol ---  illegal value for mf.  mf must be between '
-     */'            1 and 3, or between -3 and -1.'
+     */'            1 and 4, or between -3 and -1.'
      *)
  9010   format(//
      * ' nksol ---  illegal value for mdif.  mdif must either 0 or 1. '