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

Feature/thrift vmec restart #312

Merged
merged 13 commits into from
Dec 3, 2024
Merged

Feature/thrift vmec restart #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
894cef6
VMEC2000: Updated with ORNL-Fusion/PARVMEC, keeping local mods.
lazersos Nov 27, 2024
4e342dd
BENCHMARKS: Updated DIII-D example with slightly modified values.
lazersos Nov 27, 2024
46e0a3d
LIBSTELL: Updated of profile_functions from ORNL-fusion/PARVMEC
lazersos Nov 27, 2024
c403956
VMEC2000: Restart functionality now fixed.
lazersos Nov 27, 2024
44fb760
THRIFT: VMEC restarting now implemented.
lazersos Nov 27, 2024
69d823e
BENCHMARKS: Added VMEC reset benchmark.
lazersos Nov 28, 2024
42d8336
VMEC2000: Changes to reset to align with ORNL-fusion/PARVMEC fix.
lazersos Nov 28, 2024
74fd830
THRIFT: Fix so reset not used on first iteration even if wout file ex…
lazersos Nov 28, 2024
5b32ff5
THRIFT: Added -vmec_reset command line flag to control use of VMEC reset
lazersos Nov 29, 2024
05cf301
THRIFT: When VMEC runs in reset mode will attempt non-reset run on fa…
lazersos Nov 29, 2024
62147c5
THRIFT: Fixed VMEC interface so reset files are written only for conv…
lazersos Dec 1, 2024
87d56b6
THRIFT: Added missing VMEC error catching statement.
lazersos Dec 2, 2024
1e73274
Merge branch 'develop' into feature/THRIFT_VMEC_RESTART
lazersos Dec 3, 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,274 changes: 870 additions & 404 deletions BENCHMARKS/VMEC_TEST/BENCH_DATA.json
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 54 additions & 0 deletions BENCHMARKS/VMEC_TEST/input.DIII-D_reset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
&INDATA
LFREEB = T LASYM = T
DELT = 1.00E-00
TCON0 = 2.00E+00
NFP = 1
NCURR = 01
NTOR = 0
MPOL = 12
NTHETA = 48
GAMMA = 0.000000E+00
NITER = 20000
NSTEP = 200
NVACSKIP = 6
MGRID_FILE = 'mgrid_d3d_ef.nc'
EXTCUR(01) = -1.370985E+03 EXTCUR(02) = -1.609154E+03
EXTCUR(03) = -2.751331E+03 EXTCUR(04) = -2.524384E+03
EXTCUR(05) = -3.435372E+03 EXTCUR(06) = -3.466123E+03
EXTCUR(07) = 3.670919E+03 EXTCUR(08) = 3.450196E+03
EXTCUR(09) = 2.908027E+03 EXTCUR(10) = 3.404695E+03
EXTCUR(11) = -4.148967E+03 EXTCUR(12) = -4.294406E+03
EXTCUR(13) = -3.059939E+03 EXTCUR(14) = -2.990609E+03
EXTCUR(15) = 3.903818E+03 EXTCUR(16) = 3.727301E+03
EXTCUR(17) = -3.049484E+03 EXTCUR(18) = -3.086940E+03
EXTCUR(19) = -1.488703E+07
EXTCUR(20)=-2.430716E+04 EXTCUR(21)=-2.380229E+04
NS_ARRAY = 16 32 64 128
FTOL_ARRAY = 1.00E-30 1.00E-30 1.00E-30 1.00E-12
NITER_ARRAY = 1000 2000 4000 20000
PHIEDGE = -3.6607381E+00
CURTOR = 1.401766E+06
AI = 9.505223E-01
8.664788E-01 -1.999345E+01 1.462790E+02 -7.786226E+02 2.809674E+03
-6.602835E+03 9.882455E+03 -9.050012E+03 4.611235E+03 -9.998666E+02
AC = 3.4339293E+06
1.9790689E+06 -2.1233084E+07 -8.0149736E+08 8.5407445E+09 -3.9754562E+10
1.0406096E+11 -1.6245971E+11 1.4984895E+11 -7.5295245E+10 1.5876209E+10
AM = 5.9054641E+04
-7.0989537E+04 -1.1421348E+06 8.1253367E+06 -2.7390003E+07 5.0431553E+07
-3.8741206E+07 -2.6848458E+07 8.2374061E+07 -6.4756460E+07 1.7960373E+07
RAXIS = 1.7148
ZAXIS = 0.0003
RBC(0,0) = 1.566429E+00 ZBS(0,0) = 0.000000E+00
RBC(0,1) = 5.742145E-01 ZBS(0,1) = 1.067598E+00
RBC(0,2) = 1.090441E-01 ZBS(0,2) = -1.399577E-02
RBC(0,3) = 1.978027E-02 ZBS(0,3) = -2.587143E-02
RBC(0,4) = -1.994700E-02 ZBS(0,4) = 2.763699E-02
RBC(0,5) = 9.509995E-03 ZBS(0,5) = -3.593534E-03
RBC(0,6) = 2.664560E-03 ZBS(0,6) = -1.206387E-02
RBC(0,7) = -1.697133E-03 ZBS(0,7) = 5.108089E-03
RBC(0,8) = 2.077971E-03 ZBS(0,8) = 2.582196E-03
RBC(0,9) = 1.584350E-03 ZBS(0,9) = -4.074723E-03
RBC(0,10) = -1.032651E-04 ZBS(0,10) = -1.032651E-04
RBC(0,11) = 1.267987E-03 ZBS(0,11) = 1.267987E-03
/
Binary file added BENCHMARKS/VMEC_TEST/wout_reset.nc
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion BENCHMARKS/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ test_thrift:

test_vmec:
@echo "Beginning testing of VMEC2000"
@cd $(VMEC_TEST_DIR); rm -f jxbout* mercier* threed1* wout*;
@cd $(VMEC_TEST_DIR); rm -f jxbout* mercier* threed1*;
@echo $(MPI_RUN) $(MPI_RUN_OPTS_SM) $(MYHOME)/xvmec2000 input.DSHAPE
@cd $(VMEC_TEST_DIR); $(MPI_RUN) $(MPI_RUN_OPTS_SM) $(MYHOME)/xvmec2000 input.DSHAPE
@cd $(VMEC_TEST_DIR) && ./compare.py --file DSHAPE
Expand All @@ -162,6 +162,10 @@ test_vmec:
@echo $(MPI_RUN) $(MPI_RUN_OPTS_SM) $(MYHOME)/xvmec2000 input.DIII-D
@cd $(VMEC_TEST_DIR); $(MPI_RUN) $(MPI_RUN_OPTS_SM) $(MYHOME)/xvmec2000 input.DIII-D
@cd $(VMEC_TEST_DIR) && ./compare.py --file DIII-D
@echo ""
@echo $(MPI_RUN) $(MPI_RUN_OPTS_SM) $(MYHOME)/xvmec2000 input.DIII-D_reset reset=wout_reset.nc
@cd $(VMEC_TEST_DIR); $(MPI_RUN) $(MPI_RUN_OPTS_SM) $(MYHOME)/xvmec2000 input.DIII-D_reset reset=wout_reset.nc
@cd $(VMEC_TEST_DIR) && ./compare.py --file DIII-D_reset
@echo "Tesing of VMEC2000 complete"

test_beams3d_basic:
Expand Down
Loading
Loading