overhaul of cosmology, inits, hmf self-consistency, remote.py, and re-naming of test problems to match submodules, in prep for retiring of mercurial repo on bitbucket

Author: mirochaj

.hgignore

@@ -49,4 +49,4 @@ input/cosmo_params/*
 input/inits/cr.log
 tests/htmlcov*
 tests/.coverage
-
+input/planck/*

ares/analysis/DerivedQuantities.py

@@ -141,7 +141,7 @@ def total_sfrd(data):
 }
 
 class DerivedQuantities(object):
-    def __init__(self, ModelSet=None, pf=None, data=None):
+    def __init__(self, ModelSet=None, pf=None, data=None, cosm=None):
         self._ms = ModelSet
 
         if pf is None:
@@ -153,10 +153,13 @@ def __init__(self, ModelSet=None, pf=None, data=None):
         else:
             self.pf = pf
 
-        try:
-            self.cosm = self._ms.cosm
-        except AttributeError:
-            self.cosm = Cosmology(**self.pf)
+        if cosm is not None:
+            self.cosm = cosm
+        else:    
+            try:
+                self.cosm = self._ms.cosm
+            except AttributeError:
+                self.cosm = Cosmology(**self.pf)
 
         self._data = {}
 

ares/analysis/MultiPhaseMedium.py

@@ -40,9 +40,9 @@ class HistoryContainer(dict):
     """
     A wrapper around DerivedQuantities.
     """
-    def __init__(self, pf={}):
+    def __init__(self, pf={}, cosm=None):
         self._data = {}
-        self._dq = DQ(ModelSet=None, pf=pf)
+        self._dq = DQ(ModelSet=None, cosm=cosm, pf=pf)
 
     def add_data(self, data):
         self._dq._add_data(data)