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

Splines new #79

Merged
merged 78 commits into from
May 6, 2022
Merged

Splines new #79

Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
996a53f
Added Spline support
ni-lon98 Jul 23, 2020
c68d02f
Add Spline example
ni-lon98 Jul 23, 2020
8836656
Add Spline example
ni-lon98 Jul 23, 2020
b7b38fd
Create splines.f90
ni-lon98 Jul 23, 2020
5146af7
Add straight cost function
ni-lon98 Aug 12, 2020
5a5d244
add straight cost function
ni-lon98 Aug 12, 2020
a28d2ec
add straight cost function
ni-lon98 Aug 12, 2020
add11ce
add straight cost function
ni-lon98 Aug 12, 2020
43414a1
add straight cost function
ni-lon98 Aug 12, 2020
6dd47f1
add straight cost function
ni-lon98 Aug 12, 2020
7f8977e
add straight cost function
ni-lon98 Aug 12, 2020
bbd8306
add straight cost function
ni-lon98 Aug 12, 2020
7b07ee4
Update Makefile
ni-lon98 Aug 26, 2020
304db7b
read surface from boozer
ni-lon98 Aug 26, 2020
659a924
read surface from boozer
ni-lon98 Aug 26, 2020
262af28
read surface from boozer
ni-lon98 Aug 26, 2020
fb59cf4
add coeff. for straight cost function
ni-lon98 Aug 26, 2020
bd5d361
read surf from boozer
ni-lon98 Aug 26, 2020
2163f6c
read surf from boozer
ni-lon98 Aug 26, 2020
78921b7
fix bugs for compilation and in rdbooz.f90
zhucaoxiang Aug 27, 2020
3f54a86
swap boozer reading order
Aug 27, 2020
2cdaabf
test check_deriv
Sep 3, 2020
9e033cf
fix check_deriv
ni-lon98 Sep 3, 2020
dd64b52
Add documentation header
ni-lon98 Sep 17, 2020
3f80938
Add documentation header
ni-lon98 Sep 17, 2020
86dee2d
Update initial.f90
ni-lon98 Jul 11, 2021
abadc8e
Update documentation
ni-lon98 Jul 11, 2021
6c7363d
curvature and straight values written to HDF5
ni-lon98 Jul 11, 2021
7d1cdbb
write curvature and straight to HDF5
ni-lon98 Jul 11, 2021
562421a
write curvature and straight to HDF5
ni-lon98 Jul 11, 2021
0aa5dce
write curvature and straight to HDF5
ni-lon98 Jul 11, 2021
b7df7f2
write curvature and straight to HDF5
ni-lon98 Jul 11, 2021
e804ecb
Merge branch 'develop' into Splines_new
ni-lon98 Oct 12, 2021
cafe011
fix double definition
ni-lon98 Oct 12, 2021
d0b7253
Update solvers.f90
ni-lon98 Oct 12, 2021
def771d
Update solvers.f90
ni-lon98 Oct 12, 2021
927ad33
Update curvature.f90
ni-lon98 Oct 12, 2021
b64f2f6
Update curvature.f90
ni-lon98 Oct 12, 2021
2ae609f
Update curvature.f90
ni-lon98 Oct 12, 2021
1108589
Update curvature.f90
ni-lon98 Oct 12, 2021
0cfbcf8
Update saving.f90
ni-lon98 Oct 12, 2021
73e6f5b
Update diagnos.f90
ni-lon98 Oct 12, 2021
20c9387
Update diagnos.f90
ni-lon98 Oct 12, 2021
e931880
Update Makefile
ni-lon98 Oct 12, 2021
eae469c
Update deriv.input
ni-lon98 Oct 12, 2021
8dabaf0
Update deriv.input
ni-lon98 Oct 12, 2021
049137d
Update deriv.input
ni-lon98 Oct 13, 2021
6512619
Update deriv.input
ni-lon98 Oct 13, 2021
5b288b8
Update deriv.input
ni-lon98 Oct 13, 2021
f6a8eaf
Update deriv.input
ni-lon98 Oct 13, 2021
3afdde6
Update deriv.input
ni-lon98 Oct 13, 2021
1d4ade5
Update deriv.input
ni-lon98 Oct 13, 2021
5269cdc
Update deriv.input
ni-lon98 Oct 13, 2021
950aab8
Update deriv.input
ni-lon98 Oct 13, 2021
b00dd12
Update deriv.input
ni-lon98 Oct 13, 2021
e245990
Update deriv.input
ni-lon98 Oct 13, 2021
12c78f3
Update deriv.input
ni-lon98 Oct 13, 2021
02e4c8f
Update deriv.input
ni-lon98 Oct 13, 2021
e60275d
Update deriv.input
ni-lon98 Oct 17, 2021
c78c1c5
Update deriv.input
ni-lon98 Oct 17, 2021
46a2e0d
Update deriv.input
ni-lon98 Oct 17, 2021
ebbe34d
Update deriv.input
ni-lon98 Oct 17, 2021
233d724
Update deriv.input
ni-lon98 Oct 17, 2021
1526e08
Implement new curvature function for splines as well
ni-lon98 Mar 26, 2022
223be06
Update straight function to be consistent with curvature
ni-lon98 Mar 26, 2022
52f9304
Update stright function to be consistent with new curvature function
ni-lon98 Mar 26, 2022
be2aad9
Merge branch 'develop' into Splines_new
ni-lon98 Mar 26, 2022
ebe9822
Change straight cost function to be uniform with new curvature
ni-lon98 Mar 26, 2022
60ffff9
Update curvature.f90
ni-lon98 Mar 26, 2022
d178be7
Bug fixes
ni-lon98 Mar 26, 2022
169326f
add stright function to test
ni-lon98 Mar 26, 2022
09e0291
Update deriv.input
ni-lon98 Mar 26, 2022
1717a4f
Update deriv.input
ni-lon98 Mar 26, 2022
3a65ad9
comment out straight part
Apr 6, 2022
3360558
allocate straight array
Apr 6, 2022
a6f6e75
update version number
Apr 6, 2022
c758104
change folder name
Apr 6, 2022
721e40b
Merge branch 'develop' of github.com:PrincetonUniversity/FOCUS into S…
zhucaoxiang May 6, 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
Prev Previous commit
Next Next commit
Update deriv.input
  • Loading branch information
