Skip to content

Commit 21a7390

Browse files
authored
Merge pull request #36 from silviatoonen/main
removing print statement
2 parents 826e132 + 2af1ad8 commit 21a7390

1 file changed

Lines changed: 17 additions & 18 deletions

File tree

sstar/init/add_star.C

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
// addstar -- for all particles, add a star part using "new star()".
5050
//-----------------------------------------------------------------------------
5151

52-
void addstar(node * b, real t_current, stellar_type type, real z,int id,
53-
bool verbose, stellar_type type2, real m_rel, real m_env,
52+
void addstar(node * b, real t_current, stellar_type type, real z,int id,
53+
bool verbose, stellar_type type2, real m_rel, real m_env,
5454
real m_core, real mco_core, real t_rel)
5555

56-
{
56+
{
5757
// if(!((star*)b->get_starbase())->get_seba_counters()) {
5858
// cerr << "Initialize SeBa counters" << endl;
5959
// ((star*)b->get_starbase())->set_seba_counters(new seba_counters);
@@ -64,25 +64,25 @@ void addstar(node * b, real t_current, stellar_type type, real z,int id,
6464
real m_av = 0;
6565
int n_star = 0;
6666

67-
bool first_encounter = true;
68-
for_all_daughters(node, b, bi) {
67+
bool first_encounter = true;
68+
for_all_daughters(node, b, bi) {
6969
if (first_encounter){
7070
addstar(bi, t_current, type, z, id, verbose, type2);
7171
first_encounter = false;
7272
}
7373
else
7474
addstar(bi, t_current, type2, z, id, verbose, type2);
75-
75+
7676
if (verbose) {
7777
real m = bi->get_starbase()
7878
->conv_m_dyn_to_star(bi->get_mass());
7979
m_min = Starlab::min(m_min, m);
8080
m_max = Starlab::max(m_max, m);
8181
m_av += m;
82-
n_star++;
82+
n_star++;
8383
}
8484
}
85-
if (verbose) {
85+
if (verbose) {
8686
if (n_star > 0) m_av /= n_star;
8787
// PRC(n_star); PRC(m_min); PRC(m_max); PRL(m_av);
8888
}
@@ -113,7 +113,6 @@ void addstar(node * b, real t_current, stellar_type type, real z,int id,
113113
// Jan 22025 code:
114114
// stellar_type local_type = type;
115115
// Febr 2025 code:
116-
cout <<"stellar type in add_star:"<< type << endl;
117116
stellar_type local_type = type;
118117
if (type == Main_Sequence) {
119118
local_type = NAS;
@@ -148,7 +147,7 @@ void addstar(node * b, real t_current, stellar_type type, real z,int id,
148147

149148
//new_star->set_current_time(t_current); // added (SPZ:2/1998)
150149
//new_star->dump(cerr);
151-
150+
152151
} else { // No star story present, or at least no
153152
// proper definition for a single star.
154153

@@ -181,29 +180,29 @@ void addstar(node * b, real t_current, stellar_type type, real z,int id,
181180
m_core = 0.01*m_tot;
182181
mco_core = 0;
183182
}
184-
183+
185184
single_star* new_star;
186185
switch(local_type) {
187186
case Helium_Dwarf:
188187
case Carbon_Dwarf:
189-
case Oxygen_Dwarf:
188+
case Oxygen_Dwarf:
190189
case Xray_Pulsar:
191190
case Radio_Pulsar:
192-
case Neutron_Star:
193-
case Black_Hole:
191+
case Neutron_Star:
192+
case Black_Hole:
194193
new_star = new_single_star(local_type, id, z,
195194
t_cur, t_rel,
196195
m_rel, m_tot, m_tot, m_tot,
197196
p_rot, b_fld, b);
198197
break;
199-
default:
198+
default:
200199
new_star = new_single_star(local_type, id, z,
201200
t_cur, t_rel,
202201
m_rel, m_tot, m_core, mco_core,
203202
p_rot, b_fld, b);
204203
break;
205-
}
206-
204+
}
205+
207206

208207
// single_star* new_star = new_single_star(local_type, id, z,
209208
// t_cur, t_rel,
@@ -419,7 +418,7 @@ main(int argc, char ** argv)
419418
}
420419
#endif
421420

422-
put_node(b);
421+
put_node(b);
423422
delete b;
424423
}
425424

0 commit comments

Comments
 (0)