Up to date with the CVS head and cleaned out old facets stuff and not required

for the core.

Author: llnl-fesp

Configure

@@ -1,6 +1,6 @@
 
 UEDGE is in a transitional phase from running in the BASIS environment, 
-developed at LLNL, to Python. This version, tagged $Name: V7_09_01 $, can 
+developed at LLNL, to Python. This version, tagged $Name:  $, can 
 run in both environments. If you have interest in the Basis version of 
 UEDGE contact Bill Meyer ([email protected]). New installations of the 
 Basis version are discouraged as there is no longer any official support 

Configure.sys

@@ -2,46 +2,56 @@ DEBUG = -v --fargs "-Ofast -DFORTHON -cpp" # -g #--fargs "-C=array" #--fargs "-C
 
 SO = so
 PUBLICHOME = 
-BUILDDIR = ../build
+BUILDDIR = build
 DIRLIST = com aph api bbb flx grd svr wdf
-MYPYTHON = python2
-FORTHON = Forthon
+MYPYTHON = python3
+FORTHON = Forthon3
+BUILDBASE = -v --build-base $(BUILDDIR)
+INSTALLARGS = --pkgbase uedge $(BUILDBASE) 
 ##MYPYTHON = /home1/rognlien/Python2/Python-2.4.2/python
 
 # Following 2 variables set in Makefile.PETSc, if used (if unset, ignored)
 # SETUPOPTS =
 # PETSC-UEDGE =
 # PETSC-COM =
 
-all: mppl2f90 compy.$(SO) aphpy.$(SO) apipy.$(SO) bbbpy.$(SO) flxpy.$(SO) grdpy.$(SO) svrpy.$(SO) wdfpy.$(SO)
+all: mppl2f90 $(BUILDDIR)/compydep $(BUILDDIR)/grdpydep $(BUILDDIR)/flxpydep $(BUILDDIR)/bbbpydep $(BUILDDIR)/svrpydep $(BUILDDIR)/wdfpydep $(BUILDDIR)/aphpydep $(BUILDDIR)/apipydep 
 	rm -f uedgeC.so
 
 mppl2f90:
 	(export PYTHONPATH=.:./pyscripts; $(MYPYTHON) convertor)
 
-compy.$(SO): com/blasext.F com/brent.F com/comutil.F com/misc.F com/mnbrak.F com/dsum.f com/dummy_py.f com/error.f com/getmsg.f com/ssum.f com/$(PETSC-COM) com/com.v
-	(cd com;$(FORTHON) --builddir $(BUILDDIR) -a $(FCOMP) $(DEBUG) -f blasext.F com brent.F comutil.F misc.F mnbrak.F dsum.f dummy_py.f error.f getmsg.f ssum.f $(PETSC-COM))
+$(BUILDDIR)/compydep: com/blasext.F com/brent.F com/comutil.F com/misc.F com/mnbrak.F com/dsum.f com/dummy_py.f com/error.f com/getmsg.f com/ssum.f com/$(PETSC-COM) com/com.v
+	$(FORTHON) -a $(INSTALLARGS) -a $(FCOMP) $(DEBUG) --interfacefile com/com.v -f com/blasext.F com com/brent.F com/comutil.F com/misc.F com/mnbrak.F com/dsum.f com/dummy_py.f com/error.f com/getmsg.f com/ssum.f $(PETSC-COM)
+	touch $@
 
-aphpy.$(SO): compy.$(SO) aph/aphrates.F aph/aphread.F aph/aph.v
-	(cd aph;$(FORTHON) --builddir $(BUILDDIR)  -a $(FCOMP) $(DEBUG) -f aphrates.F aph aphread.F)
+$(BUILDDIR)/aphpydep: $(BUILDDIR)/compydep aph/aphrates.F aph/aphread.F aph/aph.v
+	$(FORTHON) -a $(INSTALLARGS)  -a $(FCOMP) $(DEBUG) --interfacefile aph/aph.v -f aph/aphrates.F aph aph/aphread.F
+	touch $@
 
