Merge remote-tracking branch 'origin/master' into adri

dart/api/cupydo.py

@@ -24,9 +24,9 @@ import sys
 class Dart(FluidSolver):
     """DART interface for CUPyDO
     """
-    def __init__(self, _module, _nthreads):
+    def __init__(self, p, _nthreads):
         # load the python module and initialize the solver
-        module = __import__(_module)
+        module = __import__(p['cfdFile'])
         params = module.getParams()
         params['Threads'] = _nthreads
         from .core import init_dart
@@ -43,7 +43,7 @@ class Dart(FluidSolver):
         self.saveFreq = params.get('SaveFreq', sys.maxsize)
 
         # generic init
-        FluidSolver.__init__(self)
+        FluidSolver.__init__(self, p)
 
     def run(self, t1, t2):
         """Run the solver for one steady (time) iteration.
@@ -84,7 +84,7 @@ class Dart(FluidSolver):
         no = self.boundary.nodes[iVertex].no
         return no
 
-    def applyNodalDisplacements(self, dx, dy, dz, dx_nM1, dy_nM1, dz_nM1, haloNodesDisplacements, time):
+    def applyNodalDisplacements(self, dx, dy, dz, dt, haloNodesDisplacements):
         """Apply displacements coming from solid solver to f/s interface after saving
         """
         self.morpher.savePos()
@@ -136,3 +136,4 @@ class Dart(FluidSolver):
         del self.morpher
         del self.writer
         del self.msh
+        
\ No newline at end of file