Skip to content

Commit

Permalink
Refactoring apr2024 (#1051)
Browse files Browse the repository at this point in the history
* don't allow SeBa to evolve back in time (would cause a stall)

* move from optparse to argparse
  • Loading branch information
rieder committed May 3, 2024
1 parent defdae2 commit b008016
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
4 changes: 4 additions & 0 deletions src/amuse/community/seba/interface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,10 @@ int get_number_of_particles(int * number_of_particles){
int evolve_system(double end_time) {
int n_steps = 1;
int n_steps_per_phase = 10;
// cannot evolve for a negative time
if (end_time < seba_time) {
return 0;
}
real delta_t = (end_time - seba_time)/((real)n_steps);
real out_time;
nodeptr bi;
Expand Down
25 changes: 14 additions & 11 deletions src/amuse/ext/solarsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,17 +324,20 @@ def new_solar_system(Julian_date=-1|units.day):
else:
return solar_system_in_time(Julian_date)

def new_option_parser():
from amuse.units.optparse import OptionParser
result = OptionParser()
result.add_option("-d", dest="Julian_date", unit=units.day,
type=float, default = 2438871.5|units.day,
help="julian date [%default]")
def new_argument_parser():
import argparse
result = argparse.ArgumentParser(
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
)
result.add_argument(
"-d", dest="Julian_date", unit=units.day,
type=units.day, default=2438871.5 | units.day,
help="julian date"
)
return result

if __name__ in ('__main__', '__plot__'):
o, arguments = new_option_parser().parse_args()
solar_system = new_solar_system(o.Julian_date)
print(solar_system)


if __name__ == '__main__':
arguments = new_argument_parser().parse_args()
solar_system = new_solar_system(arguments.Julian_date)
print(solar_system)

0 comments on commit b008016

Please sign in to comment.