Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master dev #29

Merged
merged 9 commits into from
Feb 11, 2024
Merged

Master dev #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
80cf848
Relax test tolarance.
Feb 9, 2024
0f68aba
Relax test tolarance.
Feb 9, 2024
15c8378
Which netcdf variable names to raw so V3FIT can read them.
cianciosa Feb 10, 2024
3d50192
Relax test tolarance.
cianciosa Feb 10, 2024
2f496be
Relax test tolarance.
cianciosa Feb 10, 2024
c9a46c9
Relax test tolarance.
cianciosa Feb 10, 2024
bf7cb99
Relax test tolarance.
cianciosa Feb 10, 2024
cd8a986
Deallocate quantities before reapplying the helical pert.
cianciosa Feb 11, 2024
64979eb
Merge pull request #28 from ORNL-Fusion/sparse
cianciosa Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Sources/metrics.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ MODULE metrics
!-------------------------------------------------------------------------------
SUBROUTINE init_metric_elements()
USE timer_mod, ONLY: init_timers
USE shared_data, ONLY: torflux, polflux
USE island_params, hs=>hs_i, ns=>ns_i

IMPLICIT NONE
Expand Down
2 changes: 1 addition & 1 deletion Sources/pchelms.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MODULE pchelms
asubsmncf, asubumnsf, asubvmnsf
USE quantities, ONLY: fsupsmnsf, fsupumncf, fsupvmncf, &
fsupsmncf, fsupumnsf, fsupvmnsf
USE shared_data, ONLY: torflux, polflux, nsp, r1_i, z1_i, ru_i, &
USE shared_data, ONLY: nsp, r1_i, z1_i, ru_i, &
zu_i, rv_i, zv_i, lcolscale
USE descriptor_mod, ONLY: iam, nprocs, lscalapack, INHESSIAN, SIESTA_COMM
USE v3_utilities, ONLY: assert
Expand Down
6 changes: 6 additions & 0 deletions Sources/quantities.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,9 +857,15 @@ SUBROUTINE dealloc_quantities
IF (ALLOCATED(ksupsijf0)) THEN
DEALLOCATE(ksupsijf0, ksupuijf0, ksupvijf0)
END IF
IF (ALLOCATED(ksupsijf)) THEN
DEALLOCATE(ksupsijf, ksupuijf, ksupvijf)
END IF
IF (ALLOCATED(bsubsijf)) THEN
DEALLOCATE(bsubsijf, bsubuijf, bsubvijf)
END IF
IF (ALLOCATED(bsupsijf)) THEN
DEALLOCATE(bsupsijf, bsupuijf, bsupvijf)
END IF

! Asymmetric quantities.
IF (lasym) THEN
Expand Down
4 changes: 0 additions & 4 deletions Sources/shared_data.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,6 @@ MODULE shared_data
! Shared quantities.
!> FIXME: UNKNOWN
REAL (dp) :: jsupvdotA
!> Toroidal flux profile.
REAL (dp), DIMENSION(:), ALLOCATABLE :: torflux
!> Poloidal flux profile.
REAL (dp), DIMENSION(:), ALLOCATABLE :: polflux
!> Covariant vector potential for stellator symmetric s component on full grid.
REAL (dp), DIMENSION(:,:,:), POINTER :: asubsmnsf
!> Covariant vector potential for non-stellator symmetric s component on full
Expand Down
120 changes: 61 additions & 59 deletions Sources/siesta_init.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ SUBROUTINE Init_Allocate_Arrays(lpar)
! L o c a l V a r i a b l e s
!-----------------------------------------------
LOGICAL :: lrealloc, lalloc
INTEGER :: istat, n1, n2, n3, nsmin, nsmax, &
INTEGER :: istat, n1, n2, n3, nsmin, nsmax, &
nsmin1, nsmax1
!-----------------------------------------------
lalloc = ALLOCATED(jvsupsijf)
Expand All @@ -219,72 +219,74 @@ SUBROUTINE Init_Allocate_Arrays(lpar)
END IF

