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

Master dev #59

Merged
merged 3 commits into from
Jun 14, 2024
Merged

Master dev #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f4733d
Add namelist entry for controling the preconditioner iterations.
cianciosa Jun 14, 2024
866cb1f
Fix code formatting.
cianciosa Jun 14, 2024
b0c3a7c
Merge pull request #58 from ORNL-Fusion/pre_niter
cianciosa Jun 14, 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
4 changes: 2 additions & 2 deletions Sources/Modules/integration_path.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,8 @@ RECURSIVE FUNCTION integration_path_integrate_paths(this, path, &
start_time = profiler_get_start_time()

IF (ASSOCIATED(path%next)) THEN
total = this%integrate(path%next, context)
total = this%integrate(context, path, path%next)
total = this%integrate(path%next, context)
total = this%integrate(context, path, path%next)
ELSE
total = 0.0
END IF
Expand Down
13 changes: 10 additions & 3 deletions Sources/Modules/vmec_input.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
!> @item{niter, Maximum number of iterations to run. @b DEPRECATED @b
!> Use @ref vmec_input::niter_array instead., vmec_input::niter}
!> @item{niter_array, Array of iterations for the multigrid runs., vmec_input::niter_array}
!> @iten{pre_niter, Number of iterations to run after the preconditioner is
!> activated. There special control values.
!> -# -1 Default behavor.
!> -# -2 Keep niter intact. vmec_input::pre_niter}
!> @item{time_slice, Time index value to label the output files., vmec_input::time_slice}
!> @item{nstep, Number of iterations between screen output., vmec_input::nstep}
!> @item{nvacskip, Number of iterations between vacuum responses., vmec_input::nvacskip}
Expand Down Expand Up @@ -266,6 +270,8 @@ MODULE vmec_input
INTEGER :: niter
!> Array of iterations for the multigrid runs.
INTEGER, DIMENSION(max_grids) :: niter_array
!> Number of iterations to run after the preconditoner is activated.
INTEGER :: pre_niter
!> Time index value to label the output files.
REAL (rprec) :: time_slice
!> Number of iterations between screen output.
Expand Down Expand Up @@ -493,8 +499,8 @@ MODULE vmec_input
! Declare namelist
NAMELIST /indata/ &
! Control Parameters.
& omp_num_threads, gamma, niter, niter_array, time_slice, nstep, &
& nvacskip, delt, ftol, ftol_array, tcon0, &
& omp_num_threads, gamma, niter, niter_array, pre_niter, &
& time_slice, nstep, nvacskip, delt, ftol, ftol_array, tcon0, &
! Precondicioner control parameters.
& precon_type, prec2d_threshold, &
! Early termination control parameters.
Expand Down Expand Up @@ -557,7 +563,8 @@ SUBROUTINE read_indata_namelist(iunit, istat)
! Control Parameters.
omp_num_threads = 8
gamma = 0
niter_array = -1;
niter_array = -1
pre_niter = -1
time_slice = 0
niter = 100
nstep = 10
Expand Down
2 changes: 2 additions & 0 deletions Testing/test_utilities/unit_test_runner.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,6 @@ PROGRAM LIBSTELL_UNIT_TEST_RUNNER
CALL EXIT(1)
END IF

WRITE (*,*) 'All tests passed.'

END PROGRAM