Skip to content

Commit

Permalink
Correct two incorrect binary type indices saved in the bpp array and …
Browse files Browse the repository at this point in the history
…binary type change files; Fix the conflicts of names for the executable files in configure script
  • Loading branch information
lwang-astro committed Aug 22, 2024
1 parent 49d80fd commit 2ccf53c
Show file tree
Hide file tree
Showing 10 changed files with 2,387 additions and 3,056 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1239
1241
6 changes: 3 additions & 3 deletions bse-interface/bse/README_NEW
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Modification Log for PeTar (Long Wang)
In evolve2.f, vkick has 8 members, first and second 4 members are for the first and secondary components, respectively.
2. Array for saving data COMMON block cannot be used, i.e., scm, spp, bcm arrays are removed.
Direct writing in data file (10) is used instead. The output interval is controlled by the argument, dtp.
bpp array now is an argument in evolve2 to store the event information, the array size is fixed to (9,10).
The stellar type of bpp is modified compare to the original value. The definition is shown in bse.f and bse_interface.h:binary_type.
the bpp array now is an argument in evolve2 to store the event information, the array size is fixed to (9,20). More information is saved in the bpp array since bcm array is removed.
The definition of binary type indices stored in the bpp(*,10) is modified. The new definition is shown in bse.f and bse_interface.h:binary_type.
3. The common block value mxns is moved from /value1/ to /value4/.
The common block /value1/ is removed in hrdiag.f to avoid neta rewritting bug.
Corresponding changes are also made in evolv1/2.f, mix.f
Expand All @@ -17,7 +17,7 @@ Modification Log for PeTar (Long Wang)
7. trflow.f is added to calculate the next evolve time for Roche overflow binary (import from NBODY6++)
8. The yeardy, aursun in evolv2.f, trflow.f, popbin.f is updated to be consistent with the G value used in PeTar
9. When blue straggler flag (bss) is triggered, do not record start_roche event in evolv2.f to avoid huge output data
10. seperation to trigger GW effect is changed in evolv2.f (now it is 'sep.gt.0')
10. The seperation to trigger GW effect is changed in evolv2.f (now it is 'sep.gt.0')

Bug fix:
1. DANGER2 is printed sometimes if the stellar type is 13 (Tanikawa)
Expand Down
9 changes: 5 additions & 4 deletions bse-interface/bse/evolv2.f
Original file line number Diff line number Diff line change
Expand Up @@ -2426,7 +2426,8 @@ SUBROUTINE evolv2(kstar,mass0,mass,rad,lumin,massc,radc,
rrl2 = MIN(rrl2,0.99d0)
bpp(jp,8) = rrl1
bpp(jp,9) = rrl2
bpp(jp,10) = 7.0
* bpp(jp,10) = 7.0
bpp(jp,10) = 8.0
* btype = 8
bpp(jp,11) = lumin(1)
bpp(jp,12) = lumin(2)
Expand Down Expand Up @@ -2619,9 +2620,9 @@ SUBROUTINE evolv2(kstar,mass0,mass,rad,lumin,massc,radc,
bpp(jp,7) = zero
bpp(jp,8) = zero
bpp(jp,9) = zero
* bpp(jp,10) = 11.0
bpp(jp,10) = 13.0
* btype = 13
* bpp(jp,10) = 9.0
bpp(jp,10) = 12.0
* btype = 12
else
bpp(jp,10) = -1.0
endif
Expand Down
9 changes: 5 additions & 4 deletions bse-interface/bseEmp/evolv2.f
Original file line number Diff line number Diff line change
Expand Up @@ -2437,7 +2437,8 @@ SUBROUTINE evolv2(kstar,mass0,mass,rad,lumin,massc,radc,
rrl2 = MIN(rrl2,0.99d0)
bpp(jp,8) = rrl1
bpp(jp,9) = rrl2
bpp(jp,10) = 7.0
* bpp(jp,10) = 7.0
bpp(jp,10) = 8.0
* btype = 8
endif
epoch(1) = tphys - aj(1)
Expand Down Expand Up @@ -2564,9 +2565,9 @@ SUBROUTINE evolv2(kstar,mass0,mass,rad,lumin,massc,radc,
bpp(jp,7) = zero
bpp(jp,8) = zero
bpp(jp,9) = ngtv2
* bpp(jp,10) = 11.0
bpp(jp,10) = 13.0
* btype = 13
* bpp(jp,10) = 9.0
bpp(jp,10) = 12.0
* btype = 12
else
bpp(jp,6) = sep
bpp(jp,7) = ecc
Expand Down
6 changes: 5 additions & 1 deletion bse-interface/bse_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,11 @@ class BSEManager{
//}

bool isMerger(const int _binary_type) {
return (_binary_type>=10&&_binary_type<=12);
return (_binary_type>=10&&_binary_type<12);
}

bool isNoRemnant(const int _binary_type) {
return (_binary_type==12);
}

bool isDisrupt(const int _binary_type) {
Expand Down
9 changes: 5 additions & 4 deletions bse-interface/mobse/evolv2.f
Original file line number Diff line number Diff line change
Expand Up @@ -2390,7 +2390,8 @@ SUBROUTINE evolv2(kstar,mass0,mass,rad,lumin,massc,radc,
rrl2 = MIN(rrl2,0.99d0)
bpp(jp,8) = rrl1
bpp(jp,9) = rrl2
bpp(jp,10) = 7.0
* bpp(jp,10) = 7.0
bpp(jp,10) = 8.0
* btype = 8
endif
epoch(1) = tphys - aj(1)
Expand Down Expand Up @@ -2521,9 +2522,9 @@ SUBROUTINE evolv2(kstar,mass0,mass,rad,lumin,massc,radc,
bpp(jp,7) = zero
bpp(jp,8) = zero
bpp(jp,9) = ngtv2
* bpp(jp,10) = 11.0
bpp(jp,10) = 13.0
* btype = 13
* bpp(jp,10) = 9.0
bpp(jp,10) = 12.0
* btype = 12
else
bpp(jp,6) = sep
bpp(jp,7) = ecc
Expand Down
Loading

0 comments on commit 2ccf53c

Please sign in to comment.