Skip to content

Commit ce5906d

Browse files
silviatoonensilviatoonen
committed
rm triple assumption: renaming REPORT_TRIPLE_EVOLUTION as REPORT_EVOLUTION
1 parent 81b3ce8 commit ce5906d

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎TRES.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from TRES_plotting import plot_data_container, plot_function
3232
from TRES_setup import make_particle_sets, setup_stellar_code
3333
from TRES_options import REPORT_DEBUG, \
34-
REPORT_TRIPLE_EVOLUTION, \
34+
REPORT_EVOLUTION, \
3535
MAKE_PLOTS, \
3636
REPORT_USER_WARNINGS
3737
from interactions import corotating_spin_angular_frequency_binary, \
@@ -253,7 +253,7 @@ def main_developer(stars, bins, correct_params, stellar_code, secular_code,
253253
#-----
254254

255255
#-----
256-
#for running triple.py from the commandline
256+
#for running TRES.py from the commandline
257257
def parse_arguments():
258258
from amuse.units.optparse import OptionParser
259259
parser = OptionParser()
@@ -458,7 +458,7 @@ def parse_arguments():
458458

459459

460460

461-
if REPORT_TRIPLE_EVOLUTION:
461+
if REPORT_EVOLUTION:
462462
print('Simulation has finished succesfully')
463463

464464
print('\nYou have used the TRES triple evolution code. Literature reference:')

‎TRES_options.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
REPORT_DEBUG = False
88
REPORT_DT = False
99
REPORT_SN_EVOLUTION = False
10-
REPORT_TRIPLE_EVOLUTION = False
10+
REPORT_EVOLUTION = False
1111
MAKE_PLOTS = False
1212

1313
REPORT_BINARY_EVOLUTION = False

‎triple_class.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# from tres_options import REPORT_USER_WARNINGS, \
1717
# GET_GYRATION_RADIUS_FROM_STELLAR_CODE, \
1818
# GET_AMC_FROM_STELLAR_CODE, \
19-
# REPORT_TRIPLE_EVOLUTION, \
19+
# REPORT_EVOLUTION, \
2020
# REPORT_DEBUG, \
2121
# MAKE_PLOTS, \
2222
# REPORT_DT, \
@@ -890,7 +890,7 @@ def check_RLOF(self):
890890
elif self.is_binary():
891891
Rl1 = roche_radius(self, self.child1)
892892
Rl2 = roche_radius(self, self.child2)
893-
if REPORT_TRIPLE_EVOLUTION:
893+
if REPORT_EVOLUTION:
894894
print("Roche lobe radii:", Rl1, Rl2)
895895
print(
896896
"Stellar radii:",
@@ -915,7 +915,7 @@ def check_RLOF(self):
915915

916916
Rl1 = roche_radius(bin, bin.child1, self)
917917
Rl2 = roche_radius(bin, bin.child2, self)
918-
if REPORT_TRIPLE_EVOLUTION:
918+
if REPORT_EVOLUTION:
919919
print("Roche lobe radii:", Rl1, Rl2)
920920
print("Stellar radii:", bin.child1.radius, bin.child2.radius)
921921

@@ -938,7 +938,7 @@ def check_RLOF(self):
938938
# assumping secular code always returns inner binary first
939939
Rl1, Rl2, Rl3 = self.secular_code.give_roche_radii(self.triple)
940940

941-
if REPORT_TRIPLE_EVOLUTION:
941+
if REPORT_EVOLUTION:
942942
print("Roche lobe radii:", Rl1, Rl2, Rl3)
943943
print("Stellar radii:", bin.child1.radius, bin.child2.radius, star.radius)
944944
print(
@@ -989,7 +989,7 @@ def check_OLOF(self):
989989
elif self.is_binary():
990990
Rl2_1 = L2_radius(self, self.child1)
991991
Rl2_2 = L2_radius(self, self.child2)
992-
if REPORT_TRIPLE_EVOLUTION:
992+
if REPORT_EVOLUTION:
993993
print("L2 lobe radii:", Rl2_1, Rl2_2)
994994
print(
995995
"Stellar radii:",
@@ -1025,7 +1025,7 @@ def check_OLOF(self):
10251025
if bin.child2.radius >= Rl2_2 - (1.0 * small_numerical_error | units.RSun):
10261026
bin.child2.is_OLOF_donor = True
10271027

1028-
if REPORT_TRIPLE_EVOLUTION:
1028+
if REPORT_EVOLUTION:
10291029
print("L2 lobe radii:", Rl2_1, Rl2_2)
10301030
print("Stellar radii:", bin.child1.radius, bin.child2.radius)
10311031
print("Masses:", bin.child1.mass, bin.child2.mass, star.mass)
@@ -1675,7 +1675,7 @@ def determine_time_step(self):
16751675
# if self.has_donor():
16761676
# print(time_step, self.determine_time_step_stable_mt())
16771677
# time_step = min(time_step, self.determine_time_step_stable_mt())
1678-
# if REPORT_DT or REPORT_TRIPLE_EVOLUTION or REPORT_DEBUG:
1678+
# if REPORT_DT or REPORT_EVOLUTION or REPORT_DEBUG:
16791679
# print('donor time:', self.determine_time_step_stable_mt())
16801680

16811681
# tides - ADD ALSO DURING MT
@@ -2241,18 +2241,18 @@ def resolve_stellar_interaction(self, stellar_system=None):
22412241
stellar_system = self.triple
22422242

22432243
if stellar_system.is_star:
2244-
if REPORT_TRIPLE_EVOLUTION:
2244+
if REPORT_EVOLUTION:
22452245
print("single stellar evolution")
22462246
sys.exit("for now no single stellar evolution - exiting program")
22472247
return
22482248
elif self.is_binary(stellar_system):
2249-
if REPORT_TRIPLE_EVOLUTION:
2249+
if REPORT_EVOLUTION:
22502250
print("\n perform stellar interaction: binary")
22512251
# stellar_system = perform_stellar_interaction(stellar_system, self)
22522252
stopping_condition = perform_stellar_interaction(stellar_system, self)
22532253
return stopping_condition # stellar interaction
22542254
else:
2255-
if REPORT_TRIPLE_EVOLUTION:
2255+
if REPORT_EVOLUTION:
22562256
print("\n perform stellar interaction")
22572257

22582258
stopping_condition = perform_stellar_interaction(stellar_system, self)
@@ -2282,23 +2282,23 @@ def determine_mass_transfer_timescale(self, stellar_system=None):
22822282
stellar_system = self.triple
22832283

22842284
if stellar_system.is_star:
2285-
if REPORT_TRIPLE_EVOLUTION:
2285+
if REPORT_EVOLUTION:
22862286
print("single stellar evolution")
22872287
return
22882288
elif self.is_binary(stellar_system):
2289-
if REPORT_TRIPLE_EVOLUTION:
2289+
if REPORT_EVOLUTION:
22902290
print("\n determine_mass_transfer_timescale: binary - double star")
22912291
mass_transfer_stability(stellar_system, self)
2292-
if REPORT_TRIPLE_EVOLUTION:
2292+
if REPORT_EVOLUTION:
22932293
print("mt rate double star:", stellar_system.mass_transfer_rate)
22942294
else:
22952295
self.determine_mass_transfer_timescale(stellar_system.child1)
22962296
self.determine_mass_transfer_timescale(stellar_system.child2)
22972297

2298-
if REPORT_TRIPLE_EVOLUTION:
2298+
if REPORT_EVOLUTION:
22992299
print("\n determine_mass_transfer_timescale: binary")
23002300
mass_transfer_stability(stellar_system, self)
2301-
if REPORT_TRIPLE_EVOLUTION:
2301+
if REPORT_EVOLUTION:
23022302
print("mt rate binary:", stellar_system.mass_transfer_rate)
23032303

23042304
def solve_for_partial_time_step_stable_mass_transfer(self):
@@ -2434,7 +2434,7 @@ def rewind_to_begin_of_rlof_stellar(self, dt):
24342434

24352435
self.stellar_code.particles.recall_memory_one_step()
24362436
self.triple.time += dt_new - dt_old
2437-
if REPORT_TRIPLE_EVOLUTION or REPORT_DEBUG:
2437+
if REPORT_EVOLUTION or REPORT_DEBUG:
24382438
print("\n\ntime:", self.triple.time, self.has_donor())
24392439
self.stellar_code.evolve_model(self.triple.time)
24402440
self.copy_from_stellar()
@@ -2461,11 +2461,11 @@ def rewind_to_begin_of_rlof_secular(self):
24612461

24622462
def check_stopping_conditions_stellar_interaction(self):
24632463
if self.stop_at_merger and self.has_merger():
2464-
if REPORT_TRIPLE_EVOLUTION:
2464+
if REPORT_EVOLUTION:
24652465
print("Merger at time = ", self.triple.time)
24662466
return False
24672467
if self.stop_at_disintegrated and self.has_disintegrated():
2468-
if REPORT_TRIPLE_EVOLUTION:
2468+
if REPORT_EVOLUTION:
24692469
print("Disintegration of system at time = ", self.triple.time)
24702470
return False
24712471
return True
@@ -2475,7 +2475,7 @@ def check_stopping_conditions_stellar_interaction(self):
24752475
# if self.secular_code.model_time < self.triple.time:
24762476
# self.triple.time = self.secular_code.model_time
24772477
#
2478-
# if REPORT_TRIPLE_EVOLUTION:
2478+
# if REPORT_EVOLUTION:
24792479
# print('Mass transfer in outer binary of triple at time = ',self.triple.time)
24802480
# self.triple.bin_type = bin_type['rlof']
24812481
#
@@ -2486,7 +2486,7 @@ def check_stopping_conditions_stellar_interaction(self):
24862486
# if self.secular_code.model_time < self.triple.time:
24872487
# self.triple.time = self.secular_code.model_time
24882488
#
2489-
# if REPORT_TRIPLE_EVOLUTION:
2489+
# if REPORT_EVOLUTION:
24902490
# print('Mass transfer at time = ',self.triple.time)
24912491
# if self.is_binary(self.triple.child2):
24922492
# self.triple.child2.bin_type = bin_type['rlof']
@@ -2513,7 +2513,7 @@ def check_stopping_conditions_stellar(self, stellar_system=None):
25132513
if self.secular_code.model_time < self.triple.time:
25142514
self.triple.time = self.secular_code.model_time
25152515

2516-
if REPORT_TRIPLE_EVOLUTION:
2516+
if REPORT_EVOLUTION:
25172517
print(
25182518
"Mass transfer in outer binary of triple at time = ",
25192519
self.triple.time,
@@ -2550,7 +2550,7 @@ def check_stopping_conditions_stellar(self, stellar_system=None):
25502550
)
25512551
):
25522552

2553-
if REPORT_TRIPLE_EVOLUTION:
2553+
if REPORT_EVOLUTION:
25542554
print("Mass transfer in inner binary at time = ", self.triple.time)
25552555
print(
25562556
self.stop_at_mass_transfer,
@@ -2581,28 +2581,28 @@ def check_stopping_conditions(self):
25812581
if self.secular_code.model_time < self.triple.time:
25822582
self.triple.time = self.secular_code.model_time
25832583
self.set_bintype_to_dynamical_instability()
2584-
if REPORT_TRIPLE_EVOLUTION:
2584+
if REPORT_EVOLUTION:
25852585
print("Dynamical instability at time = ", self.triple.time)
25862586
return False
25872587
if self.stop_at_inner_collision and self.triple.inner_collision == True:
25882588
if self.secular_code.model_time < self.triple.time:
25892589
self.triple.time = self.secular_code.model_time
25902590
self.triple.child2.bin_type = bin_type["collision"]
2591-
if REPORT_TRIPLE_EVOLUTION:
2591+
if REPORT_EVOLUTION:
25922592
print("Inner collision at time = ", self.triple.time)
25932593
return False
25942594
if self.stop_at_outer_collision and self.triple.outer_collision == True:
25952595
if self.secular_code.model_time < self.triple.time:
25962596
self.triple.time = self.secular_code.model_time
25972597
self.triple.bin_type = bin_type["collision"]
2598-
if REPORT_TRIPLE_EVOLUTION:
2598+
if REPORT_EVOLUTION:
25992599
print("Outer collision at time = ", self.triple.time)
26002600
return False
26012601
if self.stop_at_semisecular_regime and self.triple.semisecular_regime == True:
26022602
if self.secular_code.model_time < self.triple.time:
26032603
self.triple.time = self.secular_code.model_time
26042604
self.triple.bin_type = bin_type["semisecular"]
2605-
if REPORT_TRIPLE_EVOLUTION:
2605+
if REPORT_EVOLUTION:
26062606
print("Semisecular regime at time = ", self.triple.time)
26072607
return False
26082608
if self.triple.time - self.secular_code.model_time > numerical_error | units.Myr:
@@ -2641,7 +2641,7 @@ def check_spin_angular_frequency(self, stellar_system=None):
26412641

26422642
def check_error_flag_secular(self):
26432643
if self.triple.error_flag_secular < 0:
2644-
if REPORT_TRIPLE_EVOLUTION:
2644+
if REPORT_EVOLUTION:
26452645
print("Error in secular code at time = ", self.triple.time)
26462646
print(self.triple.error_flag_secular)
26472647
return False
@@ -2717,7 +2717,7 @@ def evolve_model(self, tend):
27172717
include_inner_RLOF_term_initial = self.secular_code.parameters.include_inner_RLOF_terms
27182718
include_outer_RLOF_term_initial = self.secular_code.parameters.include_outer_RLOF_terms
27192719

2720-
if REPORT_TRIPLE_EVOLUTION or REPORT_DEBUG:
2720+
if REPORT_EVOLUTION or REPORT_DEBUG:
27212721
print(
27222722
"kozai timescale:",
27232723
self.kozai_timescale(),
@@ -2728,7 +2728,7 @@ def evolve_model(self, tend):
27282728
self.determine_mass_transfer_timescale()
27292729
self.save_snapshot()
27302730
while self.triple.time < self.tend:
2731-
if REPORT_TRIPLE_EVOLUTION or REPORT_DEBUG:
2731+
if REPORT_EVOLUTION or REPORT_DEBUG:
27322732
print(
27332733
"\n\n kozai timescale:",
27342734
self.kozai_timescale(),
@@ -2802,7 +2802,7 @@ def evolve_model(self, tend):
28022802

28032803
# if SN has taken place
28042804
if self.has_stellar_type_changed_into_SN_remnant():
2805-
if REPORT_TRIPLE_EVOLUTION:
2805+
if REPORT_EVOLUTION:
28062806
print("Supernova at time = ", self.triple.time, dt)
28072807
if self.adjust_system_after_supernova_kick() == False:
28082808
break

0 commit comments

Comments
 (0)