@ni-lon98
ni-lon98 authored Oct 17, 2021
commit e60275dd105a876aa8b39170dc39ad0ca125028c
16 changes: 8 additions & 8 deletions examples/check_deriv/deriv.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
WEIGHT_INORM= 1.0000000000000000 ,
WEIGHT_GNORM= 1.0000000000000000 ,
WEIGHT_MNORM= 1.0000000000000000 ,
WEIGHT_BNORM= 1.0000000000000000 ,
WEIGHT_BNORM= 0.0000000000000000 ,
CASE_BNORMAL=0 ,
WEIGHT_BHARM= 0.0000000000000000 ,
BHARM_JSURF=0 ,
INPUT_HARM="target.harmonics ",
WEIGHT_TFLUX= 0.1000000000000000 ,
WEIGHT_TFLUX= 0.0000000000000000 ,
TARGET_TFLUX= 0.0000000000000000 ,
WEIGHT_TTLEN= 0.2000000000000000 ,
WEIGHT_TTLEN= 0.0000000000000000 ,
CASE_LENGTH=1 ,
TARGET_LENGTH= 0.0000000000000000 ,
LENGTH_DELTA= 0.0000000000000000 ,
WEIGHT_CURV= 0.4000000000000000 ,
WEIGHT_CURV= 0.0000000000000000 ,
CASE_CURV=4 ,
PENFUN_CURV=2 ,
CURV_ALPHA= 0.0000000000000000 ,
Expand All @@ -43,14 +43,14 @@
CURV_K0= 10.000000000000000 ,
curv_k1= 0.0000000000000000 ,
curv_k1len=0 ,
WEIGHT_TORS= 0.0004000000000000000 ,
WEIGHT_TORS= 0.4000000000000000 ,
CASE_TORS=1 ,
PENFUN_TORS=1 ,
TORS0= 0.0000000000000000 ,
TORS_ALPHA= 0.00100000000000000 ,
TORS_BETA= 1.000000000000000000 ,
TORS_ALPHA= 1.00100000000000000 ,
TORS_BETA= 2.000000000000000000 ,
TORS_GAMMA= 1.0000000000000000 ,
WEIGHT_NISSIN= 0.5000000000000000 ,
WEIGHT_NISSIN= 0.0000000000000000 ,
PENFUN_NISSIN=2 ,
NISSIN0= 200.0000000000000000 ,
NISSIN_ALPHA= 1.0000000000000000 ,
Expand Down