-apipy.$(SO): compy.$(SO) api/apifcn.F api/apip93.F api/apisorc.F api/fimp.F api/fmombal.F api/inelrates.F api/sputt.F api/api.v com/com.v
-	(cd api;$(FORTHON) --builddir $(BUILDDIR)  -a $(FCOMP) $(DEBUG) -d com -f apifcn.F api apip93.F apisorc.F fimp.F fmombal.F inelrates.F sputt.F)
+$(BUILDDIR)/apipydep: $(BUILDDIR)/compydep api/apifcn.F api/apip93.F api/apisorc.F api/fimp.F api/fmombal.F api/inelrates.F api/sputt.F api/api.v com/com.v
+	$(FORTHON) -a $(INSTALLARGS)  -a $(FCOMP) $(DEBUG) --interfacefile api/api.v -d com -f api/apifcn.F api api/apip93.F api/apisorc.F api/fimp.F api/fmombal.F api/inelrates.F api/sputt.F
+	touch $@
 
-bbbpy.$(SO): compy.$(SO) bbb/boundary.F bbb/convert.F bbb/geometry.F bbb/griddubl.F bbb/oderhs.F bbb/odesetup.F bbb/odesolve.F bbb/potencur.F bbb/turbulence.F bbb/ext_neutrals.F bbb/bbb.v com/com.v
-	(cd bbb;$(FORTHON) --builddir $(BUILDDIR)  -a $(FCOMP) $(DEBUG) --macros ../com/com.v $(READLINE) -d com -f boundary.F bbb convert.F geometry.F griddubl.F oderhs.F odesetup.F odesolve.F potencur.F turbulence.F ext_neutrals.F)
+$(BUILDDIR)/bbbpydep: $(BUILDDIR)/compydep bbb/boundary.F bbb/convert.F bbb/geometry.F bbb/griddubl.F bbb/oderhs.F bbb/odesetup.F bbb/odesolve.F bbb/potencur.F bbb/turbulence.F bbb/ext_neutrals.F bbb/bbb.v com/com.v 
+	$(FORTHON) -a $(INSTALLARGS)  -a $(FCOMP) --interfacefile bbb/bbb.v $(DEBUG) --macros com/com.v $(READLINE) -d com -f bbb/boundary.F bbb bbb/convert.F bbb/geometry.F bbb/griddubl.F bbb/oderhs.F bbb/odesetup.F bbb/odesolve.F bbb/potencur.F bbb/turbulence.F bbb/ext_neutrals.F 
+	touch $@
 
-flxpy.$(SO): compy.$(SO) flx/flxcomp.F flx/flxdriv.F flx/flxread.F flx/flxwrit.F flx/flx.v com/com.v
-	(cd flx;$(FORTHON) --builddir $(BUILDDIR)  -a $(FCOMP) $(DEBUG) -d com -f flxcomp.F flx flxdriv.F flxread.F flxwrit.F)
+$(BUILDDIR)/flxpydep: $(BUILDDIR)/compydep flx/flxcomp.F flx/flxdriv.F flx/flxread.F flx/flxwrit.F flx/flx.v com/com.v
+	$(FORTHON) -a $(INSTALLARGS)  -a $(FCOMP) $(DEBUG) --interfacefile flx/flx.v -d com -f flx/flxcomp.F flx flx/flxdriv.F flx/flxread.F flx/flxwrit.F
+	touch $@
 
-grdpy.$(SO): compy.$(SO) grd/grdcomp.F grd/grddriv.F grd/grdinit.F grd/grdread.F grd/grdwrit.F grd/grd.v com/com.v
-	(cd grd;$(FORTHON) --builddir $(BUILDDIR)  -a $(FCOMP) $(DEBUG) -d com -f grdcomp.F grd grddriv.F grdinit.F grdread.F grdwrit.F)
+$(BUILDDIR)/grdpydep: $(BUILDDIR)/compydep grd/grdcomp.F grd/grddriv.F grd/grdinit.F grd/grdread.F grd/grdwrit.F grd/grd.v com/com.v
+	$(FORTHON) -a $(INSTALLARGS)  -a $(FCOMP) $(DEBUG) --interfacefile grd/grd.v -d com -f grd/grdcomp.F grd grd/grddriv.F grd/grdinit.F grd/grdread.F grd/grdwrit.F
+	touch $@
 
