removed conflicting stuff

*.so

*.pyc

binary_c_python_api.o

output/*

# Append root dir of this project to include functionality

sys.path.append(os.path.dirname(os.getcwd()))

import binary_c

<<<<<<< HEAD

=======

>>>>>>> 19cf329fcbd85a0dff06eaec60030d6bf3ebc0b0

from utils.defaults import physics_defaults

from utils.functions import create_arg_string

#!/usr/bin/python3

import os

import sys

# Append root dir of this project to include functionality

sys.path.append(os.path.dirname(os.getcwd()))

import binary_c

from utils.defaults import physics_defaults

from utils.functions import create_arg_string

def run_test_binary():

    m1 = 15.0 # Msun

    m2 = 14.0 # Msun

    separation = 0 # 0 = ignored, use period

    orbital_period = 4530.0 # days

    eccentricity = 0.0

    metallicity = 0.02

    max_evolution_time = 15000

    buffer = ""

    # argstring = "binary_c M_1 {0:g} M_2 {1:g} separation {2:g} orbital_period {3:g} eccentricity {4:g} metallicity {5:g} max_evolution_time {6:g}  ".format(m1,m2,separation,orbital_period,eccentricity,metallicity,max_evolution_time)

    argstring = f"binary_c M_1 {m1} M_2 {m2} separation {separation} orbital_period {orbital_period} eccentricity {eccentricity} metallicity {metallicity} max_evolution_time {max_evolution_time}"

    output = binary_c.run_binary(argstring)

    # print ("Binary_c output:\n\n")

    print (output)

run_test_binary()

import argparse

class grid(object):

	def __init__(self, name):

		self.name = name

		self.grid_options = {}

	def load_grid_options(self):

		self.grid_options = {

			'test1': 0,

			'test2': 1,

		}

	def argparse(self):

		"""

		This function handles the arg parsing of the grid.

		Make sure that every grid_option key/value is included in this, 

		preferably with an explanation on what that parameter will do

		"""

		parser = argparse.ArgumentParser(description='Arguments for the binary_c python wrapper grid')

		# add arguments here

		parser.add_argument('--test1', type=int, help='input for test1')

		parser.add_argument('--test2', type=int, help='input for test2')

		# Load the args from the cmdline

		args = parser.parse_args()

		# Copy current grid_option set

		new_grid_options = self.grid_options.copy()

		# loop over grid_options

		for arg in vars(args):

			# print ("arg: {arg} value: {value}".format(arg=arg, value=getattr(args, arg)))

			# If an input has been given in the cmdline: override the previous value of grid_options

			if getattr(args, arg):

				new_grid_options[arg] = getattr(args, arg)

		# Put the new grid options back 

		self.grid_options = new_grid_options.copy()

newgrid = grid('test')

newgrid.load_grid_options()

print(newgrid.grid_options)

newgrid.argparse()

print(newgrid.grid_options)

# Custom set a single value:

newgrid.grid_options['test2'] = 2

print(newgrid.grid_options)

# Custom set multiple values:

newgrid.grid_options.update({

		'test1':4,

		'test2':-2,

	})

print(newgrid.grid_options)

import multiprocessing

import time

def doubler(number):

    return number ** 2

def count(number):

    nr = 0

    for i in range(number):

        nr += i

    return number

if __name__ == '__main__':

    numbers = range(2, 100000)

    pool = multiprocessing.Pool(processes=6)

    # print()

    rs = pool.map_async(pool.map(count, numbers), range(len(numbers)))

    pool.close() # No more work

    while (True):

      if (rs.ready()): break

      remaining = rs._number_left

      print("Waiting for", remaining, "tasks to complete...")

      time.sleep(0.5)

 No newline at end of file