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

Lconstraint=-2, and pyspec higher derivatives of magnetic field #153

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Lconstraint=-2, and pyspec higher derivatives of magnetic field #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0cb35b3
Initial commit.
ejpaul Sep 9, 2020
9c19a2b
Resolved merge conflicts between Lconstraint=-2 and new Zernike changes
richardnies May 17, 2021
b5d0e89
Changes in SPEC + further merge conflict resolutions.
richardnies May 17, 2021
9352b8c
Normal field B.C. now correctly read in.
richardnies May 24, 2021
abb700b
NUMBA accelerated Zernike construction.
richardnies May 27, 2021
f01ecaa
More effective reading in of magnetic field.
richardnies Jul 17, 2021
4dea0f4
Clean-up of py_spec processing.
richardnies Sep 9, 2021
84362d5
Merge branch 'master' into Lconstraint_-2_and_pyspec_Zernike
richardnies Sep 9, 2021
aefcc77
minor clean-ups
richardnies Sep 9, 2021
ad9f86d
Further minor clean-ups.
richardnies Sep 9, 2021
9d03364
Removed print statements, added checks of inputs.
richardnies Sep 27, 2021
eccc082
Added documentation.
richardnies Sep 28, 2021
0aca587
Merge branch 'master' into Lconstraint_-2_and_pyspec_Zernike
richardnies Sep 29, 2021
0030936
Corrected documentation.
richardnies Sep 29, 2021
101ae5b
Changes to documentation + added Bn!=zero option in fixed-boundary as…
richardnies Oct 11, 2021
501a652
Removed fossil comment + corrected check of Nvol must be 1 for Lbdybn…
richardnies Oct 11, 2021
21fd292
Two checks for Lbdybnzero=.false.: must be fixed-boundary and must be…
richardnies Oct 11, 2021
4257f89
Checks for testing purpose.
richardnies Oct 11, 2021
bc4ace6
Merge branch 'master' into Lconstraint_-2_and_pyspec_Zernike
richardnies Oct 11, 2021
eed9ff7
Cleaned up comments. Corrected checks of consistent inputs (Lbdybnzer…
richardnies Oct 12, 2021
ef4aa39
Added test case.
richardnies Oct 20, 2021
55197bb
Merge branch 'master' into Lconstraint_-2_and_pyspec_Zernike
jonathanschilling Oct 26, 2021
9003cd6
Merge branch 'master' into Lconstraint_-2_and_pyspec_Zernike
richardnies Oct 26, 2021
3a75635
SCREENLIST awk preprocessing removed from traditional Makefile
jonathanschilling Oct 26, 2021
77b5721
Merge branch 'Lconstraint_-2_and_pyspec_Zernike' of github.com:Prince…
jonathanschilling Oct 26, 2021
8184075
FFT to read B field and derivatives.
richardnies Dec 17, 2021
44a88bd
Removed numba package.
richardnies Dec 17, 2021
cf4512c
Merge branch 'master' into Lconstraint_-2_and_pyspec_Zernike
jonathanschilling Feb 16, 2022
44627e6
Merge branch 'master' into Lconstraint_-2_and_pyspec_Zernike
jonathanschilling Feb 16, 2022
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: 1 addition & 0 deletions InputFiles/TestCases/G3V01Lm2Fi.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test case to verify Lconstraint=-2 (vary toroidal flux to satisfy poloidal linking current constraint) and Lbdybnzero=.false. (non-zero value of Bn on boundary of fixed-boundary calculation).
566 changes: 566 additions & 0 deletions InputFiles/TestCases/G3V01Lm2Fi.sp
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ inputlist_d.o: %_d.o: src/inputlist.f90 $(MACROS)
@echo ''

###############################################################################################################################################################
# global needs special handling: expansion of CPUVARIABLE, BSCREENLIST and WSCREENLIST using awk (not anymore !!!)

global_r.o: %_r.o: inputlist_r.o src/global.f90 $(MACROS)
m4 -P $(MACROS) src/global.f90 > global_m.F90
Expand Down
5 changes: 4 additions & 1 deletion Utilities/pythontools/py_spec/input/spec_namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,10 @@ def run(self, spec_command="./xspec", filename="spec.sp", force=False, quiet=Fal
if run_result.returncode == 0: # the run is successful
if not quiet:
print("SPEC runs successfully.")
return SPECout(filename + ".h5")
try:
return SPECout(filename + ".h5")
except:
return SPECout(filename[:-3] + ".h5")
else:
print("SPEC runs unsuccessfully, check terminal output.")
return None
Expand Down
Loading