Updates bbb to work with grid morph updates

- Removes now-obsolete override switch
LLNL · Feb 21, 2024 · b92de71 · b92de71
1 parent 5c6e012
commit b92de71
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/bbb/bbb.v b/bbb/bbb.v
@@ -341,7 +341,6 @@ cfbgt     real      /0./    +input #Coef for the B x Grad(T) terms.
 cfjhf     real      /1./    +input #Coef for convective cur (fqp) heat flow
 jhswitch  integer   /0/     +input #Coef for the Joule-heating terms
 oldseec   real      /1./    +input #Switch for Joule-heating bugfix
-override  integer   /0/     +input #Switch to manually override checks on old models
 cf2ef     real      /0./    +input #Coef for ExB drift in 2-direction
 cfyef     real      /0./    +input #Coef for ExB drift in y-direction
 cftef     real      /0./    +input #Coef for ExB drift in toroidal direction
@@ -2915,14 +2914,15 @@ iwkd2(ndiagmx) _integer       # work array used by cdiagsrt
 #Auxiliary variables for Ueinit.
 GridFileName   character*200 /"gridue"/ +input
                               # name of Grid file to be read
-newgeo         integer   /1/  +input #flag to calculate new grid (1=yes)
+newgeo         integer   /1/  +setup #flag to calculate new grid (1=yes)
 mhdgeo         integer  /-1/  +input #flag for grid geometry
                               #mhdgeo =  2 ==> toroidal circular limiter
                               #mhdgeo =  1 ==> toroidal MHD equilibrium
                               #mhdgeo =  0 ==> cylindrical geometry
                               #mhdgeo = -1 ==> cartesian geometry
                               #mhdgeo = -2 ==> mag mirror (FRC-annulus)
 gengrid        integer   /1/  +input #flag to generate grid, else read from file GridFileName
+manualgrid     integer   /0/  +setup #flag whether to read grid values from gridue or memory
 isgindx        integer   /1/  #=1 for interpolating grid based on indices
 nfmax          integer   /10/
 restart        integer   /0/  +input #flag for restart from previous case(yes=1)
@@ -3198,6 +3198,7 @@ exmain                                           subroutine
 exmain_prelims                                   subroutine
 uedriv()                                         subroutine
 convert()                                        subroutine
+guardc()                                         subroutine
 convsr_vo(i,j,yl:real)                           subroutine
 	# in i
 	# in j
@@ -3979,3 +3980,9 @@ Timefd2tra real /0.0/
 TotTimefd2tra real /0.0/
 PrintTimingPandf() subroutine
 
+
+**** Uetools:
+# Variables for explicit use by uetools
+dummy           real    /0./     # Dummy variable for testing etc.
+gridmorph       real    /0./     # Grid morphing factor to be used with UETOOLS 
+