Skip to content

Fix print statements and deprecated time.clock #762

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

Merged
rieder merged 2 commits into from
Dec 3, 2021
Merged

Fix print statements and deprecated time.clock #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af1c0bb
Fix print statements and deprecated time.clock
MichielsenM May 11, 2021
515b50b
Merge branch 'amusecode:main' into main
Jun 3, 2021
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
4 changes: 2 additions & 2 deletions examples/applications/test_HRdiagram_tracks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ def simulate_evolution_tracks(
# BHs and neutron stars would otherwise fall off the chart.
luminosity_at_time.append(luminosity_at_time[-1])
temperature_at_time.append(temperature_at_time[-1])
print " ... evolved model to t = " + \
str(star.age.as_quantity_in(units.Myr))
print(" ... evolved model to t = " + \
str(star.age.as_quantity_in(units.Myr)))
print(
"Star has now become a: ",
star.stellar_type,
Expand Down
2 changes: 1 addition & 1 deletion examples/applications/test_smallcluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def simulate_small_cluster(number_of_stars, end_time = 40 | units.Myr,

total_energy_at_t0 = gravity.kinetic_energy + gravity.potential_energy

print "evolving the model until t = " + str(end_time)
print("evolving the model until t = " + str(end_time))
while time < end_time:
time += 0.25 | units.Myr

Expand Down
2 changes: 1 addition & 1 deletion examples/applications/test_stellar_merger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def head_on_stellar_merger(
potential_energies = [] | units.J
thermal_energies = [] | units.J

print "Evolving to:", t_end
print("Evolving to:", t_end)
for time, i_step in [(i*t_end/n_steps, i) for i in range(1, n_steps+1)]:
hydro_legacy_code.evolve_model(time)
times.append(time)
Expand Down
4 changes: 2 additions & 2 deletions src/amuse/community/ph4/test_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import os
import random
import sys
import unittest
from time import clock as cputime
import unittest
from time import process_time as cputime
from time import time as wallclocktime

from amuse.community.ph4.interface import ph4 as grav
Expand Down