IF (lalloc) THEN
IF (SIZE(bsupsijh0,3) .EQ. n3) lrealloc=.FALSE.
IF (SIZE(bsupsijh0,3) .EQ. n3) THEN
lrealloc = .FALSE.
END IF
IF (lrealloc) THEN
DEALLOCATE (jvsupsijf, jvsupuijf, jvsupvijf, &
bsupsijf0, bsupuijf0, bsupvijf0, &
bsupsijf, bsupuijf, bsupvijf, &
bsupsijh0, bsupuijh0, bsupvijh0, &
bsubsijf, bsubuijf, bsubvijf, &
ksupsijf0, ksupuijf0, ksupvijf0, &
ksupsijf, ksupuijf, ksupvijf, &
ksubsijf, ksubuijf, ksubvijf, &
pijf0, pijh0, pijf0_ds, &
pijh0_du, pijh0_dv, stat=istat)
CALL assert_eq(0, istat, &
'Deallocation error #1 in INIT_ALLOCATE_ARRAYS')
DEALLOCATE (jvsupsijf, jvsupuijf, jvsupvijf, &
bsupsijf0, bsupuijf0, bsupvijf0, &
bsupsijf, bsupuijf, bsupvijf, &
bsupsijh0, bsupuijh0, bsupvijh0, &
bsubsijf, bsubuijf, bsubvijf, &
ksupsijf0, ksupuijf0, ksupvijf0, &
ksupsijf, ksupuijf, ksupvijf, &
ksubsijf, ksubuijf, ksubvijf, &
pijf0, pijh0, pijf0_ds, &
pijh0_du, pijh0_dv, stat=istat)
CALL assert_eq(0, istat, &
'Deallocation error #1 in INIT_ALLOCATE_ARRAYS')
END IF
END IF