-svrpy.$(SO): svr/daspk.F svr/nksol.F svr/svrut1.F svr/svrut2.F svr/svrut3.F svr/svrut4.F svr/vodpk.F svr/uoa.F svr/daux1.f svr/$(PETSC-UEDGE) svr/svr.v
-	(cd svr;$(FORTHON) --builddir $(BUILDDIR)  -a $(FCOMP) $(DEBUG) -f daspk.F svr nksol.F svrut1.F svrut2.F svrut3.F svrut4.F vodpk.F uoa.F daux1.f $(PETSC-UEDGE))
+$(BUILDDIR)/svrpydep: $(BUILDDIR)/bbbpydep svr/daspk.F svr/nksol.F svr/svrut1.F svr/svrut2.F svr/svrut3.F svr/svrut4.F svr/vodpk.F svr/uoa.F svr/daux1.f svr/$(PETSC-UEDGE) svr/svr.v
+	$(FORTHON) -a $(INSTALLARGS)  -a $(FCOMP) $(DEBUG) --interfacefile svr/svr.v --macros bbb/bbb.v -d bbb -f svr/daspk.F svr svr/nksol.F svr/svrut1.F svr/svrut2.F svr/svrut3.F svr/svrut4.F svr/vodpk.F svr/uoa.F svr/daux1.f $(PETSC-UEDGE)
+	touch $@
 
-wdfpy.$(SO): wdf/wdf.F wdf/wdf.v
-	(cd wdf;$(FORTHON) --builddir $(BUILDDIR)  -a $(FCOMP) $(DEBUG) wdf)
+$(BUILDDIR)/wdfpydep: wdf/wdf.F wdf/wdf.v
+	$(FORTHON) -a $(INSTALLARGS)  -a $(FCOMP) $(DEBUG) --interfacefile wdf/wdf.v -f wdf/wdf.F wdf
+	touch $@
 
 public: all
 	publishpyuedge90.py $(PUBLICHOME)
@@ -55,6 +65,7 @@ update:
 clean:
 	find . -depth -name build -exec rm -rf {} \;
 	find . -depth -name __pycache__ -exec rm -rf {} \;
+	find . -name \*.pyc -exec rm {} \;
 	find . -name \*.F -exec rm {} \;
 	touch uedgeC_Forthon.c
 

Dirlist

@@ -5,7 +5,7 @@ FARGS       = --fargs  -I$(PETSC_DIR) --fargs -I$(PETSC_DIR)/$(PETSC_ARCH)/inclu
 #FCOMP       = -F g95 $(FARGS)
 FCOMP       = $(FARGS)
 
-include Makefile.Forthon
+include Makefile.Forthon3
 
 MYPYTHONP = python-uedge
 SETUPOPTS   = --petsc

INSTALL

@@ -29,7 +29,7 @@ those of the United States Government or the University of California, and
 shall not be used for advertising or product endorsement purposes.
 
 *****************************************************************************
-This file was committed $Date: 2018/02/28 18:32:42 $ and tagged $Name: V7_09_01 $
+This file was committed $Date: 2021/05/12 23:23:14 $ and tagged $Name:  $
 
 Version 3.0	Corresponds to CVS archives as of 12/14/99
 

LICENSE

@@ -57,7 +57,8 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
          erl1 = erl11 + fje*(erl12-erl11)
 
 c----------------------------------------------------------------------c
-      elseif (istabon>9 .and. istabon<14) then # logarith. interp on Stotler-95
+      elseif ((istabon>9 .and. istabon<14) .or. istabon .eq. 17) then 
+c     log-log interp on Stotler DEGAS2 tables
 
          jr = 1
 
@@ -138,7 +139,7 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
 
 c----------------------------------------------------------------------c
       else				# write error message
-         call xerrab('function erl1 not defined for istabon > 15')
+         call xerrab('function erl1 not defined for istabon > 17')
       endif
 
       return
@@ -203,7 +204,8 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
          erl2 = erl21 + fje*(erl22-erl21)
 
 c----------------------------------------------------------------------c
