Merge pull request #17 from openearth/fix/sandbox-issues

Fix/sandbox issues

Author: SiggyF

Makefile

@@ -29,6 +29,11 @@ BROWSER := python -c "$$BROWSER_PYSCRIPT"
 help:
 	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
 
+bump:
+	bumpversion minor
+
+
+
 clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
 
 clean-build: ## remove build artifacts

mmi/mmi_client.py

@@ -266,6 +266,23 @@ def get_current_time(self):
 
         return metadata[method]
 
+    def get_time_step(self):
+        """
+        Return time step of simulation
+        """
+
+        method = "get_time_step"
+
+        A = None
+        metadata = {method: -1}
+
+        send_array(self.socket, A, metadata)
+        A, metadata = recv_array(
+            self.socket, poll=self.poll, poll_timeout=self.poll_timeout,
+            flags=self.zmq_flags)
+
+        return metadata[method]
+
     def update(self, dt):
         """
         Advance the module with timestep dt
@@ -312,5 +329,7 @@ def remote(self, action):
         return metadata[method]
 
     def subscribe(self, topic=b''):
-        """subscribe to the SUB socket, to listen for incomming variables"""
+        """subscribe to the SUB socket, to listen for incomming variables, return a stream that can be listened to."""
         self.sockets[zmq.SUB].setsockopt(zmq.SUBSCRIBE, topic)
+        poller = self.pollers[zmq.SUB]
+        return poller

mmi/runner.py

@@ -35,6 +35,7 @@ def __init__(
             mpi=False,
             port='random',
             bmi_class='bmi.wrapper.BMIWrapper',
+            pause=False,
             *args,
             **kwargs
     ):
@@ -59,6 +60,8 @@ def __init__(
         self.sockets = self.create_sockets()
 
         self.model = self.create_bmi_model(engine, bmi_class)
+        if pause:
+            self.model.state = 'pause'
         self.metadata = {}
         self.fill_metadata()
 
@@ -366,6 +369,7 @@ def create_sockets(self):
 
         poller.register(rep, zmq.POLLIN)
         poller.register(pull, zmq.POLLIN)
+
         sockets = dict(
             poller=poller,
             rep=rep,