IF (lrealloc) THEN
n3 = ns
ALLOCATE (jvsupsijf(n1,n2,n3), jvsupuijf(n1,n2,n3), & ! Full mesh quantities (real space)
jvsupvijf(n1,n2,n3)) ! jacobian*(V_s , V_u , V_v)
ALLOCATE (jvsupsijf(n1,n2,n3), jvsupuijf(n1,n2,n3), & ! Full mesh quantities (real space)
jvsupvijf(n1,n2,n3)) ! jacobian*(V_s , V_u , V_v)
IF (lpar) THEN
ALLOCATE (bsupsijh0(n1,n2,nsmin1:nsmax1), & ! B^s, B^u, B^v (half)
bsupuijh0(n1,n2,nsmin1:nsmax1), &
bsupvijh0(n1,n2,nsmin1:nsmax1), &
bsupsijf0(n1,n2,nsmin1:nsmax1), & ! B^s, B^u, B^v (full)
bsupuijf0(n1,n2,nsmin1:nsmax1), &
bsupvijf0(n1,n2,nsmin1:nsmax1), &
ksupsijf0(n1,n2,nsmin1:nsmax), & ! K^s, K^u, K^v
ksupuijf0(n1,n2,nsmin1:nsmax), &
ksupvijf0(n1,n2,nsmin1:nsmax), &
ksubsijf(n1,n2,nsmin1:nsmax), & ! Full mesh quantities (real space)
ksubuijf(n1,n2,nsmin1:nsmax), & ! K_s, K_u, K_v
ksubvijf(n1,n2,nsmin1:nsmax), &
bsubsijf(n1,n2,nsmin1:nsmax), & ! Full mesh quantities (real space)
bsubuijf(n1,n2,nsmin1:nsmax), & ! B_s, B_u, B_v
bsubvijf(n1,n2,nsmin1:nsmax), &
ksupsijf(n1,n2,nsmin:nsmax), &
ksupuijf(n1,n2,nsmin:nsmax), &
ksupvijf(n1,n2,nsmin:nsmax), &
bsupsijf(n1,n2,nsmin:nsmax), &
bsupuijf(n1,n2,nsmin:nsmax), &
bsupvijf(n1,n2,nsmin:nsmax), &
pijh0(n1,n2,nsmin1:nsmax1), &
pijh0_du(n1,n2,nsmin1:nsmax), &
pijh0_dv(n1,n2,nsmin1:nsmax), &
pijf0(n1,n2,nsmin1:nsmax1), &
pijf0_ds(n1,n2,nsmin1:nsmax), stat=istat)
ALLOCATE (bsupsijh0(n1,n2,nsmin1:nsmax1), & ! B^s, B^u, B^v (half)
bsupuijh0(n1,n2,nsmin1:nsmax1), &
bsupvijh0(n1,n2,nsmin1:nsmax1), &
bsupsijf0(n1,n2,nsmin1:nsmax1), & ! B^s, B^u, B^v (full)
bsupuijf0(n1,n2,nsmin1:nsmax1), &
bsupvijf0(n1,n2,nsmin1:nsmax1), &
ksupsijf0(n1,n2,nsmin1:nsmax), & ! K^s, K^u, K^v
ksupuijf0(n1,n2,nsmin1:nsmax), &
ksupvijf0(n1,n2,nsmin1:nsmax), &
ksubsijf(n1,n2,nsmin1:nsmax), & ! Full mesh quantities (real space)
ksubuijf(n1,n2,nsmin1:nsmax), & ! K_s, K_u, K_v
ksubvijf(n1,n2,nsmin1:nsmax), &
bsubsijf(n1,n2,nsmin1:nsmax), & ! Full mesh quantities (real space)
bsubuijf(n1,n2,nsmin1:nsmax), & ! B_s, B_u, B_v
bsubvijf(n1,n2,nsmin1:nsmax), &
ksupsijf(n1,n2,nsmin:nsmax), &
ksupuijf(n1,n2,nsmin:nsmax), &
ksupvijf(n1,n2,nsmin:nsmax), &
bsupsijf(n1,n2,nsmin:nsmax), &
bsupuijf(n1,n2,nsmin:nsmax), &
bsupvijf(n1,n2,nsmin:nsmax), &
pijh0(n1,n2,nsmin1:nsmax1), &
pijh0_du(n1,n2,nsmin1:nsmax), &
pijh0_dv(n1,n2,nsmin1:nsmax), &
pijf0(n1,n2,nsmin1:nsmax1), &
pijf0_ds(n1,n2,nsmin1:nsmax), stat=istat)
ELSE
ALLOCATE (ksupsijf0(n1,n2,n3), ksupuijf0(n1,n2,n3), &
ksupvijf0(n1,n2,n3), ksupsijf(n1,n2,n3), &
ksupuijf(n1,n2,n3), ksupvijf(n1,n2,n3), &
ksubsijf(n1,n2,n3), &
ksubuijf(n1,n2,n3), &
ksubvijf(n1,n2,n3), &
bsubsijf(n1,n2,n3), &
bsubuijf(n1,n2,n3), &
bsubvijf(n1,n2,n3), &
pijf0(n1,n2,n3), pijh0(n1,n2,n3), &
pijh0_du(n1,n2,n3), pijh0_dv(n1,n2,n3), &
pijf0_ds(n1,n2,n3), bsupsijf0(n1,n2,n3), &
bsupuijf0(n1,n2,n3),bsupvijf0(n1,n2,n3), &
bsupsijf(n1,n2,n3), bsupuijf(n1,n2,n3), &
bsupvijf(n1,n2,n3), bsupsijh0(n1,n2,n3), &
bsupuijh0(n1,n2,n3),bsupvijh0(n1,n2,n3), &
stat=istat)
ALLOCATE (ksupsijf0(n1,n2,n3), ksupuijf0(n1,n2,n3), &
ksupvijf0(n1,n2,n3), ksupsijf(n1,n2,n3), &
ksupuijf(n1,n2,n3), ksupvijf(n1,n2,n3), &
ksubsijf(n1,n2,n3), &
ksubuijf(n1,n2,n3), &
ksubvijf(n1,n2,n3), &
bsubsijf(n1,n2,n3), &
bsubuijf(n1,n2,n3), &
bsubvijf(n1,n2,n3), &
pijf0(n1,n2,n3), pijh0(n1,n2,n3), &
pijh0_du(n1,n2,n3), pijh0_dv(n1,n2,n3), &
pijf0_ds(n1,n2,n3), bsupsijf0(n1,n2,n3), &
bsupuijf0(n1,n2,n3),bsupvijf0(n1,n2,n3), &
bsupsijf(n1,n2,n3), bsupuijf(n1,n2,n3), &
bsupvijf(n1,n2,n3), bsupsijh0(n1,n2,n3), &
bsupuijh0(n1,n2,n3),bsupvijh0(n1,n2,n3), &
stat=istat)
END IF
CALL assert_eq(0, istat, &
'Allocation error #1 in Init_Allocate_Arrays')
Expand Down
10 changes: 1 addition & 9 deletions Sources/vmec_info.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ SUBROUTINE vmec_info_set_wout(wout_file, ns_in, mpol_in, ntor_in, &
USE island_params
USE stel_constants, ONLY: twopi, zero, mu0
USE island_params, hs=>hs_i, ns=>ns_i
USE shared_data, ONLY: lasym, torflux, polflux
USE shared_data, ONLY: lasym

IMPLICIT NONE

Expand Down Expand Up @@ -345,14 +345,6 @@ SUBROUTINE vmec_info_set_wout(wout_file, ns_in, mpol_in, ntor_in, &
gamma
END IF

ALLOCATE(torflux(ns), polflux(ns))
torflux(1) = 0
polflux(1) = 0;
DO js = 2, ns
polflux(js) = polflux(js - 1) + hs*(chipf_i(js) + chipf_i(js - 1))/2
torflux(js) = torflux(js - 1) + hs*(phipf_i(js) + phipf_i(js - 1))/2
END DO

CALL vmec_info_set_RZL

! Construct R
Expand Down