[FIELDLINES] allow start from plasma boundary given in VMEC INDATA, not only wout

FIELDLINES/Sources/fieldlines_init.f90

@@ -3,7 +3,7 @@
 !     Authors:       S. Lazerson ([email protected])
 !     Date:          02/21/2012
 !     Description:   This subroutine initializes the fields on the
-!                    R, phi, Z grid.  
+!                    R, phi, Z grid.
 !-----------------------------------------------------------------------
       SUBROUTINE fieldlines_init
 !-----------------------------------------------------------------------
@@ -71,8 +71,8 @@ SUBROUTINE fieldlines_init
 
       ! Limit what the user can do
       IF (laxis_i .and. .not.lvac) lvac = .true.
-      
-      
+
+
       ! First Read The Input Namelist
       iunit = 11
 #if defined(MPI_OPT)
@@ -116,7 +116,7 @@ SUBROUTINE fieldlines_init
          END DO
          STOP
       END IF
-      
+
 !      IF (lplasma_only) THEN
 !         IF (lvmec) THEN
 !            rmin = 1.2*rmin_surf
@@ -138,7 +138,7 @@ SUBROUTINE fieldlines_init
          ELSE
             !rmin_temp = MINVAL(r_start,MASK = r_start > 0)
             !zmin_temp = MINVAL(z_start,MASK = r_start > 0)
-            
+
             rmin_temp = r_start(1)
             zmin_temp = z_start(1)
             phimin_temp = phi_start(1)
@@ -162,7 +162,7 @@ SUBROUTINE fieldlines_init
       eps1 = (rmax-rmin)*small
       eps2 = (phimax-phimin)*small
       eps3 = (zmax-zmin)*small
-      
+
       ! Output some information
       IF (lverb .and. .not.lrestart) THEN
          WRITE(6,'(A)') '----- Input Parameters -----'
@@ -180,7 +180,7 @@ SUBROUTINE fieldlines_init
          IF (lmu) WRITE(6,'(A)')   '   DIFFUSION OPERATOR TURNED ON!'
          CALL FLUSH(6)
       END IF
-       
+
       ! Create the background grid and initialize if necessary
       IF (lrestart) THEN
          CALL fieldlines_init_restart
@@ -199,7 +199,7 @@ SUBROUTINE fieldlines_init
             FORALL(i = 1:nz) zaxis(i) = (i-1)*(zmax-zmin)/(nz-1) + zmin
             FORALL(i = 1:nphi) phiaxis(i) = (i-1)*(phimax-phimin)/(nphi-1) + phimin
             B_R = 0; B_PHI = 0; B_Z = 0
-            IF (lpres) PRES_G = 0 
+            IF (lpres) PRES_G = 0
          END IF
          ! Put the vacuum field on the background grid
          IF (lmgrid) THEN
@@ -216,7 +216,6 @@ SUBROUTINE fieldlines_init
          ! Do NOTHING
       ELSE IF (lvmec .and. .not.lvac) THEN
          CALL fieldlines_init_vmec
-         IF (ledge_start) CALL fieldlines_init_vmec_edgestart
       ELSE IF (lpies .and. .not.lvac) THEN
          !CALL fieldlines_init_pies
       ELSE IF (lspec .and. .not.lvac) THEN
@@ -229,20 +228,37 @@ SUBROUTINE fieldlines_init
          CALL fieldlines_init_eqdsk
       END IF
 
+      ! Optionally, override the field line starting positions
+      ! with points on the plasma boundary.
+      IF (ledge_start) THEN
+         IF (lvmec) THEN
+            ! The equilibrium comes from VMEC in this case.
+            CALL fieldlines_init_vmec_edgestart
+         ELSE IF (lpies) THEN
+            ! CALL fieldlines_init_pies_edgestart
+         ELSE IF (lspec) THEN
+            ! CALL fieldlines_init_spec_edgestart
+         ELSE IF (lhint) THEN
+            ! CALL fieldlines_init_hint_edgestart
+         ELSE IF (leqdsk) THEN
+            ! CALL fieldlines_init_eqdsk_edgestart
+         END IF
+      END IF
+
       ! Handle error fields
       IF (lerror_field) CALL fieldlines_init_errorfield
 
       ! Put curtor on axis and calculate the field
       IF (laxis_i)  CALL fieldlines_init_I
-      
+
       IF (ANY(B_PHI .eq. 0)) THEN
 #if defined(MPI_OPT)
          CALL MPI_FINALIZE(ierr_mpi)
          IF (ierr_mpi /= MPI_SUCCESS) CALL handle_err(MPI_FINE_ERR,'fieldlines_init:B_PHI0',ierr_mpi)
 #endif
          stop 'ERROR: B_PHI = 0 Found'
       END IF
-      
+
       ! Handle outputting the B-FIELD
       IF (lemc3 .or. lbfield_only .or. lafield_only) THEN
          IF (lemc3 .and. myworkid==master) CALL fieldlines_write_emc3
@@ -389,5 +405,5 @@ SUBROUTINE fieldlines_init
 #endif
 !-----------------------------------------------------------------------
 !     End Subroutine
