From b16519ffaa44c411b723600d21fdc9afc165f0a3 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Thu, 29 Sep 2016 13:53:42 +0000
Subject: [PATCH] clean up my branch
---
C.pl | 202 ---------
C2.pl | 226 ----------
diffstacks.pl | 77 ----
faillist | 3 -
notes | 27 --
test_holly.pl => src/perl/tests/test_holly.pl | 0
.../perl/tests/test_holly.plt | 0
test_restrict.sh | 54 ---
test_results/holly/holly_test_output-Z.dat | 78 ++++
.../holly/holly_test_output-Z0.0001.dat | 77 ++++
.../holly/holly_test_output-Z0.001.dat | 77 ++++
.../holly/holly_test_output-Z0.004.dat | 77 ++++
.../holly/holly_test_output-Z0.008.dat | 390 ++++++++++++++++++
.../holly/holly_test_output-Z0.02.dat | 77 ++++
valC2.sh | 3 -
15 files changed, 776 insertions(+), 592 deletions(-)
delete mode 100755 C.pl
delete mode 100755 C2.pl
delete mode 100755 diffstacks.pl
delete mode 100644 faillist
delete mode 100644 notes
rename test_holly.pl => src/perl/tests/test_holly.pl (100%)
rename test_holly.plt => src/perl/tests/test_holly.plt (100%)
delete mode 100755 test_restrict.sh
create mode 100644 test_results/holly/holly_test_output-Z.dat
create mode 100644 test_results/holly/holly_test_output-Z0.0001.dat
create mode 100644 test_results/holly/holly_test_output-Z0.001.dat
create mode 100644 test_results/holly/holly_test_output-Z0.004.dat
create mode 100644 test_results/holly/holly_test_output-Z0.008.dat
create mode 100644 test_results/holly/holly_test_output-Z0.02.dat
delete mode 100644 valC2.sh
diff --git a/C.pl b/C.pl
deleted file mode 100755
index 54424c8b2..000000000
--- a/C.pl
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/usr/bin/env perl
-$|=1;
-use 5.16.0;
-use strict;
-use rob_misc;
-use warnings;
-use threads ('stack_size'=>4096*1024*10);
-use threads::shared;
-use robqueue;
-# 100 systems
-# C : 29.54
-# Perl :
-
-my $path = $ENV{HOME}.'/progs/stars/binary_c';
-my $nthreads = 16; # >= 2
-my $dotests = 0;
-my $nstars = 100;
-
-use binary_grid;
-use binary_grid::C;
-grid_defaults();
-
-$binary_grid::grid_options{rootpath}='.';
-$binary_grid::grid_options{srcpath}='./src';
-$binary_grid::grid_options{prog}='binary_c';
-$binary_grid::grid_options{parse_bse_function_pointer} = \&parse_bse;
-setup_binary_grid();
-
-# why do I have to use binary_grid::C so late?
-
-
-tbse_launch();
-
-my $origargstring = "binary_c --stellar_type_1 1 --stellar_type_2 1 --M_1 30 --M_2 1 --eccentricity 0.0 --orbital_period 20000 --separation 0 --max_evolution_time 0.1 --metallicity 0.004 --monte_carlo_kicks --wr_wind 0 --wr_wind_fac 1.0 --BH_prescription 2 --delta_mcmin -0.1 --lambda_min 0.5 --dtfac 1.0 --gbwind 0 --tpagbwind 1 --gb_reimers_eta 0.5 --probability 1 --eddfac 1.0e6 --Bondi_Hoyle_accretion_factor 1.5 --hbbtfac 0.0 --superwind_mira_switchon 500 --tpagb_reimers_eta 1.0e6 --sn_sigma 0 --wd_sigma 0 --alpha_ce 1.0 --lambda_ce -1 --escape_velocity 1000000000 --escape_fraction 0 --gce_metallicity 0.004 --minimum_timestep 1e-6 --maximum_timestep 1000 --epsnov 1e-3 --comenv_ns_accretion_fraction 0.0 --comenv_ns_accretion_mass 0.0 --CRAP_parameter 1e3 --log_filename /tmp/c_log2.dat --rlof_gamma -2 --lambda_multiplier 1.0 --hachisu_disk_wind 0 --hachisu_qcrit -1 --mass_accretion_for_eld 0.15 --CEMP_cfe_minimum 1.0 --no_thermohaline_mixing 0 --CEMP_logg_maximum 4.0 --CEMP_minimum_age 10000 --minimum_envelope_mass_for_third_dredgeup 0.5 --mass_of_pmz 0 --c13_eff 1.0 --mc13_pocket_multiplier 1.0 --vw93_mira_shift 0.0 --vw93_multiplier 1.0 --comenv_ms_accretion_mass 0.0 --nucsyn_metallicity 0.004 --rotationally_enhanced_mass_loss 0 --rotationally_enhanced_exponent 1.0 --RLOF_timestep_modulator 1 --timestep_modulator 1.0 --RLOF_f 0 --RLOF_mdot_factor 1.0 --vrot1 0.1 --vrot2 0.1 --RLOF_method 3 --RLOF_interpolation_method 0 --repeat 1 --tidal_strength_factor 1.0 --wind_mass_loss 1 --merger_angular_momentum_factor 1.0 --mattsson_Orich_tpagbwind 3 --initial_abundance_mix 0 --init_abund 12 0.00346001 --init_abund 15 0.00112 --jorb_loss 1 --lw 3.0 --wind_djorb_fac 1.0 --lambda_ionisation 0.05 --wd_kick_direction 0 --wd_kick_when 0 --wd_kick_pulse_number 0 --E2_prescription 0 --sn_kick_distribution 1 --qcrit_LMMS 0.6944 --qcrit_MS 1.6 --qcrit_HG 4.0 --qcrit_GB -1.0 --qcrit_CHeB 3.0 --qcrit_EAGB -1.0 --qcrit_TPAGB -1.0 --qcrit_HeMS 3.0 --qcrit_HeHG 4.0 --qcrit_HeGB 0.78125 --qcrit_HeWD 3.0 --qcrit_COWD 3.0 --qcrit_ONeWD 3.0 --qcrit_NS 3.0 --qcrit_BH 3.0 --qcrit_degenerate_LMMS 1.0 --qcrit_degenerate_MS 1.0 --qcrit_degenerate_HG 4.7619 --qcrit_degenerate_GB 1.15 --qcrit_degenerate_CHeB 3.0 --qcrit_degenerate_EAGB 1.15 --qcrit_degenerate_TPAGB 1.15 --qcrit_degenerate_HeMS 3 --qcrit_degenerate_HeHG 4.7619 --qcrit_degenerate_HeGB 1.15 --qcrit_degenerate_HeWD 0.625 --qcrit_degenerate_COWD 0.625 --qcrit_degenerate_ONeWD 0.625 --qcrit_degenerate_NS 0.625 --qcrit_degenerate_BH 0.625 --WRLOF_method 1 --lithium_hbb_multiplier 10.0 --lithium_GB_post_1DUP 1.0 --lithium_GB_post_Heflash 4.0 --hrdiag_output 0 --pre_main_sequence 0 --pre_main_sequence_fit_lobes 0 --rlperi 0 --minimum_separation_for_instant_RLOF 0 --minimum_orbital_period_for_instant_RLOF 0 --vwind_multiplier 0.125 --max_tpagb_core_mass 1.38 --chandrasekhar_mass 1.44 --max_neutron_star_mass 1.8 --minimum_mass_for_carbon_ignition 1.6 --minimum_mass_for_neon_ignition 2.85 --warmup_cpu 0 --internal_buffering_compression 0 --thick_disc_start_age 10e3 --thick_disc_end_age 4e3 --evolution_splitting 0 --evolution_splitting_sn_n 2 --evolution_splitting_maxdepth 2 --jorb_RLOF_transfer_model 0 --gravitational_radiation_model 0 --disk_fed_novae 1 --RLOF_fed_novae 1 --wind_fed_novae 1 --comenv_prescription 0 --nelemans_minq 0.0 --nelemans_n_comenvs 10 --nelemans_gamma 0.1 --nelemans_max_frac_j_change 1.0 --nelemans_recalc_eccentricity 0 --internal_buffering 2 --max_evolution_time 10 --yields_dt 10 --idum -100";
-
-my @stack : shared;
-my $q = robqueue->new(
- nthreads=>$nthreads,
- subr=>\&run_test,
- );
-my $count = 0;
-
-print "Pre-loop start mem ",mem_usage(),"\n";
-
-while($count<$nstars)
-{
- $count++;
-
- if($dotests)
- {
- for(my $n=0;$n<$nthreads;$n++)
- {
- $stack[$n] = &share([]) ;
- }
- }
-
-# random system
- my $sys .= ' --M_1 '.random(0.1,100.0).' --M_2 '.random(0.1,100.0).' --orbital_period '.random(0.1,1e6).' --metallicity '.random(1e-4,0.03).' ';
-
- print "$sys\n";
- my $argstring = $origargstring . $sys;
-
- if($dotests)
- {
- for(my $n=0;$n<$nthreads;$n++)
- {
- undef $stack[$n];
- $stack[$n] = &share([]) ;
- }
- }
-
- for(my $n=0;$n<$nthreads;$n++)
- {
-
- $q->q([$argstring,$n]);
- run_test([$argstring,$n]);
- }
- $q->qwait();
- if($dotests)
- {
- foreach my $ntest (0..$nthreads-1)
- {
- # clean up buffers
- my $nlines = $#{$stack[$ntest]}+1;
- for(my $i=0;$i<$nlines;$i++)
- {
- $stack[$ntest][$i]=~s/^\d+\s+//;
- $stack[$ntest][$i]=~s/0x(\S+)/0xPOINTER/g;
- $stack[$ntest][$i]=~s/ID -?\d+/ID ID/g;
- $stack[$ntest][$i]=~s/system -?\d+/system ID/g;
- $stack[$ntest][$i]=~s/Tick count.*//;
- $stack[$ntest][$i]=~s/fin\n/\n/;
- }
- pop @{$stack[$ntest]};
- open(my $stackfp,'>',"/tmp/stack$ntest");
- print $stackfp join("\n",@{$stack[$ntest]});
- close $stackfp;
- }
- pop @{$stack[0]};
-
- foreach my $ntest (1..$nthreads-1)
- {
- #print "Check stack $ntest vs 0\n";
-
- my $nlines = MAX($#{$stack[0]}, $#{$stack[$ntest]});
- #print "NLINES $#{$stack[0]} vs $#{$stack[$ntest]} -> $nlines\n";
- if(1)
- {
- for(my $i=0;$i<$nlines;$i++)
- {
- if($stack[0][$i] ne $stack[$ntest][$i])
- {
- print "ERROR : \n";
- print "$i : diff \n";
- printf "%d : %s\n",0, $stack[0][$i];
- printf "%d : %s\n",$ntest,$stack[$ntest][$i];
- print coloured_diff_strings($stack[0][$i],$stack[$ntest][$i]);
- exit;
- }
- else
- {
- #print "$i : identical\n$stack[0][$i]\n";
- }
- }
- }
- }
- }
- print "All tests ok, mem ",rob_misc::mem_usage(),"\n";
-}
-
-print "Call q->end mem ",rob_misc::mem_usage(),"\n";
-$q->end;
-
-sleep 1;
-print "Call tbse_land mem ",rob_misc::mem_usage(),"\n";
-tbse_land();
-
-sleep 5;
-print "At exit mem ",rob_misc::mem_usage(),"\n";
-exit;
-
-############################################################
-sub run_test
-{
- my ($argstring, $n) = @{$_[0]};
- my $results;
-
- if($argstring eq 'launch' && $n!=0)
- {
- tbse_launch();
- return;
- }
-
- if($dotests)
- {
- if($n==-1)
- {
- # run binary_c manually
- #@{$stack[0]}=split(/\n/,`$argstring --internal_buffering 0 2>&1`);
- }
- else
- {
- tbse($argstring,$results,$n);
- }
- }
- else
- {
- if($n==-1)
- {
- `$argstring --internal_buffering 0 2>&1`;
- }
- else
- {
- tbse($argstring,$results,$n);
- }
- }
-}
-
-sub parse_bse
-{
- #return if(!$dotests);
- my ($results, $nthread) = @_;
-
- # this is broken : why?
- #@{$stack[$nthread]} = @{binary_grid::tbse_array_ref()};
-
- while(my $l = tbse_line())
- {
- print "PARSE thread=$nthread : $l\n";
- last if($l=~/fin/);
- }
- return;
-}
-
-
-############################################################
-
-sub random
-{
- my ($low,$high) = @_;
- return rand() * ($high-$low) + $low;
-}
diff --git a/C2.pl b/C2.pl
deleted file mode 100755
index be8f18613..000000000
--- a/C2.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/env perl
-$|=1;
-use strict;
-
-############################################################
-# #
-# Example of how to use the binary_grid flexigrid. #
-# #
-############################################################
-
-my ($nthreads) = @ARGV;
-
-$nthreads //= 1;
-
-modules_etc();# load modules
-
-my $results={}; # hash to store results
-
-# first set some defaults for the grid
-defaults();
-
-# then parse the command line to override the defaults
-parse_grid_args(@ARGV);
-
-# now set up the grid
-setup_binary_grid();
-
-# run flexigrid with two threads
-flexigrid($nthreads);
-
-# output results
-output();
-
-exit(0); # done!
-
-############################################################
-############################################################
-############################################################
-
-sub output
-{
- # output results
- foreach my $result (sort keys %$results)
- {
- next if($result eq 'thread_number');
- print "Saving results for output subhash '$result'\n";
- my $h=$$results{$result};
-
- open(FP ,">/tmp/imf.dat")||die;
- my $ptot=0.0;
- foreach my $k (nsort(keys %{$h}))
- {
- print FP "$k $$h{$k}\n";
- $ptot+=$$h{$k};
- }
- close FP;
-
- print "Total probability $ptot\n";
- }
-
- output_binary_grid_timers();
-}
-
-sub parse_bse
-{
- # this gets called by the binary_grid module, it parses the
- # lines of output from binary_c/nucsyn
- my $brk=0;
-
- # you should set data in the $h hash pointer, which is
- # then passed to the join_thread function (below) for you
- # to add up. (Note: $h is local to each thread.)
- my $h=$_[0];
-
- my $nthread=$binary_grid::grid_options{'thread_num'};
-
- while($brk==0)
- {
- $_=tbse_line();
- #print $_;
- chomp;
- if($_ eq 'fin')
- {
- $brk=1; # the end of output
-
- {
- # do stuff once per star, e.g. add up initial mass function
- my $mbin=bin_data($binary_grid::grid_options{'progenitor_hash'}{'m1'},1.0);
- $$h{'IMF'}{$mbin} += $binary_grid::grid_options{'progenitor_hash'}{'prob'};
- }
- }
- else
- {
- #...parse your data here ...
- #my @x=split(' ',$_);
- # ... do something with @x, put results in $h ...
- # e.g.
- #
- # $$h{'luminosity distribution'}{rebin($x[1],1.0)}=$x[0];
- }
- }
-
-}
-
-
-sub defaults
-{
- grid_defaults();
-
- # physics options
- $binary_grid::bse_options{'z'}=0.02;
- $binary_grid::bse_options{'wd_sigma'}=0.0;
- $binary_grid::bse_options{'c13_eff'}=1.0;
- $binary_grid::bse_options{'acc2'}=1.5;
- $binary_grid::bse_options{'tidal_strength_factor'}=1.0;
- $binary_grid::bse_options{'alpha_ce'}=1.0; # 1
- $binary_grid::bse_options{'lambda_ce'}=-1; # -1 = automatically set
- $binary_grid::bse_options{'lambda_ionisation'}=0.0; # 0.0
- $binary_grid::bse_options{'delta_mcmin'}=0.0;
- $binary_grid::bse_options{'lambda_min'}=0.0;
- $binary_grid::bse_options{'minimum_envelope_mass_for_third_dredgeup'}=0.5;
- $binary_grid::bse_options{'max_evolution_time'}=13700;
-
- # grid options
- $binary_grid::grid_options{'results_hash'}=$results;
- $binary_grid::grid_options{'parse_bse_function_pointer'}=\&parse_bse;
- $binary_grid::grid_options{'threads_stack_size'}=32; # MBytes
- $binary_grid::grid_options{'nice'}='nice -n +10'; # nice command e.g. 'nice -n +10' or ''
- $binary_grid::grid_options{'binary'}=1; # single stars -> 0, binary stars -> 1
- $binary_grid::grid_options{'timeout'}=30; # seconds until timeout
- $binary_grid::grid_options{'log_args'}=0;
- $binary_grid::grid_options{'save_args'}=0;
- $binary_grid::grid_options{'sort_args'}=0;
- $binary_grid::bse_options{'log_filename'}='/dev/null';
- $binary_grid::grid_options{'timers'}=1;
- $binary_grid::grid_options{'threadcomms'}=0;
-
- $binary_grid::grid_options{'vb'}=1;
- $binary_grid::grid_options{'lazy_arg_sending'}=0;
-
- # This is the path to the binary_c directory
- $binary_grid::grid_options{'rootpath'}='.';
-
- # The name of the binary_c executable
- $binary_grid::grid_options{'prog'}='binary_c';
-
- #print "You must set the rootpath and prog variables in binary_grid!
-#Once you have, you can safely remove this warning.\n";exit;
-
- # Mass 1
- my $nvar=0;
- my $mmin=0.1;
- my $mmax=80.0;
- my $n=4; # resolution
- $binary_grid::grid_options{'flexigrid'}{'grid variable '.$nvar++}=
- {
- 'name'=> 'lnm1',
- 'longname'=>'Primary mass',
- 'range'=>["log($mmin)","log($mmax)"],
- 'resolution'=> $n,
- 'spacingfunc'=>"const(log($mmin),log($mmax),$n)",
- 'precode'=>'my $m1=exp($lnm1); my $eccentricity=0.0;',
- 'probdist'=>"ktg93(\$m1)*\$m1",
- 'dphasevol'=>'$dlnm1'
- };
-
- # Binary stars: Mass 2 and Separation
- if($binary_grid::grid_options{'binary'})
- {
- my $m2min=0.1;
- $binary_grid::grid_options{'flexigrid'}{'grid variable '.$nvar++}=
- {
- # name of the variable
- 'name'=>'m2',
- # long name (for verbose logging)
- 'longname'=>'Secondary mass',
- # range of the parameter space
- 'range'=>[$m2min,'$m1'],
- # resolution
- 'resolution'=>$n,
- # constant grid spacing function
- 'spacingfunc'=>"const($m2min,\$m1,$n)",
- # flat-q distribution between m2min and m1
- 'probdist'=>"const($m2min,\$m1)",
- # phase volume contribution
- 'dphasevol','$dm2'
- };
-
-
- $binary_grid::grid_options{'flexigrid'}{'grid variable '.$nvar++}=
- {
- # name of the variable
- 'name'=>'lnsep',
- # long name (for verbose logging)
- 'longname'=>'ln(Orbital_Separation)',
- # range of the separation space
- 'range'=>['log(3.0)','log(1e4)'],
- # resolution
- 'resolution'=>$n*10,
- # constant spacing in ln-separation
- 'spacingfunc'=>"const(log(3.0),log(1e4),$n)",
- # precode has to calculation the period (required for binary_c)
- 'precode'=>"my\$sep=exp(\$lnsep);my\$per=calc_period_from_sep(\$m1,\$m2,\$sep);",
- # flat in log-separation (dN/da~1/a) distribution (Opik law)
- 'probdist'=>'const(log(3.0),log(1e4))',
- # phase volume contribution
- 'dphasevol'=>'$dlnsep'
- }
- }
-}
-
-
-sub modules_etc
-{
- $|=1; # enable this line for auto-flushed output
- use strict;
- use rob_misc;
- use threads ('stack_size'=>4096*1024*10*2);
- use Sort::Key qw(nsort);
- use 5.16.0;
- use binary_grid;
- use binary_grid::C;
- use threads::shared;
- use Carp qw(confess);
- use Proc::ProcessTable;
-}
diff --git a/diffstacks.pl b/diffstacks.pl
deleted file mode 100755
index 37e0ff985..000000000
--- a/diffstacks.pl
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-$|=1;
-my @stacks = @ARGV;
-my %fp;
-foreach my $stack (@stacks)
-{
- open($fp{$stack},'<','/tmp/stack'.$stack)||die;
-}
-
-
-my $go=1;
-my @parse;
-my @lc;
-foreach my $stack (@stacks)
-{
- $parse[$stack]=0;
-}
-
-while($go)
-{
- $go = 1;
- my $clang = 0;
- foreach my $stack (@stacks)
- {
- if(!$parse[$stack])
- {
- my $line = readline $fp{$stack};
- $lc[$stack]++;
- #print "PRELINE $stack : $lc[$stack] : $line\n";
- if($line =~ /EVOLVE SYSTEM/)
- {
- #print "Set parse $stack\n";
- $parse[$stack] = 1;
- }
- $clang=1;
- }
- }
- $go = 0 if($clang==0);
-}
-
-$go = 1;
-
-while($go)
-{
- my @line;
-
- foreach my $stack (@stacks)
- {
- $line[$stack] = readline $fp{$stack};
-
- if($line[$stack])
- {
- $lc[$stack]++;
- #print "LINE $stack : $lc[$stack] : $line[$stack]\n";
- }
- else
- {
- $go = 0;
- }
- }
- if($go)
- {
- foreach my $stack (@stacks)
- {
- next if($stack == 0);
- #print "CF\n$line[0]\n$line[$stack]\n";
- if($line[$stack] ne $line[0])
- {
- $go=0;
- print "Error:\n";
- print "0 : $lc[0] : ",$line[0];
- print "$stack : $lc[$stack] : ",$line[$stack];
- }
- }
- }
-}
diff --git a/faillist b/faillist
deleted file mode 100644
index 6992a0eba..000000000
--- a/faillist
+++ /dev/null
@@ -1,3 +0,0 @@
-This fails with #define POST_CE_OBJECTS_HAVE_ENVELOPES
-
---stellar_type_1 1 --stellar_type_2 1 --M_1 5.0 --M_2 0.95 --eccentricity 0 --orbital_period 3000 --separation 0 --max_evolution_time 13700 --metallicity 0.018 --monte_carlo_kicks --wr_wind 0 --wr_wind_fac 1.0 --BH_prescription 0 --delta_mcmin -0.1 --lambda_min 0.5 --dtfac 1.0 --gbwind 0 --tpagbwind 1 --gb_reimers_eta 0.5 --probability 1 --eddfac 1.0e6 --Bondi_Hoyle_accretion_factor 1.5 --hbbtfac 0.0 --superwind_mira_switchon 500 --tpagb_reimers_eta 1.0e6 --sn_sigma 190 --wd_sigma 0 --CE_duration 0.0 --alpha_ce 1.0 --lambda_ce -1 --present_day 13680 --present_day_period 1 --escape_velocity 1000000000 --escape_fraction 0 --gce_metallicity 0.018 --minimum_timestep 1e-6 --maximum_timestep 1000 --epsnov 1e-3 --comenv_ns_accretion_fraction 0.0 --comenv_ns_accretion_mass 0.0 --CRAP_parameter 0 --log_filename /tmp/c_log2.dat --rlof_gamma -2 --lambda_multiplier 1.0 --hachisu_disk_wind 0 --hachisu_qcrit -1 --mass_accretion_for_eld 0.15 --CEMP_cfe_minimum 1.0 --CEMP_logg_maximum 4.0 --CEMP_minimum_age 10000 --minimum_envelope_mass_for_third_dredgeup 0.5 --mass_of_pmz 0.0 --c13_eff 1.0 --mc13_pocket_multiplier 1.0 --vw93_mira_shift 0.0 --vw93_multiplier 1.0 --comenv_ms_accretion_mass 0.0 --yields_dt 100 --nucsyn_metallicity 0.018 --rotationally_enhanced_mass_loss 0 --rotationally_enhanced_exponent 1.0 --RLOF_timestep_modulator 0.1 --timestep_modulator 1.0 --RLOF_f 0 --RLOF_mdot_factor 1.0 --vrot1 0.1 --vrot2 0.1 --RLOF_method 3 --RLOF_interpolation_method 0 --repeat 1 --tidal_strength_factor 0.0 --wind_mass_loss 1 --merger_angular_momentum_factor 1.0 --mattsson_Orich_tpagbwind 3 --initial_abundance_mix 0 --init_abund 12 0.00346001 --init_abund 15 0.00112 --jorb_loss 0 --lw 2.0 --wind_djorb_fac 1.0 --lambda_ionisation 0.05 --wd_kick_direction 0 --wd_kick_when 0 --wd_kick_pulse_number 0 --E2_prescription 0 --sn_kick_distribution 1 --qcrits 1.8 3 4.0 -1 3 -1 -1 3 4.0 0.78125 3 3 3 3 3 --qcrits_degenerate 1.0 1.0 4.7619 1.15 3 1.15 1.15 3 4.7619 1.15 0.625 0.625 0.625 0.625 0.625 --WRLOF_method 1 --lithium_hbb_multiplier 10.0 --lithium_GB_post_1DUP 1.0 --lithium_GB_post_Heflash 4.0 --hrdiag_output 0 --pre_main_sequence 0 --pre_main_sequence_fit_lobes 0 --rlperi 0 --minimum_separation_for_instant_RLOF 0 --minimum_orbital_period_for_instant_RLOF 0 --vwind_multiplier 0.125 --max_tpagb_core_mass 1.38 --chandrasekhar_mass 1.44 --max_neutron_star_mass 1.8 --minimum_mass_for_carbon_ignition 1.6 --minimum_mass_for_neon_ignition 2.85 --warmup_cpu 0 --internal_buffering 0 --internal_buffering_compression 0 --thick_disc_start_age 10e3 --thick_disc_end_age 4e3 --evolution_splitting 0 --evolution_splitting_sn_n 2 --evolution_splitting_maxdepth 2 --jorb_RLOF_transfer_model 0 --gravitational_radiation_model 0 --disk_fed_novae 1 --RLOF_fed_novae 1 --wind_fed_novae 1 --idum -17402 --M_1 3.15975 --M_2 1.85133 --orbital_period 12.7113 --separation 0 --metallicity 0.000267906 --log_filename /dev/stdout
\ No newline at end of file
diff --git a/notes b/notes
deleted file mode 100644
index 21ca189c0..000000000
--- a/notes
+++ /dev/null
@@ -1,27 +0,0 @@
-;; This buffer is for notes you don't want to save, and for Lisp evaluation.
-;; If you want to create a file, visit that file with C-x C-f,
-;; then enter the text in that file's own buffer.
-
-bse has qcrit=3, but there's nothing in H02 describing this. Claeys et al 2014 suggest 1.6 based on de Mink et al 2007. But even then, mass transfer stars near the end of the main sequence. Enforcing R=RL means there is fast mass transfer, interrupted by the blue loop (This may not be real).
-
-Mass transfer then returns on the HG
-
---------
-
-Turned off winds, tides
-
-Fixing Mdot matches M and R
-
-Next fix adot: it's jdot
-
-
-not gamma
-not BSE gr
-not BSE tides
-check Ulrich and Burger : there is definitely a bug here
-
-
-Bug is in prevent_overspin
-disabling this in BSE gets identical behaviour
-
-BUG : omega_crit uses radius, not effective radius in RLOF
diff --git a/test_holly.pl b/src/perl/tests/test_holly.pl
similarity index 100%
rename from test_holly.pl
rename to src/perl/tests/test_holly.pl
diff --git a/test_holly.plt b/src/perl/tests/test_holly.plt
similarity index 100%
rename from test_holly.plt
rename to src/perl/tests/test_holly.plt
diff --git a/test_restrict.sh b/test_restrict.sh
deleted file mode 100755
index 581f9f8f0..000000000
--- a/test_restrict.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-while :
-do
-
-M1=`perl -e "print 0.1 + 99.9 * rand()"`
-M2=`perl -e "print 0.1 + 99.9 * rand()"`
-PER=`perl -e "print 1e6*rand()"`
-Z=`perl -e "print (0.03-1e-4)*rand()+1e-4"`
-IDUM=-50
-
-ARGS="--M_1 $M1 --M_2 $M2 --orbital_period $PER --metallicity $Z --idum $IDUM --repeat 10"
-
-export BIN_C=binary_c.norestrict
-/usr/bin/time -o /tmp/time.norestrict tbse $ARGS | grep -v Tick > /tmp/data.norestrict &
-
-export BIN_C=binary_c.restrict
-/usr/bin/time -o /tmp/time.restrict tbse $ARGS | grep -v Tick > /tmp/data.restrict &
-
-export BIN_C=binary_c.restrict_strict
-/usr/bin/time -o /tmp/time.restrict_strict tbse $ARGS | grep -v Tick > /tmp/data.restrict_strict &
-wait
-
-DIFF1=`diff /tmp/data.norestrict /tmp/data.restrict`
-DIFF2=`diff /tmp/data.norestrict /tmp/data.restrict_strict`
-
-echo "No restrict : "
-cat /tmp/time.norestrict | grep -v outputs
-
-echo "Only restrict : "
-cat /tmp/time.restrict | grep -v outputs
-
-echo "Restrict with strict aliasing : "
-cat /tmp/time.restrict_strict | grep -v outputs
-
-if [ $DIFF1 ]; then
- echo "Version output differed"
- echo $DIFF1
- echo $DIFF2
-break
-fi
-
-if [ $DIFF2 ]; then
- echo "Version output differed"
- echo $DIFF1
- echo $DIFF2
-break
-fi
-
-echo
-echo
-echo
-
-done
diff --git a/test_results/holly/holly_test_output-Z.dat b/test_results/holly/holly_test_output-Z.dat
new file mode 100644
index 000000000..2cb928b85
--- /dev/null
+++ b/test_results/holly/holly_test_output-Z.dat
@@ -0,0 +1,78 @@
+0.5 0 0 0 0
+0.75 0 0 0 0
+1 0 0 0 0
+1.25 0 0 0 0
+1.5 0 0 0 0
+1.75 0 0 0 0
+2 0 0 0 0
+2.25 0 0 0 0
+2.5 0 0 0 0
+2.75 0 0 0 0
+3 0 0 0 0
+3.25 0 0 0 0
+3.5 0 0 0 0
+3.75 0 0 0 0
+4 0 0 0 0
+4.25 0 0 0 0
+4.5 0 0 0 0
+4.75 0 0 0 0
+5 0 0 0 0
+5.25 0 0 0 0
+5.5 0 0 0 0
+5.75 0 0 0 0
+6 0 0 0 0
+6.25 0 0 0 0
+6.5 0 0 0 0
+6.75 0 0 0 0
+7 0 0 0 0
+7.25 0 0 0 0
+7.5 0 0 0 0
+7.75 0 0 0 0
+8 0 0 0 0
+8.25 0 0 0 0
+8.5 0 0 0 0
+8.75 0 0 0 0
+9 0 0 0 0
+9.25 0 0 0 0
+9.5 0 0 0 0
+9.75 0 0 0 0
+10 0 0 0 0
+10.25 0 0 0 0
+10.5 0 0 0 0
+10.75 0 0 0 0
+11 0 0 0 0
+11.25 0 0 0 0
+11.5 0 0 0 0
+11.75 0 0 0 0
+12 0 0 0 0
+12.25 0 0 0 0
+12.5 0 0 0 0
+12.75 0 0 0 0
+13 0 0 0 0
+13.25 0 0 0 0
+13.5 0 0 0 0
+13.75 0 0 0 0
+14 0 0 0 0
+14.25 0 0 0 0
+14.5 0 0 0 0
+14.75 0 0 0 0
+15 0 0 0 0
+15.25 0 0 0 0
+15.5 0 0 0 0
+15.75 0 0 0 0
+16 0 0 0 0
+16.25 0 0 0 0
+16.5 0 0 0 0
+16.75 0 0 0 0
+17 0 0 0 0
+17.25 0 0 0 0
+17.5 0 0 0 0
+17.75 0 0 0 0
+18 0 0 0 0
+18.25 0 0 0 0
+18.5 0 0 0 0
+18.75 0 0 0 0
+19 0 0 0 0
+19.25 0 0 0 0
+19.5 0 0 0 0
+19.75 0 0 0 0
diff --git a/test_results/holly/holly_test_output-Z0.0001.dat b/test_results/holly/holly_test_output-Z0.0001.dat
new file mode 100644
index 000000000..ab9cd4410
--- /dev/null
+++ b/test_results/holly/holly_test_output-Z0.0001.dat
@@ -0,0 +1,77 @@
+0.8 3.96902 -0.0353682 0 0
+1.05 -0.321981 -0.328729 0 0
+1.3 -0.503385 -0.508688 0 0
+1.55 -0.638442 -0.640565 0 0
+1.8 -0.741798 -0.741601 0 0
+2.05 -0.819359 -0.822395 0 0
+2.3 -0.436828 -0.427489 0 0
+2.55 0 0 0 0
+2.8 0 0 0 0
+3.05 0 0 0 0
+3.3 0 0 0 0
+3.55 0 0 0 0
+3.8 0 0 0 0
+4.05 0 0 0 0
+4.3 0 0 0 0
+4.55 0 0 0 0
+4.8 0 0 0 0
+5.05 0 0 0 0
+5.3 0 0 0 0
+5.55 0 0 0 0
+5.8 0 0 0 0
+6.05 0 0 0 0
+6.3 0 0 0 0
+6.55 0 0 0 0
+6.8 0 0 0 0
+7.05 0 0 0 0
+7.3 0 0 0 0
+7.55 0 0 0 0
+7.8 0 0 0 0
+8.05 0 0 0 0
+8.3 0 0 0 0
+8.55 0 0 0 0
+8.8 0 0 0 0
+9.05 0 0 0 0
+9.3 0 0 0 0
+9.55 0 0 0 0
+9.8 0 0 0 0
+10.05 0 0 0 0
+10.3 0 0 0 0
+10.55 0 0 0 0
+10.8 0 0 0 0
+11.05 0 0 0 0
+11.3 0 0 0 0
+11.55 0 0 0 0
+11.8 0 0 0 0
+12.05 0 -1.37206e-05 0 0
+12.3 0 -5.81605e-05 0 0
+12.55 0 -5.81605e-05 0 0
+12.8 0 -5.81605e-05 0 0
+13.05 0 -0.000100161 0 0
+13.3 0 -0.000106891 0 0
+13.55 0 -0.000113621 0 0
+13.8 0 -0.000120089 0 0
+14.05 0 -0.000224039 0 0
+14.3 0 -0.000242913 0 0
+14.55 0 -0.000251973 0 0
+14.8 0 -0.000251973 0 0
+15.05 0 -0.000519222 0 0
+15.3 0 -0.000529425 0 0
+15.55 0 -0.000535121 0 0
+15.8 0 -0.000540818 0 0
+16.05 0 -0.000546514 0 0
+16.3 0 -0.00105432 0 0
+16.55 0 -0.00109194 0 0
+16.8 0 -0.00112956 0 0
+17.05 0 -0.00197245 0 0
+17.3 0 -0.0020039 0 0
+17.55 0 -0.00203535 0 0
+17.8 0 -0.0020668 0 0
+18.05 0 -0.00329208 0 0
+18.3 0 -0.00333774 0 0
+18.55 0 -0.0033834 0 0
+18.8 0 -0.00342904 0 0
+19.05 0 -0.00525903 0 0
+19.3 0 -0.00539864 0 0
+19.55 0 -0.00553824 0 0
+19.8 0 -0.00567783 0 0
diff --git a/test_results/holly/holly_test_output-Z0.001.dat b/test_results/holly/holly_test_output-Z0.001.dat
new file mode 100644
index 000000000..a8fb46e5e
--- /dev/null
+++ b/test_results/holly/holly_test_output-Z0.001.dat
@@ -0,0 +1,77 @@
+0.8 -0.0716109 -0.0829659 0 0
+1.05 -0.328374 -0.335815 0 0
+1.3 -0.479374 -0.482746 0 0
+1.55 -0.576091 -0.580828 0 0
+1.8 -0.647882 -0.648901 0 0
+2.05 -0.704631 -0.718479 0 0
+2.3 -0.741453 -0.743561 0 0
+2.55 -0.682291 -0.685201 0 0
+2.8 -0.599896 -0.600668 0 0
+3.05 -0.51796 -0.51031 0 0
+3.3 -0.430882 -0.431501 0 0
+3.55 -0.328199 -0.323281 0 0
+3.8 -0.228982 -0.234185 0 0
+4.05 -0.146717 -0.149721 0 0
+4.3 -0.0846656 -0.0801105 0 0
+4.55 -0.0490792 -0.0456374 0 0
+4.8 -0.0300763 -0.0266894 0 0
+5.05 -0.0183213 -0.014457 0 0
+5.3 -0.0099996 -0.00597433 0 0
+5.55 -0.00777916 -0.00267946 0 0
+5.8 -0.00600608 -0.000102802 0 0
+6.05 -1.42706e-06 0 0 0
+6.3 -2.79258e-07 0 0 0
+6.55 0 0 0 0
+6.8 0 0 0 0
+7.05 0 0 0 0
+7.3 0 0 0 0
+7.55 0 0 0 0
+7.8 0 0 0 0
+8.05 0 0 0 0
+8.3 0 0 0 0
+8.55 0 0 0 0
+8.8 0 0 0 0
+9.05 0 0 0 0
+9.3 0 0 0 0
+9.55 0 0 0 0
+9.8 0 0 0 0
+10.05 0 0 0 0
+10.3 0 0 0 0
+10.55 0 0 0 0
+10.8 0 0 0 0
+11.05 0 0 0 0
+11.3 0 0 0 0
+11.55 0 0 0 0
+11.8 0 0 0 0
+12.05 0 0 0 0
+12.3 0 0 0 0
+12.55 0 0 0 0
+12.8 0 0 0 0
+13.05 0 0 0 0
+13.3 0 0 0 0
+13.55 0 0 0 0
+13.8 0 0 0 0
+14.05 0 0 0 0
+14.3 0 0 0 0
+14.55 0 0 0 0
+14.8 0 0 0 0
+15.05 0 0 0 0
+15.3 0 0 0 0
+15.55 0 0 0 0
+15.8 0 0 0 0
+16.05 0 0 0 0
+16.3 0 0 0 0
+16.55 0 0 0 0
+16.8 0 0 0 0
+17.05 0 0 0 0
+17.3 0 0 0 0
+17.55 0 0 0 0
+17.8 0 0 0 0
+18.05 0 0 0 0
+18.3 0 0 0 0
+18.55 0 0 0 0
+18.8 0 0 0 0
+19.05 0 0 0 0
+19.3 0 0 0 0
+19.55 0 0 0 0
+19.8 0 0 0 0
diff --git a/test_results/holly/holly_test_output-Z0.004.dat b/test_results/holly/holly_test_output-Z0.004.dat
new file mode 100644
index 000000000..3518dc027
--- /dev/null
+++ b/test_results/holly/holly_test_output-Z0.004.dat
@@ -0,0 +1,77 @@
+0.8 -0.0675706 -0.0810752 0 0
+1.05 -0.302739 -0.315087 0 0
+1.3 -0.438673 -0.440608 0 0
+1.55 -0.523595 -0.532304 0 0
+1.8 -0.585947 -0.589244 0 0
+2.05 -0.634437 -0.647053 0 0
+2.3 -0.675764 -0.682266 0 0
+2.55 -0.700762 -0.72043 0 0
+2.8 -0.705567 -0.722106 0 0
+3.05 -0.696821 -0.710216 0 0
+3.3 -0.677516 -0.695643 0 0
+3.55 -0.649431 -0.646788 0 0
+3.8 -0.616142 -0.628213 0 0
+4.05 -0.587711 -0.592972 0 0
+4.3 -0.566211 -0.569661 0 0
+4.55 -0.54281 -0.544587 0 0
+4.8 -0.520442 -0.525895 0 0
+5.05 -0.503036 -0.508816 0 0
+5.3 -0.490675 -0.498917 0 0
+5.55 -0.482558 -0.481081 0 0
+5.8 -0.478343 -0.477971 0 0
+6.05 -0.477665 -0.482538 0 0
+6.3 -0.479906 -0.486918 0 0
+6.55 -0.484813 -0.49137 0 0
+6.8 -0.491221 -0.495823 0 0
+7.05 -0.498928 -0.507972 0 0
+7.3 -0.508263 -0.520375 0 0
+7.55 -0.518404 -0.525117 0 0
+7.8 -0.530361 -0.537812 0 0
+8.05 -0.541876 -0.551141 0 0
+8.3 -0.552935 -0.565382 0 0
+8.55 -0.563995 -0.58106 0 0
+8.8 -0.574979 -0.587892 0 0
+9.05 -0.576482 -0.595366 0 0
+9.3 -0.575315 -0.5922 0 0
+9.55 -0.551283 -0.569084 0 0
+9.8 -0.519751 -0.537085 0 0
+10.05 -0.423909 -0.448046 0 0
+10.3 -0.287835 -0.313489 0 0
+10.55 -0.16964 -0.0603464 0 0
+10.8 -0.0870276 -0.000122324 0 0
+11.05 0 0 0 0
+11.3 0 0 0 0
+11.55 0 0 0 0
+11.8 0 0 0 0
+12.05 0 0 0 0
+12.3 0 0 0 0
+12.55 0 0 0 0
+12.8 0 0 0 0
+13.05 0 0 0 0
+13.3 0 0 0 0
+13.55 0 0 0 0
+13.8 0 0 0 0
+14.05 0 0 0 0
+14.3 0 0 0 0
+14.55 0 0 0 0
+14.8 0 0 0 0
+15.05 0 0 0 0
+15.3 0 0 0 0
+15.55 0 0 0 0
+15.8 0 0 0 0
+16.05 0 0 0 0
+16.3 0 0 0 0
+16.55 0 0 0 0
+16.8 0 0 0 0
+17.05 0 0 0 0
+17.3 -7.26947e-06 0 0 0
+17.55 -2.35077e-05 0 0 0
+17.8 -3.97323e-05 0 0 0
+18.05 -5.59432e-05 0 0 0
+18.3 -5.62462e-05 0 0 0
+18.55 -4.09227e-05 0 0 0
+18.8 -2.56113e-05 0 0 0
+19.05 -1.03121e-05 -6.41578e-05 0 0
+19.3 0 -6.41578e-05 0 0
+19.55 0 -0.000192459 0 0
+19.8 0 -0.000256602 0 0
diff --git a/test_results/holly/holly_test_output-Z0.008.dat b/test_results/holly/holly_test_output-Z0.008.dat
new file mode 100644
index 000000000..5befc6476
--- /dev/null
+++ b/test_results/holly/holly_test_output-Z0.008.dat
@@ -0,0 +1,390 @@
+0.5 -0.110033 0.0125835 0 0
+0.55 -0.110033 0.0125835 0 0
+0.6 -0.110033 0.0125835 0 0
+0.65 -0.110033 0.0125835 0 0
+0.7 -0.110033 0.0125835 0 0
+0.75 -0.110033 0.0125835 0 0
+0.8 -0.110033 0.0125835 0 0
+0.85 -0.147036 -0.0214469 0 0
+0.9 -0.184855 -0.0676536 0 0
+0.95 -0.221968 -0.119661 0 0
+1 -0.257989 -0.162114 0 0
+1.05 -0.29202 -0.202233 0 0
+1.1 -0.323284 -0.239459 0 0
+1.15 -0.352729 -0.266558 0 0
+1.2 -0.377558 -0.302776 0 0
+1.25 -0.398556 -0.331451 0 0
+1.3 -0.417801 -0.361795 0 0
+1.35 -0.436551 -0.38334 0 0
+1.4 -0.454494 -0.404001 0 0
+1.45 -0.471368 -0.423926 0 0
+1.5 -0.487483 -0.441336 0 0
+1.55 -0.50303 -0.458181 0 0
+1.6 -0.517135 -0.475081 0 0
+1.65 -0.531086 -0.492046 0 0
+1.7 -0.544853 -0.502677 0 0
+1.75 -0.556739 -0.518115 0 0
+1.8 -0.567624 -0.533286 0 0
+1.85 -0.579444 -0.544514 0 0
+1.9 -0.591501 -0.566058 0 0
+1.95 -0.5992 -0.572447 0 0
+2 -0.605024 -0.585592 0 0
+2.05 -0.613179 -0.593787 0 0
+2.1 -0.623171 -0.605687 0 0
+2.15 -0.631113 -0.614565 0 0
+2.2 -0.634046 -0.616152 0 0
+2.25 -0.636977 -0.61774 0 0
+2.3 -0.644807 -0.627083 0 0
+2.35 -0.653185 -0.647453 0 0
+2.4 -0.659083 -0.654115 0 0
+2.45 -0.660604 -0.654741 0 0
+2.5 -0.662128 -0.655369 0 0
+2.55 -0.66739 -0.661446 0 0
+2.6 -0.674328 -0.669981 0 0
+2.65 -0.681192 -0.678395 0 0
+2.7 -0.682013 -0.679837 0 0
+2.75 -0.681863 -0.680157 0 0
+2.8 -0.681714 -0.680477 0 0
+2.85 -0.685615 -0.677208 0 0
+2.9 -0.690028 -0.684485 0 0
+2.95 -0.694406 -0.691673 0 0
+3 -0.694456 -0.693684 0 0
+3.05 -0.692943 -0.693895 0 0
+3.1 -0.691426 -0.694107 0 0
+3.15 -0.691678 -0.696703 0 0
+3.2 -0.694465 -0.702547 0 0
+3.25 -0.697234 -0.708333 0 0
+3.3 -0.699986 -0.704862 0 0
+3.35 -0.69856 -0.705923 0 0
+3.4 -0.696668 -0.706458 0 0
+3.45 -0.694772 -0.697613 0 0
+3.5 -0.693529 -0.698884 0 0
+3.55 -0.695014 -0.693584 0 0
+3.6 -0.696493 -0.697818 0 0
+3.65 -0.697965 -0.702021 0 0
+3.7 -0.698104 -0.695949 0 0
+3.75 -0.694815 -0.697316 0 0
+3.8 -0.691518 -0.689069 0 0
+3.85 -0.688211 -0.680667 0 0
+3.9 -0.685078 -0.681885 0 0
+3.95 -0.683001 -0.672051 0 0
+4 -0.680918 -0.672177 0 0
+4.05 -0.678829 -0.662166 0 0
+4.1 -0.676734 -0.662286 0 0
+4.15 -0.677069 -0.65518 0 0
+4.2 -0.678086 -0.659195 0 0
+4.25 -0.6791 -0.652935 0 0
+4.3 -0.68011 -0.656948 0 0
+4.35 -0.68008 -0.650132 0 0
+4.4 -0.674962 -0.650905 0 0
+4.45 -0.669837 -0.641276 0 0
+4.5 -0.664703 -0.642048 0 0
+4.55 -0.659559 -0.632337 0 0
+4.6 -0.655732 -0.622495 0 0
+4.65 -0.654983 -0.623 0 0
+4.7 -0.654233 -0.612971 0 0
+4.75 -0.65348 -0.61348 0 0
+4.8 -0.652725 -0.61399 0 0
+4.85 -0.652301 -0.604628 0 0
+4.9 -0.653645 -0.609078 0 0
+4.95 -0.654984 -0.603016 0 0
+5 -0.656318 -0.607386 0 0
+5.05 -0.657648 -0.601234 0 0
+5.1 -0.658973 -0.605511 0 0
+5.15 -0.658274 -0.596536 0 0
+5.2 -0.656818 -0.597016 0 0
+5.25 -0.655359 -0.597496 0 0
+5.3 -0.653898 -0.587486 0 0
+5.35 -0.652435 -0.587961 0 0
+5.4 -0.65097 -0.578012 0 0
+5.45 -0.648536 -0.580632 0 0
+5.5 -0.646096 -0.572864 0 0
+5.55 -0.643656 -0.57544 0 0
+5.6 -0.641216 -0.567663 0 0
+5.65 -0.638776 -0.570189 0 0
+5.7 -0.636337 -0.562385 0 0
+5.75 -0.63789 -0.56397 0 0
+5.8 -0.639713 -0.565495 0 0
+5.85 -0.641533 -0.556696 0 0
+5.9 -0.64335 -0.558186 0 0
+5.95 -0.645165 -0.559675 0 0
+6 -0.646977 -0.56116 0 0
+6.05 -0.64757 -0.551725 0 0
+6.1 -0.647126 -0.552115 0 0
+6.15 -0.646681 -0.552506 0 0
+6.2 -0.646236 -0.552896 0 0
+6.25 -0.64579 -0.553287 0 0
+6.3 -0.645344 -0.553678 0 0
+6.35 -0.644897 -0.55407 0 0
+6.4 -0.645739 -0.556475 0 0
+6.45 -0.64693 -0.559436 0 0
+6.5 -0.648118 -0.562383 0 0
+6.55 -0.649303 -0.565316 0 0
+6.6 -0.650484 -0.568237 0 0
+6.65 -0.651663 -0.571144 0 0
+6.7 -0.652838 -0.574038 0 0
+6.75 -0.654476 -0.586213 0 0
+6.8 -0.656364 -0.587155 0 0
+6.85 -0.658251 -0.588097 0 0
+6.9 -0.660132 -0.589046 0 0
+6.95 -0.661993 -0.590052 0 0
+7 -0.66385 -0.591062 0 0
+7.05 -0.665696 -0.60286 0 0
+7.1 -0.667497 -0.603775 0 0
+7.15 -0.668572 -0.604032 0 0
+7.2 -0.66965 -0.604274 0 0
+7.25 -0.670725 -0.604535 0 0
+7.3 -0.671805 -0.604774 0 0
+7.35 -0.672885 -0.61577 0 0
+7.4 -0.673963 -0.616012 0 0
+7.45 -0.675047 -0.616182 0 0
+7.5 -0.676129 -0.616921 0 0
+7.55 -0.678926 -0.620336 0 0
+7.6 -0.68189 -0.623723 0 0
+7.65 -0.68484 -0.637817 0 0
+7.7 -0.687776 -0.641171 0 0
+7.75 -0.690705 -0.644493 0 0
+7.8 -0.693623 -0.647763 0 0
+7.85 -0.696523 -0.651066 0 0
+7.9 -0.699421 -0.654336 0 0
+7.95 -0.701668 -0.666262 0 0
+8 -0.702616 -0.666988 0 0
+8.05 -0.703567 -0.667691 0 0
+8.1 -0.704514 -0.66842 0 0
+8.15 -0.705464 -0.669102 0 0
+8.2 -0.706412 -0.669819 0 0
+8.25 -0.707359 -0.670544 0 0
+8.3 -0.708309 -0.681771 0 0
+8.35 -0.709255 -0.682505 0 0
+8.4 -0.710415 -0.684507 0 0
+8.45 -0.712189 -0.6867 0 0
+8.5 -0.71396 -0.688883 0 0
+8.55 -0.715726 -0.691061 0 0
+8.6 -0.717487 -0.69323 0 0
+8.65 -0.719247 -0.695386 0 0
+8.7 -0.721 -0.697552 0 0
+8.75 -0.722751 -0.709795 0 0
+8.8 -0.724495 -0.711918 0 0
+8.85 -0.726238 -0.713619 0 0
+8.9 -0.72686 -0.714959 0 0
+8.95 -0.726854 -0.716299 0 0
+9 -0.726847 -0.717643 0 0
+9.05 -0.726841 -0.718981 0 0
+9.1 -0.726835 -0.720315 0 0
+9.15 -0.726828 -0.721633 0 0
+9.2 -0.726822 -0.722944 0 0
+9.25 -0.726816 -0.724305 0 0
+9.3 -0.72681 -0.725585 0 0
+9.35 -0.726803 -0.726306 0 0
+9.4 -0.726842 -0.726681 0 0
+9.45 -0.726927 -0.717076 0 0
+9.5 -0.727013 -0.717454 0 0
+9.55 -0.727099 -0.717831 0 0
+9.6 -0.727185 -0.71821 0 0
+9.65 -0.727271 -0.718589 0 0
+9.7 -0.727357 -0.718968 0 0
+9.75 -0.727443 -0.719348 0 0
+9.8 -0.727529 -0.719729 0 0
+9.85 -0.727615 -0.720495 0 0
+9.9 -0.727701 -0.723276 0 0
+9.95 -0.728296 -0.726089 0 0
+10 -0.728985 -0.728848 0 0
+10.05 -0.729671 -0.721635 0 0
+10.1 -0.730356 -0.724413 0 0
+10.15 -0.731038 -0.727179 0 0
+10.2 -0.731719 -0.729979 0 0
+10.25 -0.732399 -0.732722 0 0
+10.3 -0.733076 -0.735583 0 0
+10.35 -0.733751 -0.728269 0 0
+10.4 -0.734425 -0.730553 0 0
+10.45 -0.735097 -0.730982 0 0
+10.5 -0.734665 -0.731448 0 0
+10.55 -0.733435 -0.732011 0 0
+10.6 -0.732203 -0.722262 0 0
+10.65 -0.73097 -0.722736 0 0
+10.7 -0.729736 -0.72317 0 0
+10.75 -0.728501 -0.71338 0 0
+10.8 -0.727264 -0.713818 0 0
+10.85 -0.726026 -0.714286 0 0
+10.9 -0.724787 -0.714725 0 0
+10.95 -0.723546 -0.704784 0 0
+11 -0.722304 -0.706081 0 0
+11.05 -0.721061 -0.708575 0 0
+11.1 -0.719386 -0.700606 0 0
+11.15 -0.717493 -0.703153 0 0
+11.2 -0.7156 -0.695144 0 0
+11.25 -0.713709 -0.687014 0 0
+11.3 -0.711819 -0.689602 0 0
+11.35 -0.709931 -0.681396 0 0
+11.4 -0.708044 -0.683992 0 0
+11.45 -0.706159 -0.675743 0 0
+11.5 -0.704275 -0.678289 0 0
+11.55 -0.702392 -0.669952 0 0
+11.6 -0.70051 -0.661119 0 0
+11.65 -0.69863 -0.661835 0 0
+11.7 -0.694996 -0.662531 0 0
+11.75 -0.653011 -0.716892 0 0
+11.8 -0.610612 -0.767128 0 0
+11.85 -0.567585 -0.803418 0 0
+11.9 -0.523699 -0.820923 0 0
+11.95 -0.478696 -0.821602 0 0
+12 -0.432282 -0.822267 0 0
+12.05 -0.384107 -0.822933 0 0
+12.1 -0.333755 -0.823598 0 0
+12.15 -0.28071 -0.815941 0 0
+12.2 -0.224315 -0.816611 0 0
+12.25 -0.163716 -0.8175 0 0
+12.3 -0.097754 -0.819291 0 0
+12.35 -0.0248009 -0.821019 0 0
+12.4 0 -0.822816 0 0
+12.45 0 -0.58617 0 0
+12.5 0 -0.566316 0 0
+12.55 0 -0.568434 0 0
+12.6 0 -0.558999 0 0
+12.65 0 -0.549532 0 0
+12.7 0 -0.540781 0 0
+12.75 0 -0.543034 0 0
+12.8 0 -0.544996 0 0
+12.85 0 -0.546957 0 0
+12.9 0 -0.537271 0 0
+12.95 0 -0.53966 0 0
+13 0 -0.540326 0 0
+13.05 0 -0.540913 0 0
+13.1 0 -0.541534 0 0
+13.15 0 -0.542314 0 0
+13.2 0 -0.543799 0 0
+13.25 0 -0.532811 0 0
+13.3 0 -0.533409 0 0
+13.35 0 -0.534014 0 0
+13.4 0 -0.534886 0 0
+13.45 0 -0.524718 0 0
+13.5 0 -0.525369 0 0
+13.55 0 -0.525979 0 0
+13.6 0 -0.526596 0 0
+13.65 0 -0.527219 0 0
+13.7 0 -0.518596 0 0
+13.75 0 -0.520545 0 0
+13.8 0 -0.52238 0 0
+13.85 0 -0.524212 0 0
+13.9 0 -0.526046 0 0
+13.95 0 -0.516958 0 0
+14 0 -0.519163 0 0
+14.05 0 -0.520968 0 0
+14.1 0 -0.52275 0 0
+14.15 0 -0.524533 0 0
+14.2 0 -0.526318 0 0
+14.25 0 -0.529187 0 0
+14.3 0 -0.531207 0 0
+14.35 0 -0.532989 0 0
+14.4 0 -0.522698 0 0
+14.45 0 -0.523828 0 0
+14.5 0 -0.524559 0 0
+14.55 0 -0.514206 0 0
+14.6 0 -0.515306 0 0
+14.65 0 -0.516069 0 0
+14.7 0 -0.516801 0 0
+14.75 0 -0.517535 0 0
+14.8 0 -0.518276 0 0
+14.85 0 -0.507252 0 0
+14.9 0 -0.508903 0 0
+14.95 0 -0.509859 0 0
+15 0 -0.510628 0 0
+15.05 0 -0.511377 0 0
+15.1 0 -0.51213 0 0
+15.15 0 -0.512929 0 0
+15.2 0 -0.513693 0 0
+15.25 0 -0.51602 0 0
+15.3 0 -0.506366 0 0
+15.35 0 -0.508537 0 0
+15.4 0 -0.51063 0 0
+15.45 0 -0.512711 0 0
+15.5 0 -0.514789 0 0
+15.55 0 -0.516867 0 0
+15.6 0 -0.518945 0 0
+15.65 0 -0.509191 0 0
+15.7 0 -0.511887 0 0
+15.75 0 -0.514155 0 0
+15.8 0 -0.516241 0 0
+15.85 0 -0.518324 0 0
+15.9 0 -0.520351 0 0
+15.95 0 -0.509513 0 0
+16 0 -0.524349 0 0
+16.05 0 -0.526372 0 0
+16.1 0 -0.528015 0 0
+16.15 0 -0.516689 0 0
+16.2 0 -0.518404 0 0
+16.25 0 -0.519857 0 0
+16.3 0 -0.521078 0 0
+16.35 0 -0.522218 0 0
+16.4 0 -0.523373 0 0
+16.45 0 -0.511354 0 0
+16.5 0 -0.512435 0 0
+16.55 0 -0.513518 0 0
+16.6 0 -0.514606 0 0
+16.65 0 -0.515699 0 0
+16.7 0 -0.516796 0 0
+16.75 0 -0.517898 0 0
+16.8 0 -0.519061 0 0
+16.85 0 -0.507135 0 0
+16.9 0 -0.508773 0 0
+16.95 0 -0.51027 0 0
+17 0 -0.512154 0 0
+17.05 0 -0.514664 0 0
+17.1 0 -0.517102 0 0
+17.15 0 -0.519489 0 0
+17.2 0 -0.521844 0 0
+17.25 0 -0.524248 0 0
+17.3 0 -0.513023 0 0
+17.35 0 -0.515314 0 0
+17.4 0 -0.53115 0 0
+17.45 0 -0.533464 0 0
+17.5 0 -0.535777 0 0
+17.55 0 -0.538087 0 0
+17.6 0 -0.526724 0 0
+17.65 0 -0.529005 0 0
+17.7 0 -0.531287 0 0
+17.75 0 -0.533568 0 0
+17.8 0 -0.53585 0 0
+17.85 0 -0.538134 0 0
+17.9 0 -0.54042 0 0
+17.95 0 -0.542583 0 0
+18 0 -0.529884 0 0
+18.05 0 -0.531223 0 0
+18.1 0 -0.53257 0 0
+18.15 0 -0.533922 0 0
+18.2 0 -0.54918 0 0
+18.25 0 -0.536641 0 0
+18.3 0 -0.538007 0 0
+18.35 0 -0.539378 0 0
+18.4 0 -0.540746 0 0
+18.45 0 -0.542125 0 0
+18.5 0 -0.543471 0 0
+18.55 0 -0.54491 0 0
+18.6 0 -0.532214 0 0
+18.65 0 -0.533541 0 0
+18.7 0 -0.534775 0 0
+18.75 0 -0.535962 0 0
+18.8 0 -0.550911 0 0
+18.85 0 -0.537941 0 0
+18.9 0 -0.538666 0 0
+18.95 0 -0.540262 0 0
+19 0 -0.542817 0 0
+19.05 0 -0.545375 0 0
+19.1 0 -0.561807 0 0
+19.15 0 -0.550501 0 0
+19.2 0 -0.553067 0 0
+19.25 0 -0.555634 0 0
+19.3 0 -0.558197 0 0
+19.35 0 -0.560736 0 0
+19.4 0 -0.563305 0 0
+19.45 0 -0.551522 0 0
+19.5 0 -0.553723 0 0
+19.55 0 -0.569689 0 0
+19.6 0 -0.571139 0 0
+19.65 0 -0.55938 0 0
+19.7 0 -0.56195 0 0
+19.75 0 -0.564526 0 0
+19.8 0 -0.581224 0 0
+19.85 0 -0.58381 0 0
+19.9 0 -0.572232 0 0
+19.95 0 -0.574698 0 0
diff --git a/test_results/holly/holly_test_output-Z0.02.dat b/test_results/holly/holly_test_output-Z0.02.dat
new file mode 100644
index 000000000..df8b248d7
--- /dev/null
+++ b/test_results/holly/holly_test_output-Z0.02.dat
@@ -0,0 +1,77 @@
+0.8 -0.0765131 -0.0816562 0 0
+1.05 -0.263023 -0.273563 0 0
+1.3 -0.383754 -0.392012 0 0
+1.55 -0.461793 -0.469159 0 0
+1.8 -0.512084 -0.517336 0 0
+2.05 -0.549573 -0.567608 0 0
+2.3 -0.580021 -0.580028 0 0
+2.55 -0.603041 -0.606901 0 0
+2.8 -0.619153 -0.614362 0 0
+3.05 -0.628688 -0.624443 0 0
+3.3 -0.635027 -0.643294 0 0
+3.55 -0.637221 -0.644792 0 0
+3.8 -0.638075 -0.645224 0 0
+4.05 -0.637581 -0.645135 0 0
+4.3 -0.636939 -0.664481 0 0
+4.55 -0.637585 -0.654613 0 0
+4.8 -0.637368 -0.662496 0 0
+5.05 -0.638157 -0.660205 0 0
+5.3 -0.639376 -0.658097 0 0
+5.55 -0.640389 -0.654998 0 0
+5.8 -0.64199 -0.651772 0 0
+6.05 -0.644859 -0.659522 0 0
+6.3 -0.648182 -0.667009 0 0
+6.55 -0.651755 -0.674509 0 0
+6.8 -0.655551 -0.671839 0 0
+7.05 -0.659643 -0.67904 0 0
+7.3 -0.663793 -0.686129 0 0
+7.55 -0.667936 -0.683199 0 0
+7.8 -0.67205 -0.690169 0 0
+8.05 -0.676148 -0.697068 0 0
+8.3 -0.680229 -0.694013 0 0
+8.55 -0.684355 -0.685826 0 0
+8.8 -0.688479 -0.697706 0 0
+9.05 -0.693675 -0.704435 0 0
+9.3 -0.698953 -0.701376 0 0
+9.55 -0.705495 -0.704443 0 0
+9.8 -0.712085 -0.707776 0 0
+10.05 -0.716677 -0.720198 0 0
+10.3 -0.720849 -0.71895 0 0
+10.55 -0.72199 -0.717042 0 0
+10.8 -0.721329 -0.728179 0 0
+11.05 -0.71222 -0.726278 0 0
+11.3 -0.682387 -0.697897 0 0
+11.55 -0.651748 -0.667932 0 0
+11.8 -0.564322 -0.570447 0 0
+12.05 -0.457611 -0.453336 0 0
+12.3 -0.358698 -0.368924 0 0
+12.55 -0.322739 -0.319825 0 0
+12.8 -0.285902 -0.291793 0 0
+13.05 -0.265067 -0.263355 0 0
+13.3 -0.261942 -0.256671 0 0
+13.55 -0.258812 -0.260991 0 0
+13.8 -0.25457 -0.254634 0 0
+14.05 -0.249525 -0.248367 0 0
+14.3 -0.244455 -0.241885 0 0
+14.55 -0.239051 -0.235612 0 0
+14.8 -0.233345 -0.228987 0 0
+15.05 -0.227614 -0.234048 0 0
+15.3 -0.221258 -0.214084 0 0
+15.55 -0.213382 -0.217055 0 0
+15.8 -0.205446 -0.207922 0 0
+16.05 -0.197447 -0.198868 0 0
+16.3 -0.192248 -0.204949 0 0
+16.55 -0.187432 -0.198399 0 0
+16.8 -0.182588 -0.17779 0 0
+17.05 -0.177 -0.182147 0 0
+17.3 -0.169401 -0.173335 0 0
+17.55 -0.161743 -0.164558 0 0
+17.8 -0.154025 -0.15552 0 0
+18.05 -0.146437 -0.148477 0 0
+18.3 -0.139064 -0.143242 0 0
+18.55 -0.131694 -0.149602 0 0
+18.8 -0.124326 -0.129756 0 0
+19.05 -0.116961 -0.133397 0 0
+19.3 -0.109512 -0.123377 0 0
+19.55 -0.101941 -0.102955 0 0
+19.8 -0.0942426 -0.104965 0 0
diff --git a/valC2.sh b/valC2.sh
deleted file mode 100644
index 49b150fce..000000000
--- a/valC2.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-nice valgrind --read-var-info --log-file=valgrind.log --main-stacksize=30000000 --max-stackframe=30000000 --tool=memcheck --leak-check=full --show-reachable=yes -v perl ./C2.pl > C2.out 2> C2.err
--
GitLab