diff --git a/bbb/bbb.v b/bbb/bbb.v index 02fe7074..48ef9eb8 100755 --- a/bbb/bbb.v +++ b/bbb/bbb.v @@ -245,6 +245,7 @@ isnupdot1sd integer /0/ #=0, use 2-pt ndot for (n*up)_dot; isphicore0 integer /0/ #=1 sets phi=phi_mp in core if isphion=1 is_z0_imp_const integer /0/ #=0 use hydr Keilhacker;=1 z0_imp_const z0_imp_const real /1./ #z0 in therm force if is_z0_imp_const=1 +upbparadir integer /0/ # Internal multiplicative switch for up equation ***** Model_choice restart: #Flags for choosing one or another calculation of a part of the model diff --git a/bbb/odesetup.m b/bbb/odesetup.m index d14d343f..a5fad8dd 100755 --- a/bbb/odesetup.m +++ b/bbb/odesetup.m @@ -27,6 +27,7 @@ Use(Lsode) # neq,jacflg,jpre,ipar,ismmaxuc,mmaxu Use(Solver_work_arrays) # liw,lrw,iwork Use(Grid) # inewton + Use(Comflxgrd) # cpasma Use(Interp) # nxold,nyold Use(Decomp) # ubw,lbw Use(Jacobian) # neqp1,nnzmx @@ -57,7 +58,7 @@ cc Use(Rccoef) * -- local variables integer lda, lenk, ngspon, nispon, nuspon, ntgspon, ifld, isor, id - character*60 runid + character*60 runidint integer iprt_tfcx_warn data iprt_tfcx_warn/1/ #Former Aux module variables @@ -172,13 +173,20 @@ call gchange("Xpoint_indices",0) #needed to allocate ixrb endif endif call gchange("Xpoint_indices",0) - call readgridpars(trim(GridFileName),runid) #define/redefine iysptrx1 etc + call readgridpars(trim(GridFileName),runidint) #define/redefine iysptrx1 etc nx = nxm - abs(nxomit) ny = nym - nyomitmx endif # end if-test on gengrid endif # end if-test on newgeo endif # end if-test on isallloc +c Check the direction of the toroidal current + if (cpasma .lt. 0) then + upbparadir = -1 + else + upbparadir = 1 + endif + c ... Check that number neutral gas species is not larger than ngspmx if (ngsp .gt. ngspmx) then