-!-----------------------------------------------------------------------    
+!-----------------------------------------------------------------------
       END SUBROUTINE fieldlines_init

FIELDLINES/Sources/fieldlines_init_coil.f90

@@ -15,11 +15,15 @@ SUBROUTINE fieldlines_init_coil
       USE fieldlines_grid, ONLY: raxis,phiaxis,zaxis, nr, nphi, nz, &
                                  rmin, rmax, zmin, zmax, phimin, &
                                  phimax, B_R, B_Z, B_PHI
+      USE vparams, ONLY: ntord, mpold
       USE vmec_input,  ONLY: extcur_in => extcur, read_indata_namelist,&
-                             nv_in => nzeta, nfp_in => nfp, nigroup
+                             nfp_in => nfp, nigroup, &
+                             mpol_in => mpol, ntor_in => ntor, &
+                             rbc_in => rbc, zbs_in => zbs, &
+                             rbs_in => rbs, zbc_in => zbc
       USE biotsavart
       USE mpi_params
-      USE mpi_inc            
+      USE mpi_inc
 !-----------------------------------------------------------------------
 !     Local Variables
 !          ier            Error Flag
@@ -28,7 +32,7 @@ SUBROUTINE fieldlines_init_coil
       IMPLICIT NONE
       INTEGER :: mylocalid, mylocalmaster
       INTEGER :: MPI_COMM_LOCAL
-      INTEGER :: ier, iunit, s, i, j, mystart, myend, k, ik, ig
+      INTEGER :: ier, iunit, s, i, j, mystart, myend, k, ik, ig, bdy_size
       REAL(rprec)  :: br, bphi, bz, current, current_first, &
                       br_temp, bphi_temp, bz_temp
 !-----------------------------------------------------------------------
@@ -42,7 +46,7 @@ SUBROUTINE fieldlines_init_coil
       CALL MPI_COMM_RANK( MPI_COMM_LOCAL, mylocalid, ierr_mpi )              ! MPI
 #endif
       mylocalmaster = master
-      
+
       ! Read the input file for the EXTCUR array, NV, and NFP
       IF (mylocalid == mylocalmaster) THEN
          iunit = 11