-      elseif (istabon>9 .and. istabon<14) then # log. interp. of Stotler-95
+      elseif ((istabon>9 .and. istabon<14) .or. istabon .eq. 17) then 
+c     log-log interp on Stotler DEGAS2 tables
 
          jr = 1
 
@@ -284,7 +286,7 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
 
 c-----------------------------------------------------------------------
       else				# write error message
-         call xerrab('function erl2 not defined for istabon > 15')
+         call xerrab('function erl2 not defined for istabon > 17')
       endif
 
       return
@@ -311,6 +313,7 @@ real function rcx (t0, n0, k)
       real kdum
       integer zn,za,zamax
       external mcrates
+      real rcxcopy
 
 c     Compute rate parameter for k--->k-1 charge exchange on neutral hydrogen
 c     k               = initial charge state
@@ -385,7 +388,8 @@ c     fractional part of interval (je,je+1) --
          zn=1     # nuclear charge for hydrogenic species
          zamax=1  # maximum atomic charge for hydrogenic species
          za=1     # compute c-x rate for this charge state
-         call mcrates(n0,t0,t0,za,zamax,zn,kdum,kdum,rcx)
+         call mcrates(n0,t0,t0,za,zamax,zn,kdum,kdum,rcxcopy)
+         rcx=rcxcopy
 
 c----------------------------------------------------------------------c
       else     #     use analytic model (hydrogen) for all other istabon
@@ -638,6 +642,7 @@ real function rra (te, ne, tau, k)
       real xuse,yuse,vlog10rra
       real kdum
       integer zn,za,zamax
+      real rracopy
 
 c     Compute rate parameter for k--->k-1 recombination
 c     k               = initial charge state
@@ -772,7 +777,8 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
          rra = srecf(te/ev,ne)
 
 c----------------------------------------------------------------------c
-      elseif (istabon>9 .and. istabon<14) then  # use log interp on Stotler
+      elseif ((istabon>9 .and. istabon<14) .or. istabon .eq. 17) then 
+c     log-log interp on Stotler DEGAS2 tables
          jr = 1
 c     compute abscissae --
          zloge=log(te/ev)
@@ -854,7 +860,8 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
             zn=1     # nuclear charge for hydrogenic species
             zamax=1  # maximum atomic charge for hydrogenic species
             za=1     # compute recombination rate for this charge state
-            call mcrates(ne,te,te,za,zamax,zn,kdum,rra,kdum)
+            call mcrates(ne,te,te,za,zamax,zn,kdum,rracopy,kdum)
+            rra=rracopy
 
 c----------------------------------------------------------------------c
       endif
@@ -892,6 +899,7 @@ real function rsa (te, ne, tau, k)
       real kdum
       integer zn,za,zamax
       external mcrates
+      real rsacopy
 
 c     Compute rate parameter for k--->k+1 ionization by electrons
 c     k               = initial charge state
@@ -1027,7 +1035,8 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
          rsa = sionf(te/ev,ne)
 
 c----------------------------------------------------------------------c
-      elseif (istabon>9 .and. istabon<14) then  # log interp on Stotler
+      elseif ((istabon>9 .and. istabon<14) .or. istabon .eq. 17) then 
+c     log-log interp on Stotler DEGAS2 tables
 
          jr = 1
 
@@ -1111,7 +1120,8 @@ c     fractional parts of intervals (je,je+1) and (jd,jd+1) --
             zn=1     # nuclear charge for hydrogenic species
             zamax=1  # maximum atomic charge for hydrogenic species
             za=0     # compute ionization rate for this charge state
-            call mcrates(ne,te,te,za,zamax,zn,rsa,kdum,kdum)
+            call mcrates(ne,te,te,za,zamax,zn,rsacopy,kdum,kdum)
+            rsa=rsacopy
 
 c----------------------------------------------------------------------c
       endif

MANIFEST.in

@@ -118,6 +118,14 @@ call readmc(nhdf,hdfilename)
 c ...       the same ne-dimension and te-dimension for all species, so
 c ...       the hydrogenic tables must have the same dimensions as the 
 c ...       impurity tables, if both are present.
