Skip to content

fix: allow fast_class and tcut to work together #190

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

Open
krystophny wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: allow fast_class and tcut to work together #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/classification/simple.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ntestpart = 5000 ! number of test particles
num_surf = 0 ! number of start surfaces, start points everywhere if 0
sbeg = 0.2 ! starting surface for some initializations
npoiper2 = 128 ! integration steps per field period
netcdffile = 'wout_LandremanPaul2021_QA_reactorScale_lowres_reference.nc' ! name of VMEC file in NETCDF format
netcdffile = 'wout_LandremanPaul2021_QH_reactorScale_lowres_reference.nc' ! name of VMEC file in NETCDF format
isw_field_type = 2 ! -1: Testing, 0: Canonical, 1: VMEC, 2: Boozer
trace_time = 1.5d-2 ! tracing time
tcut = 1d-2 ! time when to do cut for classification, usually 1d-1, or -1 if no cuts desired
Expand Down
4 changes: 0 additions & 4 deletions src/params.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,6 @@ subroutine read_config(config_file)
if (swcoll .and. (tcut > 0.0d0 .or. class_plot .or. fast_class)) then
error stop 'Collisions are incompatible with classification'
end if

if (fast_class .and. tcut > 0.0d0) then
error stop 'fast_class and positive tcut are mutually exclusive'
end if
end subroutine read_config

subroutine params_init
Expand Down
15 changes: 15 additions & 0 deletions test/golden_record/classifier_combined/simple.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
&config
notrace_passing = 1 ! skip tracing passing prts if notrace_passing=1
ntestpart = 32 ! number of test particles
num_surf = 0 ! number of start surfaces, start points everywhere if 0
sbeg = 0.2 ! starting surface for some initializations
npoiper2 = 128 ! integration steps per field period
netcdffile = 'wout.nc' ! name of VMEC file in NETCDF format
isw_field_type = 2 ! -1: Testing, 0: Canonical, 1: VMEC, 2: Boozer
trace_time = 1.5d-2 ! tracing time
tcut = 1d-2 ! time when to do cut for classification (fractal dimension)
class_plot = .True. ! write starting points at phi=const cut for classification plot (.True./.False.)
cut_in_per = 0d0 ! normalized phi-cut position within field period, [0:1], used if class_plot=.True.
fast_class = .True. ! if .True. quit immediately after fast classification
deterministic = .True.
/
Loading