introduce q in history

Author: matthiasfabry

binary/defaults/binary_history_columns.list

@@ -72,6 +72,8 @@
       star_2_mass ! mass of second star in msun
       !lg_star_2_mass ! log10 mass of second star in msun
       !sum_of_masses ! star_1_mass + star_2_mass
+      !mass_ratio ! star_2_mass / star_1_mass
+      !obs_mass_ratio ! min(m2/m1, m2/m1)
       lg_mtransfer_rate ! log10 of abs(mass transfer rate) in Msun/yr
                      ! this considers the amount of mass lost from the donor due to RLOF
                      ! not the actual mass that ends up accreted

binary/private/binary_history.f90

@@ -595,6 +595,10 @@ subroutine binary_history_getval(b, c, val, int_val, is_int_val, ierr)
          val = safe_log10(b% m(2) / Msun)
       case(bh_sum_of_masses)
          val = (b% m(1) + b% m(2)) / Msun
+      case(bh_mass_ratio)
+         val = b% m(2) / b% m(1)
+      case(bh_obs_mass_ratio)
+         val = min(b% m(2) / b% m(1), b% m(1) / b% m(2))
       case(bh_lg_mtransfer_rate)
          val = safe_log10(abs(b% step_mtransfer_rate) / Msun * secyer)
       case(bh_lg_mstar_dot_1)

binary/private/binary_private_def.f90

@@ -57,7 +57,9 @@ module binary_private_def
       integer, parameter :: bh_star_2_mass = bh_lg_star_1_mass + 1
       integer, parameter :: bh_lg_star_2_mass = bh_star_2_mass + 1
       integer, parameter :: bh_sum_of_masses = bh_lg_star_2_mass + 1
-      integer, parameter :: bh_lg_mtransfer_rate = bh_sum_of_masses + 1
+      integer, parameter :: bh_mass_ratio = bh_sum_of_masses + 1
+      integer, parameter :: bh_obs_mass_ratio = bh_mass_ratio + 1
+      integer, parameter :: bh_lg_mtransfer_rate = bh_obs_mass_ratio + 1
       integer, parameter :: bh_lg_mstar_dot_1 = bh_lg_mtransfer_rate + 1
       integer, parameter :: bh_lg_mstar_dot_2 = bh_lg_mstar_dot_1 + 1
       integer, parameter :: bh_lg_system_mdot_1 = bh_lg_mstar_dot_2 + 1