@@ -55,8 +59,23 @@ SUBROUTINE fieldlines_init_coil
 #if defined(MPI_OPT)
       CALL MPI_BCAST(extcur_in,nigroup,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
       IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_coil',ierr_mpi)
+      CALL MPI_BCAST(nfp_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_coil',ierr_mpi)
+      CALL MPI_BCAST(mpol_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.1',ierr_mpi)
+      CALL MPI_BCAST(ntor_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.2',ierr_mpi)
+      bdy_size = (2 * ntord + 1) * mpold
+      CALL MPI_BCAST(rbc_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.3',ierr_mpi)
+      CALL MPI_BCAST(zbs_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.4',ierr_mpi)
+      CALL MPI_BCAST(rbs_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.5',ierr_mpi)
+      CALL MPI_BCAST(zbc_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.6',ierr_mpi)
 #endif
-      
+
       ! Read the coils file
       CALL parse_coils_file(TRIM(coil_string))
       nextcur = SIZE(coil_group) !SAL
@@ -71,12 +90,12 @@ SUBROUTINE fieldlines_init_coil
             END IF
          END DO
       END DO
-      
+
       ! Reset the phi grid limit to match mgrid
       phimin = 0.0
       phimax = pi2 / nfp_bs
       FORALL(i = 1:nphi) phiaxis(i) = (i-1)*(phimax-phimin)/(nphi-1) + phimin
-      
+
       IF (lverb) THEN
          WRITE(6,'(A)')   '----- COILS Information -----'
          WRITE(6,'(A,A)') '   FILE: ',TRIM(coil_string)
@@ -167,8 +186,8 @@ SUBROUTINE fieldlines_init_coil
          CALL FLUSH(6)
          CALL backspace_out(6,36)
          CALL FLUSH(6)
-      END IF    
-      
+      END IF
+
       ! Free Variables
       CALL cleanup_biotsavart
 
@@ -180,9 +199,9 @@ SUBROUTINE fieldlines_init_coil
       CALL MPI_BARRIER(MPI_COMM_FIELDLINES,ierr_mpi)
       IF (ierr_mpi /=0) CALL handle_err(MPI_BARRIER_ERR,'fieldlines_init_coil',ierr_mpi)
 #endif
-      
+
       RETURN
 !-----------------------------------------------------------------------
 !     End Subroutine
-!-----------------------------------------------------------------------    
+!-----------------------------------------------------------------------
       END SUBROUTINE fieldlines_init_coil

FIELDLINES/Sources/fieldlines_init_mgrid.f90

@@ -16,10 +16,14 @@ SUBROUTINE fieldlines_init_mgrid
       USE fieldlines_grid, ONLY: raxis,phiaxis,zaxis, nr, nphi, nz, &
                                  rmin, rmax, zmin, zmax, phimin, &
                                  phimax, B_R, B_Z, B_PHI
+      USE vparams, ONLY: ntord, mpold
       USE vmec_input,  ONLY: extcur_in => extcur, read_indata_namelist,&
-                             nv_in => nzeta, nfp_in => nfp, nigroup
+                             nv_in => nzeta, nfp_in => nfp, nigroup, &
+                             mpol_in => mpol, ntor_in => ntor, &
+                             rbc_in => rbc, zbs_in => zbs, &
+                             rbs_in => rbs, zbc_in => zbc
       USE mgrid_field_mod, pi2_mgrid => pi2
-      USE mpi_params                       
+      USE mpi_params
 !-----------------------------------------------------------------------
 !     Local Variables
 !          ier            Error Flag
@@ -28,7 +32,7 @@ SUBROUTINE fieldlines_init_mgrid
       IMPLICIT NONE
       INTEGER :: mylocalid, mylocalmaster
       INTEGER :: MPI_COMM_LOCAL
-      INTEGER :: ier, iunit, s, i, j, mystart, myend, k
+      INTEGER :: ier, iunit, s, i, j, mystart, myend, k, bdy_size
       REAL(rprec)  :: br, bphi, bz
 !-----------------------------------------------------------------------
 !     Begin Subroutine
@@ -52,20 +56,33 @@ SUBROUTINE fieldlines_init_mgrid
          CLOSE(iunit)
       END IF
 #if defined(MPI_OPT)
-         CALL MPI_BCAST(extcur_in,nigroup,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
-         IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'beams3d_init_mgrid1',ierr_mpi)
-         CALL MPI_BCAST(nv_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
-         IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'beams3d_init_mgrid2',ierr_mpi)
-         CALL MPI_BCAST(nfp_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
-         IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'beams3d_init_mgrid3',ierr_mpi)
+      CALL MPI_BCAST(extcur_in,nigroup,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid1',ierr_mpi)
+      CALL MPI_BCAST(nv_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid2',ierr_mpi)
+      CALL MPI_BCAST(nfp_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.0',ierr_mpi)
+      CALL MPI_BCAST(mpol_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.1',ierr_mpi)
+      CALL MPI_BCAST(ntor_in,1,MPI_INTEGER, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.2',ierr_mpi)
+      bdy_size = (2 * ntord + 1) * mpold
+      CALL MPI_BCAST(rbc_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.3',ierr_mpi)
+      CALL MPI_BCAST(zbs_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.4',ierr_mpi)
+      CALL MPI_BCAST(rbs_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.5',ierr_mpi)
+      CALL MPI_BCAST(zbc_in,bdy_size,MPI_REAL, mylocalmaster, MPI_COMM_LOCAL,ierr_mpi)
+      IF (ierr_mpi /=0) CALL handle_err(MPI_BCAST_ERR,'fieldlines_init_mgrid3.6',ierr_mpi)
 #endif
 
       IF (ALLOCATED(extcur)) DEALLOCATE(extcur)
       nextcur = nigroup
       ALLOCATE(extcur(nextcur))
       extcur = 0.0
       extcur(1:nextcur) = extcur_in(1:nextcur)
-      
+
       ! Read the mgrid file
       CALL mgrid_load(mgrid_string,extcur,nextcur,nv_in,nfp_in,ier,mylocalid,MPI_COMM_LOCAL)
       IF (lverb) THEN
@@ -75,7 +92,7 @@ SUBROUTINE fieldlines_init_mgrid
       END IF
       CALL MPI_BARRIER(MPI_COMM_FIELDLINES,ierr_mpi)
       IF (ierr_mpi /=0) CALL handle_err(MPI_BARRIER_ERR,'fieldlines_init_mgrid4',ierr_mpi)
-      
+
       ! Check for grid consistency
       IF ((rmin < rminb) .or. (rmax > rmaxb) .or. &
           (zmin < zminb) .or. (zmax > zmaxb)) THEN
@@ -93,7 +110,7 @@ SUBROUTINE fieldlines_init_mgrid
 #endif
          stop
       END IF
-      
+
       ! Reset the phi grid limit to match mgrid
       phimin = 0.0
       phimax = pi2 / nfp_in
@@ -123,15 +140,15 @@ SUBROUTINE fieldlines_init_mgrid
             END IF
          END DO
       END IF
-      
+
       ! Clean up the progress bar
       IF (lverb) THEN
          CALL backspace_out(6,38)
          WRITE(6,'(38X)',ADVANCE='no')
          CALL backspace_out(6,38)
          CALL FLUSH(6)
-      END IF    
-      
+      END IF
+
       ! Free Variables (put this here to make room)
       CALL mgrid_free(ier,MPI_COMM_LOCAL)
 
@@ -143,9 +160,9 @@ SUBROUTINE fieldlines_init_mgrid
       CALL MPI_BARRIER(MPI_COMM_FIELDLINES,ierr_mpi)
       IF (ierr_mpi /=0) CALL handle_err(MPI_BARRIER_ERR,'fieldlines_init_mgrid8',ierr_mpi)
 #endif
-      
+
       RETURN
 !-----------------------------------------------------------------------
 !     End Subroutine
-!-----------------------------------------------------------------------    
+!-----------------------------------------------------------------------
       END SUBROUTINE fieldlines_init_mgrid