diff --git a/examples/classification/simple.in b/examples/classification/simple.in index b6124283..5987faf3 100644 --- a/examples/classification/simple.in +++ b/examples/classification/simple.in @@ -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 diff --git a/src/params.f90 b/src/params.f90 index 44288722..81c32d41 100644 --- a/src/params.f90 +++ b/src/params.f90 @@ -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 diff --git a/test/golden_record/classifier_combined/simple.in b/test/golden_record/classifier_combined/simple.in new file mode 100644 index 00000000..6ff1800e --- /dev/null +++ b/test/golden_record/classifier_combined/simple.in @@ -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. +/