Skip to content

Update SeBa version #1117

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 3 commits into from
Feb 11, 2025
Merged

Update SeBa version #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc02893
Update SeBa version in download.py
cournoyercloutierc Jan 30, 2025
ba29596
Use std::map in interface.cc to prevent error from SeBa commit 382b590
cournoyercloutierc Feb 11, 2025
03b03b8
Merge branch 'amusecode:main' into main
cournoyercloutierc Feb 11, 2025
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
2 changes: 1 addition & 1 deletion src/amuse/community/seba/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def new_option_parser():
result = OptionParser()
result.add_option(
"--seba-version",
default='94e9b1d6ba1466d288a12e3afaa1eba5bca6ddca',
default='2d8088ad03a4323514780e19e5895fbcac42e0ec',
dest="seba_version",
help="SeBa commit hash to download",
type="string"
Expand Down
13 changes: 8 additions & 5 deletions src/amuse/community/seba/interface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
// AMUSE STOPPING CONDITIONS SUPPORT
#include <stopcond.h>

// Get std::xxx to match SeBa commit 382b590
// #include <stdinc.h>

#include <map>

static node * seba_root = 0;
static node * seba_insertion_point = 0;
static int next_seba_id = 1;
static map<int, nodeptr> mapping_from_id_to_node;
static std::map<int, nodeptr> mapping_from_id_to_node;
static double seba_metallicity = 0.02;
static double seba_time = 0.0;
static stellar_type start_type = Main_Sequence;
Expand Down Expand Up @@ -505,7 +508,7 @@ int new_advanced_particle(int * index_of_the_star, double mass, double relative

int delete_star(int index_of_the_star){

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

node * get_seba_node_from_index(int index_of_the_star, int * errorcode)
{
map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
std::map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
if(i == mapping_from_id_to_node.end()) {
*errorcode = -1;
return 0;
Expand Down Expand Up @@ -929,7 +932,7 @@ int new_binary(

int delete_binary(int index_of_the_star){

map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
std::map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
if(i == mapping_from_id_to_node.end()) {
return -1;
} else {
Expand Down Expand Up @@ -997,7 +1000,7 @@ int get_children_of_binary(

*child1_index = -1;
*child2_index = -1;
map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
std::map<int, nodeptr>::iterator i = mapping_from_id_to_node.find(index_of_the_star);
if(i == mapping_from_id_to_node.end()) {
return -1;
} else {
Expand Down
Loading