Mostly formatting

Author: ErolBa

.gitignore

@@ -60,6 +60,3 @@ src/msphdf5.f90
 
 # vscode files
 .vscode/
-
-# conda files
-etc/conda/

Utilities/pythontools/requirements.txt

@@ -2,5 +2,4 @@ h5py
 matplotlib
 f90nml
 numpy
-scipy
 coilpy

src/dforce.f90

@@ -98,16 +98,14 @@ subroutine dforce( NGdof, position, force, LComputeDerivatives, LComputeAxis)
 
   use numerical, only : logtolerance
 
-  use fileunits, only : ounit
+  use fileunits, only : ounit, munit
 
   use inputlist, only : Wmacros, Wdforce, Nvol, Ntor, Lrad, Igeometry, &
                         epsilon, &
                         Lconstraint, Lcheck, dRZ, &
                         Lextrap, &
                         mupftol, &
-                        Lfreebound, LHmatrix, gamma, pscale, adiabatic, rpol, rtor
-
-  use fileunits, only : ounit, hunit, munit ! added by Erol
+                        Lfreebound, LHmatrix, gamma, pscale, adiabatic
 
   use cputiming, only : Tdforce
 
@@ -136,8 +134,8 @@ subroutine dforce( NGdof, position, force, LComputeDerivatives, LComputeAxis)
                         LocalConstraint, xoffset, &
                         solution, IPdtdPf, &
                         IsMyVolume, IsMyVolumeValue, WhichCpuID, &
-                        ext, vvolume, & ! For outputing Lcheck = 6 test
-                        BetaTotal
+                        ext, & ! For outputing Lcheck = 6 test
+                        BetaTotal, vvolume
 
 !-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
 

src/global.f90

@@ -66,7 +66,7 @@ module constants
   REAL, parameter :: mu0        =   2.0E-07 * pi2       !< \f$4\pi\cdot10^{-7}\f$
   REAL, parameter :: goldenmean =   1.618033988749895   !< golden mean = \f$( 1 + \sqrt 5 ) / 2\f$ ;
 
-  REAL, parameter :: version    =   3.21  !< version of SPEC
+  REAL, parameter :: version    =   3.20  !< version of SPEC
 
 end module constants
 
@@ -250,13 +250,13 @@ module allglobal
 
   REAL                 :: ForceErr !< total force-imbalance
   REAL                 :: Energy   !< MHD energy
-  REAL                 :: BetaTotal=0.0   !< Beta, averaged over entire domain
+  REAL                 :: BetaTotal = 0.0   !< Beta, averaged over entire domain
 
   REAL   , allocatable :: IPDt(:), IPDtDpf(:,:)  !< Toroidal pressure-driven current
 
   INTEGER              :: Mvol
 
-  REAL :: total_pflux ! total pflux, used in Lconstraint=3, Igeometry=1 -- Edit by Erol
+  REAL :: total_pflux ! used when Lconstraint=3, Igeometry=1
 
   LOGICAL              :: YESstellsym !< internal shorthand copies of Istellsym, which is an integer input;
   LOGICAL              :: NOTstellsym !< internal shorthand copies of Istellsym, which is an integer input;

src/pp00ab.f90

@@ -33,7 +33,7 @@ subroutine pp00ab( lvol, sti, Nz, nPpts, poincaredata, fittedtransform, utflag )
 
 !-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
 
-  use constants, only : zero, one, two, pi2, pi
+  use constants, only : zero, one, two, pi2
 
   use numerical, only : small
 
@@ -115,13 +115,11 @@ subroutine pp00ab( lvol, sti, Nz, nPpts, poincaredata, fittedtransform, utflag )
 
 !-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
 
-
-
    do kk = 0, Nz-1 ! loop over toroidal Poincare cross sections;
 
 !-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-    stz(1:3) = (/ ppt(2), mod(ppt(1),pi2), zst /) ! toroidal coordinates;
 
+    stz(1:3) = (/ ppt(2), mod(ppt(1),pi2), zst /) ! toroidal coordinates; 
 
     if( abs(stz(1)).gt.one ) then ;                                        ; utflag = 0 ; exit ! exit do kk loop; 22 Apr 13; ! 28 Feb 17;
 

src/preset.f90

@@ -508,13 +508,14 @@ subroutine preset
   SALLOCATE( dtflux, (1:Mvol), zero )
   SALLOCATE( dpflux, (1:Mvol), zero )
 
+  ! with Igeom=1, Lcons=3, need to provide total pflux
   if(Lconstraint.eq.3 .and. Igeometry.eq.1) then
       total_pflux = pflux(Mvol) * phiedge / pi2
       pflux(Mvol) = 0
   endif
 
   select case( Igeometry )
-  case( 1   ) ; dtflux(1) = tflux(1) ; dpflux(1) = pflux(1) ! Edit by Erol -- Cartesian              ; this is the "inverse" operation defined in xspech; 09 Mar 17;
+  case( 1   ) ; dtflux(1) = tflux(1) ; dpflux(1) = pflux(1) ! Cartesian ; this is the "inverse" operation defined in xspech; 09 Mar 17;
   case( 2:3 ) ; dtflux(1) = tflux(1) ; dpflux(1) = zero     ! cylindrical or toroidal;
   end select
 
@@ -813,7 +814,7 @@ subroutine preset
     SALLOCATE( IPDtDpf, (1:Mvol  , 1:Mvol  ), zero)
   else
     if(Igeometry.eq.1) then
-      ! add an additional constraint to make the total pflux = 0 -- Edit Erol
+      ! add an additional constraint to make the total pflux = 0
       SALLOCATE( IPDtDpf, (1:Mvol, 1:Mvol), zero) 
     else
       SALLOCATE( IPDtDpf, (1:Mvol-1, 1:Mvol-1), zero)

src/volume.f90

@@ -120,7 +120,7 @@ subroutine volume( lvol, vflag )
      if( dBdX%issym.eq.0 ) dvolume = one ! note that the sign factor for the lower interface is included below; 20 Jun 14;
     endif
 
-    ! Erol -- potential fix
+    ! respecting rpol, rtor sizes of slab
     vol(innout) = vol(innout) * rpol * rtor
 
 !-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
@@ -334,8 +334,6 @@ subroutine volume( lvol, vflag )
    write(ounit,'("volume : ",f10.2," : myid=",i3," ; Igeometry=",i2," ; vvolume(",i3," ) =",es23.15" ;")') cput-cpus, myid, Igeometry, lvol, vvolume(lvol)
   endif
 
-  ! write(*,*)"lvol ", lvol, "volume", vvolume(lvol)
-
 !-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
 
   FATAL( volume, vflag.eq.0 .and. vvolume(lvol).lt.small, volume cannot be zero or negative ) ! 15 Jan 13;

src/xspech.f90

@@ -100,13 +100,13 @@ subroutine xspech
 
   ! initialize internal arrays based on data from input file
   call preset()
-  
+
   ! initialize HDF5 library and open output file ext.h5 for writing during execution
   call init_outfile()
-  
+
   ! mirror input file contents to output file
   call mirror_input_to_outfile()
-  
+
 !-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
 
   if ( myid .eq. 0 ) then ! save restart file;