Pyro now finds pyro location by looking up location of pyro.py - no longer have to set PYRO_HOME. Have reverted the docs to reflect this. Have also updated .travis.yml file to make sure examples.ipynb is tested

Author: Alice Harpole

.travis.yml

@@ -23,7 +23,7 @@ before_script:
 
 script:
   - flake8 .
-  - pytest -v --cov=. --cov-config .coveragerc --nbval --ignore=docs --ignore=./multigrid/variable_coeff_elliptic.ipynb --ignore=examples
+  - pytest -v --cov=. --cov-config .coveragerc --nbval --ignore=docs --ignore=./multigrid/variable_coeff_elliptic.ipynb --ignore=examples/mesh --ignore=examples/multigrid
 #   - travis-sphinx build
 
 # after_success:

README.md

@@ -77,7 +77,7 @@ http://python-hydro.github.io/pyro2/
         directory.
 
       * Define the environment variable `PYRO_HOME` to point to the
-        `pyro2/` directory 
+        `pyro2/` directory (only needed for regression testing)
 
       * Build the Fortran source. In `pyro2/` type
 

docs/source/installation.rst

@@ -36,7 +36,7 @@ The following steps are needed before running pyro:
    ./mk.sh
 
 * define the environment variable ``PYRO_HOME`` to point to
-  the ``pyro2/`` directory
+  the ``pyro2/`` directory (only needed for regression testing)
 
 .. code-block:: none
 

examples/examples.ipynb

@@ -271,14 +271,14 @@
       "   11    1.00000    0.00000\n",
       "\u001b[33moutputting...\u001b[0m\n",
       "\u001b[33moutputting...\u001b[0m\n",
-      "vis:  0.2423102855682373\n",
-      "main:  0.07352924346923828\n"
+      "vis:  0.417586088180542\n",
+      "main:  0.15765929222106934\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "<advection.simulation.Simulation at 0x7f293ebf2390>"
+       "<advection.simulation.Simulation at 0x11e185668>"
       ]
      },
      "execution_count": 9,
@@ -455,7 +455,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python [default]",
    "language": "python",
    "name": "python3"
   },

pyro.py

@@ -46,7 +46,7 @@ def __init__(self, solver_name):
         if solver_name not in valid_solvers:
             msg.fail("ERROR: %s is not a valid solver" % solver_name)
 
-        os.chdir(os.environ["PYRO_HOME"])
+        self.pyro_home = os.path.dirname(os.path.realpath(__file__)) + '/'
 
         # import desired solver under "solver" namespace
         self.solver = importlib.import_module(solver_name)
@@ -58,8 +58,8 @@ def __init__(self, solver_name):
 
         # parameter defaults
         self.rp = runparams.RuntimeParameters()
-        self.rp.load_params("_defaults")
-        self.rp.load_params(solver_name + "/_defaults")
+        self.rp.load_params(self.pyro_home + "_defaults")
+        self.rp.load_params(self.pyro_home + solver_name + "/_defaults")
 
         self.tc = profile.TimerCollection()
 
@@ -82,7 +82,7 @@ def initialize_problem(self, problem_name, inputs_file=None, inputs_dict=None,
             Other command line parameter options
         """
 
-        problem_defaults_file = self.solver_name + \
+        problem_defaults_file = self.pyro_home + self.solver_name + \
             "/problems/_" + problem_name + ".defaults"
 
         # problem-specific runtime parameters
@@ -93,7 +93,7 @@ def initialize_problem(self, problem_name, inputs_file=None, inputs_dict=None,
         if inputs_file is not None:
             if not os.path.isfile(inputs_file):
                 # check if the param file lives in the solver's problems directory
-                inputs_file = self.solver_name + "/problems/" + inputs_file
+                inputs_file = self.pyro_home + self.solver_name + "/problems/" + inputs_file
                 if not os.path.isfile(inputs_file):
                     msg.fail("ERROR: inputs file does not exist")
 
@@ -308,7 +308,7 @@ def store_as_benchmark(self):
                     "ERROR: unable to create the solver's tests/ directory")
 
         basename = self.rp.get_param("io.basename")
-        bench_file = self.solver_name + "/tests/" + \
+        bench_file = self.pyro_home + self.solver_name + "/tests/" + \
             basename + "%4.4d" % (self.sim.n)
         msg.warning("storing new benchmark: {}\n".format(bench_file))
         self.sim.write(bench_file)