+      elseif (istabon .eq. 17) then
+         mpe=60
+         mpd=15
+         mpr=1
+         call gallot("Rtdegas",0)
+         call findFile('ehr5.dat', aphdirx, dataDir, adname, isaphdir)
+         call readehr2(TRIM(adname))
+         call setauxvar
       endif
 
       return

Makefile.Forthon

@@ -70,13 +70,13 @@ real fnzyso(0:nxd+1,nzsptd)   # source profiles along outer wall
 
 c ... Loop over impurity sources, doing the outer and inner walls.
       do isor = 1, nzsor
-         call imp_sorc (nxd, nzsptd, iszsorlb(1,isor),
-     .                  ixzbego(1,isor), ixzendo(1,isor), ixp1o,
-     .                  ximpo(1,isor), wimpo(1,isor), impsoro(1,isor),
+         call imp_sorc (nxd, nzsptd, iszsorlb(1:,isor),
+     .                  ixzbego(1:,isor), ixzendo(1:,isor), ixp1o,
+     .                  ximpo(1:,isor), wimpo(1:,isor), impsoro(1:,isor),
      .                                               xcwo, syo, fnzyso)
-         call imp_sorc (nxd, nzsptd, iszsorlb(1,isor),
-     .                  ixzbegi(1,isor), ixzendi(1,isor), ixp1i,
-     .                  ximpi(1,isor), wimpi(1,isor), impsori(1,isor),
+         call imp_sorc (nxd, nzsptd, iszsorlb(1:,isor),
+     .                  ixzbegi(1:,isor), ixzendi(1:,isor), ixp1i,
+     .                  ximpi(1:,isor), wimpi(1:,isor), impsori(1:,isor),
      .                                               xcwi, syi, fnzysi)
       enddo
 

Makefile.Forthon3

@@ -276,16 +276,18 @@ real denmass(miso,0:nzch), caplam(KXA,miso),
      >	  (nuion(misa,nz) + nurec(misa,nz))*al32(m)
             fricc(misa,nz,5) = - denmass(misa,nz)*usol(m,nz,misa)*
      >	    (nuion(misa,nz) + nurec(misa,nz))*al32(m)
-	  if( nz.gt.1 )
-     >	  friction(misa,nz) = friction(misa,nz) + usol(m,nz-1,misa)
-     >	  *denmass(misa,nz-1) * nuion(misa,nz-1) * al32(m)
+	  if( nz.gt.1 ) then
+      	    friction(misa,nz) = friction(misa,nz) + usol(m,nz-1,misa)
+     >	    *denmass(misa,nz-1) * nuion(misa,nz-1) * al32(m)
             fricc(misa,nz,5) = fricc(misa,nz,5) + usol(m,nz-1,misa)
      >	    *denmass(misa,nz-1) * nuion(misa,nz-1) * al32(m)
-	  if( nz.lt.nzmax )
-     >	  friction(misa,nz) = friction(misa,nz) + usol(m,nz+1,misa)
-     >	  *denmass(misa,nz+1) * nurec(misa,nz+1) * al32(m)
+          endif
+	  if( nz.lt.nzmax ) then
+      	    friction(misa,nz) = friction(misa,nz) + usol(m,nz+1,misa)
+     >	    *denmass(misa,nz+1) * nurec(misa,nz+1) * al32(m)
             fricc(misa,nz,5) = fricc(misa,nz,5) + usol(m,nz+1,misa)
      >	    *denmass(misa,nz+1) * nurec(misa,nz+1) * al32(m)
+          endif
 	  enddo
 	enddo
 	return

Makefile.PETSc

@@ -5,9 +5,13 @@
 	! maximum number of gas species; also must set in com.v
 #define nmcmx 12
         ! maximum number of EIRENE test species in data file 'fort.44'
-#define ndomainmx 128
+#define ndomainmx 32
          ! maximum number of domains for domain decomposition
 #define nxptmx 2
          ! maximum number of x-points in R-Z domain
 #define ndcsmx nispmx*nxptmx
          ! data dimension for csfaclb and csfacrb
+#define nispmxngspmx nispmx*ngspmx 
+         ! tot numb ion*gas species
+#define nstramx  10 
+         ! maximum number of strata for MC neutrals code