merge

HySoP/hysop/operator/tests/test_diff_poisson_3D.py

@@ -39,15 +39,6 @@ def computeVort(x, y, z):
 def test_Diff_Poisson():
     # Parameters
     nb = 33
-<<<<<<< HEAD
-    dim = 3
-    boxLength = [1., 1., 1.]
-    boxMin = [0., 0., 0.]
-    nbElem = [nb, nb, nb]
-
-    ## Domain
-    box = pp.Box(dim, length=boxLength, origin=boxMin)
-=======
     boxLength = [1., 1., 1.]
     boxMin = [0., 0., 0.]
     from parmepy.tools.parameters import Discretization
@@ -55,7 +46,6 @@ def test_Diff_Poisson():
 
     ## Domain
     box = pp.Box(length=boxLength, origin=boxMin)
->>>>>>> Parmepy v0
 
     ## Fields
     velo = pp.Field(domain=box, formula=computeVel,
@@ -64,31 +54,15 @@ def test_Diff_Poisson():
                      name='Vorticity', isVector=True)
 
     ## FFT Diffusion operators and FFT Poisson solver
-<<<<<<< HEAD
-    diffusion = Diffusion(vorti, resolutions={vorti:nbElem},
-                          viscosity=0.002
-                          )
-
-    poisson = Poisson(velo, vorti,
-                      resolutions={velo: nbElem,
-                                   vorti: nbElem},
-                      )
-=======
     diffusion = Diffusion(variables={vorti: d3D}, viscosity=0.002)
     poisson = Poisson(velo, vorti, discretization=d3D)
->>>>>>> Parmepy v0
 
     diffusion.discretize()
     poisson.discretize()
 
-<<<<<<< HEAD
-    diffusion.setUp()
-    poisson.setUp()
-=======
     diffusion.setup()
     poisson.setup()
 
->>>>>>> Parmepy v0
     simu = Simulation(tinit=0.0, tend=10., timeStep=0.002,
                       iterMax=1000000)
     diffusion.apply(simu)