Skip to content

Commit b5b444e

Browse files
Update SeBa version (#1117)
1 parent 716fae6 commit b5b444e

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/amuse/community/seba/download.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def new_option_parser():
9393
result = OptionParser()
9494
result.add_option(
9595
"--seba-version",
96-
default='94e9b1d6ba1466d288a12e3afaa1eba5bca6ddca',
96+
default='2d8088ad03a4323514780e19e5895fbcac42e0ec',
9797
dest="seba_version",
9898
help="SeBa commit hash to download",
9999
type="string"

src/amuse/community/seba/interface.cc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
// AMUSE STOPPING CONDITIONS SUPPORT
77
#include <stopcond.h>
88

9+
// Get std::xxx to match SeBa commit 382b590
10+
// #include <stdinc.h>
11+
912
#include <map>
1013

1114
static node * seba_root = 0;
1215
static node * seba_insertion_point = 0;
1316
static int next_seba_id = 1;
14-
static map<int, nodeptr> mapping_from_id_to_node;
17+
static std::map<int, nodeptr> mapping_from_id_to_node;
1518
static double seba_metallicity = 0.02;
1619
static double seba_time = 0.0;
1720
static stellar_type start_type = Main_Sequence;
@@ -505,7 +508,7 @@ int new_advanced_particle(int * index_of_the_star, double mass, double relative
505508

506509
int delete_star(int index_of_the_star){
507510

508-
map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
511+
std::map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
509512
if(i == mapping_from_id_to_node.end()) {
510513
return -1;
511514
} else {
@@ -531,7 +534,7 @@ int recommit_particles(){
531534

532535
node * get_seba_node_from_index(int index_of_the_star, int * errorcode)
533536
{
534-
map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
537+
std::map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
535538
if(i == mapping_from_id_to_node.end()) {
536539
*errorcode = -1;
537540
return 0;
@@ -929,7 +932,7 @@ int new_binary(
929932

930933
int delete_binary(int index_of_the_star){
931934

932-
map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
935+
std::map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
933936
if(i == mapping_from_id_to_node.end()) {
934937
return -1;
935938
} else {
@@ -997,7 +1000,7 @@ int get_children_of_binary(
9971000

9981001
*child1_index = -1;
9991002
*child2_index = -1;
1000-
map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
1003+
std::map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
10011004
if(i == mapping_from_id_to_node.end()) {
10021005
return -1;
10031006
} else {

0 commit comments

Comments
 (0)