From aee613a54a8dbb3bfe32b1cd625f1172c3ef4826 Mon Sep 17 00:00:00 2001 From: Cianciosa Date: Wed, 27 Nov 2024 13:34:09 -0500 Subject: [PATCH 1/3] Fix reset from wout on multiple processors add test cases to ensure no regressions. --- .../initialize_radial.f | 1 + .../load_xc_from_wout.f | 24 +- Testing/tests/CMakeLists.txt | 2 + Testing/tests/reset_test/CMakeLists.txt | 313 ++++++++++++++++++ Testing/tests/reset_test/input.test.vmec | 45 +++ 5 files changed, 379 insertions(+), 6 deletions(-) create mode 100644 Testing/tests/reset_test/CMakeLists.txt create mode 100644 Testing/tests/reset_test/input.test.vmec diff --git a/Sources/Initialization_Cleanup/initialize_radial.f b/Sources/Initialization_Cleanup/initialize_radial.f index af4e565..dbbcccd 100644 --- a/Sources/Initialization_Cleanup/initialize_radial.f +++ b/Sources/Initialization_Cleanup/initialize_radial.f @@ -118,6 +118,7 @@ SUBROUTINE initialize_radial(nsval, ns_old, delt0, & ntor, mpol1, ns, reset_file_name) IF (PARVMEC) THEN CALL Serial2Parallel4X(xc,pxc) + CALL Gather4XArray(pxc) END IF END IF END IF diff --git a/Sources/Initialization_Cleanup/load_xc_from_wout.f b/Sources/Initialization_Cleanup/load_xc_from_wout.f index 5d59aaa..c45ecdb 100644 --- a/Sources/Initialization_Cleanup/load_xc_from_wout.f +++ b/Sources/Initialization_Cleanup/load_xc_from_wout.f @@ -9,7 +9,7 @@ SUBROUTINE load_xc_from_wout(rmn, zmn, lmn, lreset, USE vparams, ONLY: one, zero, rprec USE vmec_input, ONLY: lasym USE vmec_main, ONLY: lthreed, p5 => cp5, sp, sm, phipf - USE parallel_include_module, ONLY: rank + USE parallel_include_module, ONLY: rank, t1lglob, t1rglob, PARVMEC IMPLICIT NONE C----------------------------------------------- C D u m m y A r g u m e n t s @@ -25,6 +25,8 @@ SUBROUTINE load_xc_from_wout(rmn, zmn, lmn, lreset, INTEGER :: ierr, mn, m, n, n1, js REAL(rprec) :: t1, t2 REAL(rprec), ALLOCATABLE :: temp(:,:) + INTEGER :: nsmin + INTEGER :: nsmax C----------------------------------------------- ! @@ -51,6 +53,14 @@ SUBROUTINE load_xc_from_wout(rmn, zmn, lmn, lreset, IF (mpol1_in .ne. mpol1) STOP 'mpol1_in != mpol1 in load_xc' IF (nfp .eq. 0) STOP 'nfp = 0 in load_xc' + IF (PARVMEC) THEN + nsmin = t1lglob + nsmax = t1rglob + ELSE + nsmin = 1 + nsmax = ns + END IF + lreset = .false. !Signals profil3d NOT to overwrite axis values rmn = zero @@ -121,23 +131,25 @@ SUBROUTINE load_xc_from_wout(rmn, zmn, lmn, lreset, ! START ITERATION AT JS=1 ! lmn(1,:,0,:) = lmn(2,:,0,:) - lmn(1,:,1,:) = 2*lmn(2,:,1,:)/(sm(2) + sp(1)) + IF (nsmin .eq. 1) THEN + lmn(1,:,1,:) = 2*lmn(2,:,1,:)/(sm(2) + sp(1)) + END IF lmn(1,:,2:,:) = 0 DO m = 0, mpol1, 2 - DO js = 2, ns + DO js = nsmin + 1, nsmax lmn(js,:,m,:) = 2*lmn(js,:,m,:) - lmn(js-1,:,m,:) END DO END DO DO m = 1, mpol1, 2 - DO js = 2, ns - lmn(js,:,m,:) = (2*lmn(js,:,m,:) + DO js = nsmin + 1, nsmax + lmn(js,:,m,:) = (2*lmn(js,:,m,:) 1 - sp(js-1)*lmn(js-1,:,m,:))/sm(js) END DO END DO - DO js = 2, ns + DO js = nsmin + 1, nsmax lmn(js,:,:,:) = phipf(js)*lmn(js,:,:,:) END DO diff --git a/Testing/tests/CMakeLists.txt b/Testing/tests/CMakeLists.txt index 4e58db3..071f45a 100644 --- a/Testing/tests/CMakeLists.txt +++ b/Testing/tests/CMakeLists.txt @@ -2,3 +2,5 @@ add_subdirectory (fixed_boundary_test) add_subdirectory (free_boundary_test) add_subdirectory (niter_test) add_subdirectory (lasym_test) +add_subdirectory (reset_test) + diff --git a/Testing/tests/reset_test/CMakeLists.txt b/Testing/tests/reset_test/CMakeLists.txt new file mode 100644 index 0000000..9a7675f --- /dev/null +++ b/Testing/tests/reset_test/CMakeLists.txt @@ -0,0 +1,313 @@ +# Copy input file from the source to the build directory. +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/input.test.vmec + ${CMAKE_CURRENT_BINARY_DIR}/input.test_init.vmec + COPYONLY) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/input.test.vmec + ${CMAKE_CURRENT_BINARY_DIR}/input.test_reset.vmec + COPYONLY) + +# Test Fixed boundary equilibrium. +add_test (NAME vmec_reset_test_init + COMMAND $/xvmec input.test_init.vmec) +add_test (NAME vmec_reset_test_reset + COMMAND $ $ $ $/xvmec input.test_reset.vmec reset=wout_test_init.vmec.nc) +set_tests_properties (vmec_reset_test_reset + PROPERTIES + PROCESSORS $) + +# Check woutfile to ensure that values match. +add_test (NAME vmec_reset_check_aspect_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=aspect -tol=1.0E-20) +set_tests_properties (vmec_reset_check_aspect_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_b0_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=b0 -tol=1.0E-20) +set_tests_properties (vmec_reset_check_b0_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bdotb_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bdotb -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bdotb_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bdotgradv_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bdotgradv -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bdotgradv_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_beta_vol_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=beta_vol -tol=1.0E-20) +set_tests_properties (vmec_reset_check_beta_vol_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_betapol_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betapol -tol=1.0E-20) +set_tests_properties (vmec_reset_check_betapol_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_betator_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betator -tol=1.0E-20) +set_tests_properties (vmec_reset_check_betator_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_betatotal_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betatotal -tol=1.0E-20) +set_tests_properties (vmec_reset_check_betatotal_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_betaxis_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betaxis -tol=1.0E-20) +set_tests_properties (vmec_reset_check_betaxis_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bmnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bmnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bmnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bsubsmns_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubsmns -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bsubsmns_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bsubumnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubumnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bsubumnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bsubvmnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubvmnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bsubvmnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bsupumnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupumnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bsupumnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bsupvmnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupvmnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bsupvmnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_buco_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=buco -tol=1.0E-20) +set_tests_properties (vmec_reset_check_buco_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_bvco_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bvco -tol=1.0E-20) +set_tests_properties (vmec_reset_check_bvco_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_chi_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chi -tol=1.0E-20) +set_tests_properties (vmec_reset_check_chi_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_chipf_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chipf -tol=1.0E-20) +set_tests_properties (vmec_reset_check_chipf_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_currumnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=currumnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_currumnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_currvmnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=currvmnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_currvmnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_DCurr_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DCurr -tol=1.0E-20) +set_tests_properties (vmec_reset_check_DCurr_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_DGeod_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DGeod -tol=1.0E-20) +set_tests_properties (vmec_reset_check_DGeod_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_DMerc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DMerc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_DMerc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_DShear_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DShear -tol=1.0E-20) +set_tests_properties (vmec_reset_check_DShear_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_DWell_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DWell -tol=1.0E-20) +set_tests_properties (vmec_reset_check_DWell_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_fsql_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsql -tol=1.0E-20) +set_tests_properties (vmec_reset_check_fsql_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_fsqr_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqr -tol=1.0E-20) +set_tests_properties (vmec_reset_check_fsqr_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_fsqt_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqt -tol=1.0E-20) +set_tests_properties (vmec_reset_check_fsqt_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_fsqz_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqz -tol=1.0E-20) +set_tests_properties (vmec_reset_check_fsqz_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_gmnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=gmnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_gmnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_IonLarmor_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=IonLarmor -tol=1.0E-20) +set_tests_properties (vmec_reset_check_IonLarmor_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_iotaf_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=iotaf -tol=1.0E-20) +set_tests_properties (vmec_reset_check_iotaf_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_jcuru_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jcuru -tol=1.0E-20) +set_tests_properties (vmec_reset_check_jcuru_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_jcurv_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jcurv -tol=1.0E-20) +set_tests_properties (vmec_reset_check_jcurv_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_jdotb_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jdotb -tol=1.0E-20) +set_tests_properties (vmec_reset_check_jdotb_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_lmns_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=lmns -tol=1.0E-20) +set_tests_properties (vmec_reset_check_lmns_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_mnmax_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=mnmax -tol=1.0E-20) +set_tests_properties (vmec_reset_check_mnmax_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_mnmax_nyq_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=mnmax_nyq -tol=1.0E-20) +set_tests_properties (vmec_reset_check_mnmax_nyq_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_phipf_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=phipf -tol=1.0E-20) +set_tests_properties (vmec_reset_check_phipf_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_phips_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=phips -tol=1.0E-20) +set_tests_properties (vmec_reset_check_phips_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_pres_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=pres -tol=1.0E-20) +set_tests_properties (vmec_reset_check_pres_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_presf_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=presf -tol=1.0E-20) +set_tests_properties (vmec_reset_check_presf_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_q_factor_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=q_factor -tol=1.0E-20) +set_tests_properties (vmec_reset_check_q_factor_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_rbtor_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rbtor -tol=1.0E-20) +set_tests_properties (vmec_reset_check_rbtor_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_rbtor0_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rbtor0 -tol=1.0E-20) +set_tests_properties (vmec_reset_check_rbtor0_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_rmnc_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rmnc -tol=1.0E-20) +set_tests_properties (vmec_reset_check_rmnc_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_specw_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=specw -tol=1.0E-20) +set_tests_properties (vmec_reset_check_specw_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_volavgB_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=volavgB -tol=1.0E-20) +set_tests_properties (vmec_reset_check_volavgB_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_volume_p_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=volume_p -tol=1.0E-20) +set_tests_properties (vmec_reset_check_volume_p_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_vp_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=vp -tol=1.0E-20) +set_tests_properties (vmec_reset_check_vp_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_wb_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wb -tol=1.0E-20) +set_tests_properties (vmec_reset_check_wb_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_wdot_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wdot -tol=1.0E-20) +set_tests_properties (vmec_reset_check_wdot_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_wp_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wp -tol=1.0E-20) +set_tests_properties (vmec_reset_check_wp_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_xm_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=xm -tol=1.0E-20) +set_tests_properties (vmec_reset_check_xm_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_xm_nyq_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=xm_nyq -tol=1.0E-20) +set_tests_properties (vmec_reset_check_xm_nyq_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_xn_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=xn -tol=1.0E-20) +set_tests_properties (vmec_reset_check_xn_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_xn_nyq_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=xn_nyq -tol=1.0E-20) +set_tests_properties (vmec_reset_check_xn_nyq_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") +add_test (NAME vmec_reset_check_zmns_test + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=zmns -tol=1.0E-20) +set_tests_properties (vmec_reset_check_zmns_test + PROPERTIES + DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") diff --git a/Testing/tests/reset_test/input.test.vmec b/Testing/tests/reset_test/input.test.vmec new file mode 100644 index 0000000..265d523 --- /dev/null +++ b/Testing/tests/reset_test/input.test.vmec @@ -0,0 +1,45 @@ +&INDATA + +! VMEC execution parameters. +LFORBAL = F, +LFREEB = F, +DELT = 1.0, +TCON0 = 2.0, +NFP = 1, +NS_ARRAY = 15, +FTOL_ARRAY = 1.0E-20, +NITER = 25000, +NSTEP = 200, +NTOR = 0, +MPOL = 5, +NZETA = 1, +NVACSKIP = 9, +LASYM = F, + +! Fitting parameters. +GAMMA = 0.0, +PHIEDGE = -0.05, +BLOAT = 1.0, + +! Initial Position. +RAXIS(0) = 0.75, +ZAXIS(0) = 0.0, +RBC(0,0) = 0.75, +RBC(0,1) = 0.25, +ZBS(0,0) = 0.0, +ZBS(0,1) = 0.25, + +! Plasma current parameters. +NCURR = 1, +CURTOR = 40000.0, +AC = 1.0, 5.0, 10.0 +PCURR_TYPE = 'two_power', + +! Plasma pressure parameters. +SPRES_PED = 1.0, +PRES_SCALE = 400.0, +am_aux_s = 0.0, 0.5, 1.0 +am_aux_f = 1.0, 1.0, 1.0 +pmass_type = 'line_segment', +/ +&END From 864a530a1ad3a73c2a054ecdaee95b3c0e39170a Mon Sep 17 00:00:00 2001 From: Cianciosa Date: Wed, 27 Nov 2024 15:43:56 -0500 Subject: [PATCH 2/3] Fix issue during reset from woutfiles wouldn't work on all processors. --- .../tests/free_boundary_test/CMakeLists.txt | 2 +- Testing/tests/reset_test/CMakeLists.txt | 88 +++++++++---------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Testing/tests/free_boundary_test/CMakeLists.txt b/Testing/tests/free_boundary_test/CMakeLists.txt index 07e9160..edff054 100644 --- a/Testing/tests/free_boundary_test/CMakeLists.txt +++ b/Testing/tests/free_boundary_test/CMakeLists.txt @@ -191,7 +191,7 @@ set_tests_properties (vmec_free_boundary_check_iotaf_test PROPERTIES DEPENDS "vmec_free_boundary_serial_test;vmec_free_boundary_parallel_test") add_test (NAME vmec_free_boundary_check_jcuru_test - COMMAND $/xwout_diff -wout_file1=wout_test_serial.vmec.nc -wout_file2=wout_test_parallel.vmec.nc -quantity=jcuru -tol=5.1E-7) + COMMAND $/xwout_diff -wout_file1=wout_test_serial.vmec.nc -wout_file2=wout_test_parallel.vmec.nc -quantity=jcuru -tol=6.4E-7) set_tests_properties (vmec_free_boundary_check_jcuru_test PROPERTIES DEPENDS "vmec_free_boundary_serial_test;vmec_free_boundary_parallel_test") diff --git a/Testing/tests/reset_test/CMakeLists.txt b/Testing/tests/reset_test/CMakeLists.txt index 9a7675f..437a545 100644 --- a/Testing/tests/reset_test/CMakeLists.txt +++ b/Testing/tests/reset_test/CMakeLists.txt @@ -22,122 +22,122 @@ set_tests_properties (vmec_reset_check_aspect_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_b0_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=b0 -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=b0 -tol=5.0E-11) set_tests_properties (vmec_reset_check_b0_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bdotb_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bdotb -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bdotb -tol=2.0E-11) set_tests_properties (vmec_reset_check_bdotb_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bdotgradv_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bdotgradv -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bdotgradv -tol=2.0E-10) set_tests_properties (vmec_reset_check_bdotgradv_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_beta_vol_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=beta_vol -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=beta_vol -tol=4.0E-12) set_tests_properties (vmec_reset_check_beta_vol_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_betapol_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betapol -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betapol -tol=6.0E-12) set_tests_properties (vmec_reset_check_betapol_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_betator_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betator -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betator -tol=2.0E-15) set_tests_properties (vmec_reset_check_betator_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_betatotal_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betatotal -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betatotal -tol=3.0E-15) set_tests_properties (vmec_reset_check_betatotal_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_betaxis_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betaxis -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betaxis -tol=6.0E-12) set_tests_properties (vmec_reset_check_betaxis_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bmnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bmnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bmnc -tol=4.0E-11) set_tests_properties (vmec_reset_check_bmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bsubsmns_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubsmns -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubsmns -tol=1.0E-11) set_tests_properties (vmec_reset_check_bsubsmns_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bsubumnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubumnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubumnc -tol=5.0E-12) set_tests_properties (vmec_reset_check_bsubumnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bsubvmnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubvmnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsubvmnc -tol=2.0E-12) set_tests_properties (vmec_reset_check_bsubvmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bsupumnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupumnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupumnc -tol=3.1E-10) set_tests_properties (vmec_reset_check_bsupumnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bsupvmnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupvmnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupvmnc -tol=2.0E-10) set_tests_properties (vmec_reset_check_bsupvmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_buco_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=buco -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=buco -tol=4.0E-18) set_tests_properties (vmec_reset_check_buco_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bvco_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bvco -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bvco -tol=2.0E-12) set_tests_properties (vmec_reset_check_bvco_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_chi_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chi -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chi -tol=8.0E-13) set_tests_properties (vmec_reset_check_chi_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_chipf_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chipf -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chipf -tol=8.0E-12) set_tests_properties (vmec_reset_check_chipf_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_currumnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=currumnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=currumnc -tol=2.0E-4) set_tests_properties (vmec_reset_check_currumnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_currvmnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=currvmnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=currvmnc -tol=2.0E-4) set_tests_properties (vmec_reset_check_currvmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_DCurr_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DCurr -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DCurr -tol=7.0E-8) set_tests_properties (vmec_reset_check_DCurr_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_DGeod_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DGeod -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DGeod -tol=6.0E-7) set_tests_properties (vmec_reset_check_DGeod_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_DMerc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DMerc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DMerc -tol=6.0E-7) set_tests_properties (vmec_reset_check_DMerc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_DShear_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DShear -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DShear -tol=4.0E-8) set_tests_properties (vmec_reset_check_DShear_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -157,47 +157,47 @@ set_tests_properties (vmec_reset_check_fsqr_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_fsqt_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqt -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqt -tol=1.5E-12) set_tests_properties (vmec_reset_check_fsqt_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_fsqz_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqz -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqz -tol=1.5E-12) set_tests_properties (vmec_reset_check_fsqz_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_gmnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=gmnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=gmnc -tol=4.0E-11) set_tests_properties (vmec_reset_check_gmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_IonLarmor_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=IonLarmor -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=IonLarmor -tol=1.2E-15) set_tests_properties (vmec_reset_check_IonLarmor_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_iotaf_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=iotaf -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=iotaf -tol=1.5E-10) set_tests_properties (vmec_reset_check_iotaf_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_jcuru_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jcuru -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jcuru -tol=2.0E-5) set_tests_properties (vmec_reset_check_jcuru_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_jcurv_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jcurv -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jcurv -tol=1.0E-10) set_tests_properties (vmec_reset_check_jcurv_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_jdotb_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jdotb -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=jdotb -tol=3.0E-5) set_tests_properties (vmec_reset_check_jdotb_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_lmns_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=lmns -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=lmns -tol=1.4E-9) set_tests_properties (vmec_reset_check_lmns_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -232,32 +232,32 @@ set_tests_properties (vmec_reset_check_presf_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_q_factor_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=q_factor -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=q_factor -tol=4.0E-10) set_tests_properties (vmec_reset_check_q_factor_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_rbtor_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rbtor -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rbtor -tol=4.0E-13) set_tests_properties (vmec_reset_check_rbtor_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_rbtor0_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rbtor0 -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rbtor0 -tol=2.0E-12) set_tests_properties (vmec_reset_check_rbtor0_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_rmnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rmnc -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=rmnc -tol=2.0E-10) set_tests_properties (vmec_reset_check_rmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_specw_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=specw -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=specw -tol=2.0E-13) set_tests_properties (vmec_reset_check_specw_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_volavgB_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=volavgB -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=volavgB -tol=3.0E-14) set_tests_properties (vmec_reset_check_volavgB_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -267,22 +267,22 @@ set_tests_properties (vmec_reset_check_volume_p_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_vp_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=vp -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=vp -tol=7.0E-12) set_tests_properties (vmec_reset_check_vp_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_wb_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wb -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wb -tol=1.4E-16) set_tests_properties (vmec_reset_check_wb_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_wdot_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wdot -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wdot -tol=6.0E-10) set_tests_properties (vmec_reset_check_wdot_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_wp_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wp -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=wp -tol=7.0E-20) set_tests_properties (vmec_reset_check_wp_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -307,7 +307,7 @@ set_tests_properties (vmec_reset_check_xn_nyq_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_zmns_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=zmns -tol=1.0E-20) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=zmns -tol=5.4E-12) set_tests_properties (vmec_reset_check_zmns_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") From 0b85cceeac5d9c821611e171732ee2ccb09db812 Mon Sep 17 00:00:00 2001 From: Cianciosa Date: Wed, 27 Nov 2024 15:58:20 -0500 Subject: [PATCH 3/3] Adjust test tolarance for github runners. --- Testing/tests/reset_test/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Testing/tests/reset_test/CMakeLists.txt b/Testing/tests/reset_test/CMakeLists.txt index 437a545..e752d88 100644 --- a/Testing/tests/reset_test/CMakeLists.txt +++ b/Testing/tests/reset_test/CMakeLists.txt @@ -37,12 +37,12 @@ set_tests_properties (vmec_reset_check_bdotgradv_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_beta_vol_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=beta_vol -tol=4.0E-12) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=beta_vol -tol=4.1E-12) set_tests_properties (vmec_reset_check_beta_vol_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_betapol_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betapol -tol=6.0E-12) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=betapol -tol=6.1E-12) set_tests_properties (vmec_reset_check_betapol_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -82,7 +82,7 @@ set_tests_properties (vmec_reset_check_bsubvmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_bsupumnc_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupumnc -tol=3.1E-10) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=bsupumnc -tol=3.2E-10) set_tests_properties (vmec_reset_check_bsupumnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -102,7 +102,7 @@ set_tests_properties (vmec_reset_check_bvco_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_chi_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chi -tol=8.0E-13) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=chi -tol=8.3E-13) set_tests_properties (vmec_reset_check_chi_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -122,7 +122,7 @@ set_tests_properties (vmec_reset_check_currvmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_DCurr_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DCurr -tol=7.0E-8) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DCurr -tol=7.7E-8) set_tests_properties (vmec_reset_check_DCurr_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -137,7 +137,7 @@ set_tests_properties (vmec_reset_check_DMerc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_DShear_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DShear -tol=4.0E-8) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=DShear -tol=4.2E-8) set_tests_properties (vmec_reset_check_DShear_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -157,7 +157,7 @@ set_tests_properties (vmec_reset_check_fsqr_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_fsqt_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqt -tol=1.5E-12) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=fsqt -tol=1.6E-12) set_tests_properties (vmec_reset_check_fsqt_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -252,7 +252,7 @@ set_tests_properties (vmec_reset_check_rmnc_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_specw_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=specw -tol=2.0E-13) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=specw -tol=2.1E-13) set_tests_properties (vmec_reset_check_specw_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") @@ -307,7 +307,7 @@ set_tests_properties (vmec_reset_check_xn_nyq_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset") add_test (NAME vmec_reset_check_zmns_test - COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=zmns -tol=5.4E-12) + COMMAND $/xwout_diff -wout_file1=wout_test_init.vmec.nc -wout_file2=wout_test_reset.vmec.nc -quantity=zmns -tol=5.5E-12) set_tests_properties (vmec_reset_check_zmns_test PROPERTIES DEPENDS "vmec_reset_test_init;vmec_reset_test_reset")