From b0ff0e18e560c719fa8a4d6c263ecd18bde3dc4b Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Sun, 27 Oct 2019 13:53:41 +0000
Subject: [PATCH] sync latest code
---
src/disc/disc_new_zone_radii.c | 1 -
src/perl/scripts2/cbdiscs.pl | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/disc/disc_new_zone_radii.c b/src/disc/disc_new_zone_radii.c
index 27d273067..c6e000d10 100644
--- a/src/disc/disc_new_zone_radii.c
+++ b/src/disc/disc_new_zone_radii.c
@@ -115,7 +115,6 @@ Boolean disc_new_zone_radii(struct disc_t * const disc)
*/
while(zones_remaining > 0)
{
-
/*
* Find the hottest valid zone at this radius.
*
diff --git a/src/perl/scripts2/cbdiscs.pl b/src/perl/scripts2/cbdiscs.pl
index d19779a43..1dd1230bc 100755
--- a/src/perl/scripts2/cbdiscs.pl
+++ b/src/perl/scripts2/cbdiscs.pl
@@ -43,7 +43,7 @@ use threads::shared;
my $lockvar : shared;
# number of computational threads to launch
-my $nthreads = ("@ARGV"=~/nthreads=(\d+)/)[0] // 1;#rob_misc::ncpus();
+my $nthreads = ("@ARGV"=~/nthreads=(\d+)/)[0] // rob_misc::ncpus();
# make a new stellar population
my $population = binary_grid2->new(
@@ -352,7 +352,7 @@ sub parse_data
# subsequent calls to tbse_line contain
# (references to) arrays of data
my $la = $population->tbse_line();
-
+
# first element is the "header" line
my $header = shift @$la;
@@ -529,9 +529,9 @@ sub parse_data
$lifetime,
$final_eccentricity,
$p;
-
- print {$initparamspace_fp} $s;
- #print $s;
+
+ print {$initparamspace_fp} $s;
+ #print $s;
}
}
elsif($header eq 'DISC_START')
--
GitLab