fix tests and remove SSEDict from setreff for now

Author: katiebreivik

src/cosmic/evolve.py

@@ -246,11 +246,11 @@ def evolve(cls, initialbinarytable, pool=None, **kwargs):
         # in order to verify that the values in the table
         # are valid
         utils.error_check(BSEDict, SSEDict)
-
+        
         # check the initial conditions of the system and warn user if
         # anything is weird about them, such as the star starts
         # in Roche Lobe overflow
-        utils.check_initial_conditions(initialbinarytable,SSEDict)
+        utils.check_initial_conditions(initialbinarytable)
 
         # assign some columns based on keyword arguments but that
         # can be overwritten by the params or BSEDict
@@ -372,6 +372,7 @@ def evolve(cls, initialbinarytable, pool=None, **kwargs):
 
         if (pd.Series(ACCLIM_COLUMNS).isin(initialbinarytable.keys()).all()) and ('acc_lim' not in BSEDict):
             initialbinarytable = initialbinarytable.assign(acc_lim=initialbinarytable[ACCLIM_COLUMNS].values.tolist())
+
 
         # need to ensure that the order of parameters that we pass to BSE
         # is correct

src/cosmic/sample/sampler/independent.py

@@ -123,6 +123,9 @@ def get_independent_sampler(
     met : `float`
         Sets the metallicity of the binary population where solar metallicity is zsun
 
+    SSEDict: `Dict`
+        Sets the engine to use for individual stellar evolution
+
     size : `int`
         Size of the population to sample
 
@@ -287,8 +290,8 @@ def get_independent_sampler(
 
     zsun = kwargs.pop("zsun", 0.02)
 
-    rad1 = initconditions.set_reff(SSEDict, mass1_binary, metallicity=met, zsun=zsun)
-    rad2 = initconditions.set_reff(SSEDict, mass2_binary, metallicity=met, zsun=zsun)
+    rad1 = initconditions.set_reff(mass1_binary, metallicity=met, zsun=zsun, SSEDict=SSEDict)
+    rad2 = initconditions.set_reff(mass2_binary, metallicity=met, zsun=zsun, SSEDict=SSEDict)
 
     # sample periods and eccentricities
     # if the porb_model is moe19, the metallicity needs to be supplied
@@ -1075,7 +1078,7 @@ def set_kstar(self, mass):
 
         return kstar
 
-    def set_reff(self, SSEDict ,mass, metallicity, zsun=0.02):
+    def set_reff(self ,mass, metallicity, zsun=0.02, SSEDict=None):
         """
         Better way to set the radii from BSE, by calling it directly
 

src/cosmic/tests/test_sample.py

@@ -236,6 +236,7 @@ def test_sample_porb(self):
         mass2 = SAMPLECLASS.sample_secondary(primary_mass = mass1, qmin=0.1)
         rad1 = SAMPLECLASS.set_reff(mass=mass1, metallicity=0.02)
         rad2 = SAMPLECLASS.set_reff(mass=mass2, metallicity=0.02)
+        print(rad1,rad2)
         porb,aRL_over_a = SAMPLECLASS.sample_porb(
             mass1, mass2, rad1, rad2, 'sana12', size=mass1.size
         )

src/cosmic/tests/test_utils.py

@@ -144,14 +144,15 @@ def test_binwidth_selector(self):
         self.assertTrue(bw.round(3) == BW_KNUTH)
 
     def test_error_check(self):
-        BSEDict = {'xi': 0.5, 'bhflag': 1, 'neta': 0.5, 'windflag': 3, 'rtmsflag' : 0, 'wdflag': 0, 'alpha1': 1.0, 'pts1': 0.05, 'pts3': 0.02, 'pts2': 0.01, 'epsnov': 0.001, 'hewind': 1.0, 'ck': 1000, 'bwind': 0.0, 'lambdaf': 0.5, 'mxns': 3.0, 'beta': -1.0, 'tflag': 1, 'acc2': 1.5, 'nsflag': 4, 'ceflag': 0, 'eddfac': 1.0, 'ifflag': 0, 'bconst': 3000, 'sigma': 265.0, 'gamma': -2.0, 'pisn': 45.0, 'natal_kick_array' :[[-100.0,-100.0,-100.0,-100.0,0.0], [-100.0,-100.0,-100.0,-100.0,0.0]], 'bhsigmafrac' : 1.0, 'polar_kick_angle' : 90, 'qcrit_array' : [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0], 'cekickflag' : 2, 'cehestarflag' : 0, 'cemergeflag' : 0, 'ecsn' : 2.5, 'ecsn_mlow' : 1.4, 'aic' : 1, 'ussn' : 0, 'sigmadiv' :-20.0, 'qcflag' : 3, 'eddlimflag' : 0, 'fprimc_array' : [2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0], 'rembar_massloss' : 0.5, 'zsun' : 0.02, 'kickflag' : 0, 'grflag' : 1, 'acc_lim' : -1, 'don_lim' : -1}
+        BSEDict = {'xi': 0.5, 'bhflag': 1, 'neta': 0.5, 'windflag': 3, 'rtmsflag' : 0, 'wdflag': 0, 'alpha1': [1.0, 1.0], 'pts1': 0.05, 'pts3': 0.02, 'pts2': 0.01, 'epsnov': 0.001, 'hewind': 1.0, 'ck': 1000, 'bwind': 0.0, 'lambdaf': 0.5, 'mxns': 3.0, 'beta': -1.0, 'tflag': 1, 'acc2': 1.5, 'nsflag': 4, 'ceflag': 0, 'eddfac': 1.0, 'ifflag': 0, 'bconst': 3000, 'sigma': 265.0, 'gamma': -2.0, 'pisn': 45.0, 'natal_kick_array' :[[-100.0,-100.0,-100.0,-100.0,0.0], [-100.0,-100.0,-100.0,-100.0,0.0]], 'bhsigmafrac' : 1.0, 'polar_kick_angle' : 90, 'qcrit_array' : [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0], 'cekickflag' : 2, 'cehestarflag' : 0, 'cemergeflag' : 0, 'ecsn' : 2.5, 'ecsn_mlow' : 1.4, 'aic' : 1, 'ussn' : 0, 'sigmadiv' :-20.0, 'qcflag' : 3, 'eddlimflag' : 0, 'fprimc_array' : [2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0], 'rembar_massloss' : 0.5, 'zsun' : 0.02, 'kickflag' : 0, 'grflag' : 1, 'acc_lim' : [-1, -1], 'don_lim' : -1}
+        SSEDict = {'stellar_engine': 'sse'}
         filters = {'binary_state': [0], 'timestep_conditions' : 'dtp=None'}
         convergence = {'convergence_params': ['mass_1', 'mass_2', 'sep', 'ecc'], 'pop_select': 'formation',\
                        'match': -5.0, 'convergence_limits' : {"sep" : [0,1000]}, 'match' : -3.0,\
                        'apply_convergence_limits' : True}
         sampling = {'sampling_method': 'multidim', 'SF_start': '13700.0', 'SF_duration' : 0.0, 'metallicity': 0.02, 'keep_singles': False}
-        utils.error_check(BSEDict,filters,convergence,sampling)
-        utils.error_check(BSEDict)
+        utils.error_check(BSEDict,SSEDict,filters,convergence,sampling)
+        utils.error_check(BSEDict,SSEDict)
         assert 1==1
 
     def test_warning_check(self):
@@ -160,7 +161,7 @@ def test_warning_check(self):
 
     def test_no_RL_check_for_singles(self):
         """Make sure you don't get a divide by zero error when checking for Roche Lobe Overflow"""
-        BSEDict = {'xi': 1.0, 'bhflag': 1, 'neta': 0.5, 'windflag': 3, 'wdflag': 1, 'alpha1': 1.0,
+        BSEDict = {'xi': 1.0, 'bhflag': 1, 'neta': 0.5, 'windflag': 3, 'wdflag': 1, 'alpha1': [1.0,1.0],
                    'pts1': 0.001, 'pts3': 0.02, 'pts2': 0.01, 'epsnov': 0.001, 'hewind': 0.5,
                    'ck': 1000, 'bwind': 0.0, 'lambdaf': 0.0, 'mxns': 3.0, 'beta': -1.0, 'tflag': 1,
                    'acc2': 1.5, 'grflag': 1, 'remnantflag': 4, 'ceflag': 0, 'eddfac': 1.0,
@@ -177,8 +178,10 @@ def test_no_RL_check_for_singles(self):
                                                      2.0/21.0, 2.0/21.0, 2.0/21.0, 2.0/21.0],
                    'bhspinflag': 0, 'bhspinmag': 0.0, 'rejuv_fac': 1.0, 'rejuvflag': 0, 'htpmb': 1,
                    'ST_cr': 1, 'ST_tide': 1, 'bdecayfac': 1, 'rembar_massloss': 0.5, 'kickflag': 0,
-                   'zsun': 0.014, 'bhms_coll_flag': 0, 'don_lim': -1, 'acc_lim': -1,
+                   'zsun': 0.014, 'bhms_coll_flag': 0, 'don_lim': -1, 'acc_lim': [-1,-1],
                    'rtmsflag': 0, 'wd_mass_lim': 1}
+        
+        SSEDict = {'stellar_engine': 'sse'}
 
         initial_binaries = InitialBinaryTable.sampler('independent', np.linspace(0, 15, 16), np.linspace(0, 15, 16),
                                                     binfrac_model=0.5, SF_start=10.0,
@@ -188,7 +191,7 @@ def test_no_RL_check_for_singles(self):
 
         with warnings.catch_warnings():
             warnings.simplefilter("error")
-            Evolve.evolve(initialbinarytable=initial_binaries, BSEDict=BSEDict)
+            Evolve.evolve(initialbinarytable=initial_binaries, BSEDict=BSEDict, SSEDict=SSEDict)
 
     def test_convert_kstar_evol_type(self):
         # convert to string

src/cosmic/utils.py

@@ -930,7 +930,7 @@ def error_check(BSEDict, SSEDict, filters=None, convergence=None, sampling=None)
 
     if not isinstance(SSEDict, dict):
         raise ValueError("SSE flags must be supplied via a dictionary")
-        
+    
     if filters is not None:
         if not isinstance(filters, dict):
             raise ValueError("Filters criteria must be supplied via a dictionary")
@@ -1604,13 +1604,13 @@ def error_check(BSEDict, SSEDict, filters=None, convergence=None, sampling=None)
     return
 
 
-def check_initial_conditions(full_initial_binary_table, SSEDict):
+def check_initial_conditions(full_initial_binary_table):
     """Checks initial conditions and reports warnings
 
     Only warning provided right now is if star begins in Roche lobe
     overflow
     """
-    from cosmic import _evolvebin
+    #from cosmic import _evolvebin
 
     def rzamsf(m):
         """A function to evaluate Rzams
@@ -1638,20 +1638,10 @@ def rzamsf(m):
 
     if np.all(mass2 == 0.0):
         return
-    elif (SSEDict["stellar_engine"] == "sse"):
+    else:
         rzams1 = rzamsf(mass1)
         rzams2 = rzamsf(mass2)
 
-#        TODO: the following section with METISSE is incomplete
-#    elif (SSEDict["stellar_engine"] == "metisse"):
-#        _evolvebin.se_flags.using_sse = False
-#        _evolvebin.se_flags.using_metisse = True
-#        path_to_tracks = SSEDict["path_to_tracks"]
-#        path_to_he_tracks = SSEDict["path_to_he_tracks"]
-        
-#        rzams1 = _evolvebin.compute_r(mass1,z,len(mass1),path_to_tracks,path_to_he_tracks)
-#        rzams1 = _evolvebin.compute_r(mass2,z,len(mass2),path_to_tracks,path_to_he_tracks)
-        
         # assume some time step in order to calculate sep
         yeardy = 365.24
         aursun = 214.95