diff --git a/HySoP/hysop/operator/advection.py b/HySoP/hysop/operator/advection.py index 787b8d426e02ff5d55ada5b0c5d9c65b7d53f85c..b0b5f87301807e167e5e60cadaab4797b8db3a01 100644 --- a/HySoP/hysop/operator/advection.py +++ b/HySoP/hysop/operator/advection.py @@ -87,7 +87,7 @@ class Advection(Operator): self.discreteFieldId[v] = dfId if self.discreteOperator is None: if self.method.find('gpu_2k') >= 0: - if self.advectedFields.vector: + if self.advectedFields.isVector: raise ValueError("Not implemented yet. GPU advection" + " is only for scalar fields") from parmepy.operator.gpu_particle_advection_2k \ @@ -96,7 +96,7 @@ class Advection(Operator): GPUParticleAdvection2k(self, method=self.method, **self.config) elif self.method.find('gpu_1k') >= 0: - if self.advectedFields.vector: + if self.advectedFields.isVector: raise ValueError("Not implemented yet. GPU advection" + " is only for scalar fields") from parmepy.operator.gpu_particle_advection_1k \ diff --git a/HySoP/hysop/operator/analytic.py b/HySoP/hysop/operator/analytic.py index 7d81310bf4c677edddd02c51c6cadbd60d848796..a4c2f3733472516e14e1baece11c9e76de7864f7 100644 --- a/HySoP/hysop/operator/analytic.py +++ b/HySoP/hysop/operator/analytic.py @@ -6,7 +6,7 @@ Analytic operator representation. from parmepy.constants import debug from parmepy.operator.continuous import Operator from parmepy.mpi.topology import Cartesian -from parmepy.operator.velocity_d import Analytic_D +from parmepy.operator.analytic_d import Analytic_D class Analytic(Operator): diff --git a/HySoP/hysop/operator/gpu_particle_advection.py b/HySoP/hysop/operator/gpu_particle_advection.py index c63da826ec6cd72b0bd7996fecff84ca9cb01ecd..dd6cb3f0622fb8bd16d638bceebf0727716f5b48 100644 --- a/HySoP/hysop/operator/gpu_particle_advection.py +++ b/HySoP/hysop/operator/gpu_particle_advection.py @@ -280,7 +280,7 @@ class GPUParticleAdvection(ParticleAdvection): for gpudf in self.variables: if __VERBOSE__: print "deallocate :", gpudf.name - if gpudf.vector: + if gpudf.isVector: [gpudf.gpu_data[d].release() for d in xrange(len(self.resolution))] else: diff --git a/HySoP/hysop/operator/gpu_particle_advection_1k.py b/HySoP/hysop/operator/gpu_particle_advection_1k.py index 1b1c1df76500ec6fb3de11628a01e09e4a52325d..c93c7b5c4e52bf08f2c50c8b0785881ce17695cd 100644 --- a/HySoP/hysop/operator/gpu_particle_advection_1k.py +++ b/HySoP/hysop/operator/gpu_particle_advection_1k.py @@ -86,7 +86,7 @@ class GPUParticleAdvection1k(GPUParticleAdvection): ## Result scalar particle_scalar = Field(self.advectedFields.topology.domain, "Particle_Scalar", - vector=False) + isVector=False) self.part_scalar, dfId = particle_scalar.discretize( self.advectedFields.topology) GPUScalarField.fromScalarField( diff --git a/HySoP/hysop/operator/gpu_particle_advection_2k.py b/HySoP/hysop/operator/gpu_particle_advection_2k.py index f288738e58d110ceda0fad2d031eb4aed3e2b65f..ef54829c68a0a0e1957dbae6b4ed24c862e78b9a 100644 --- a/HySoP/hysop/operator/gpu_particle_advection_2k.py +++ b/HySoP/hysop/operator/gpu_particle_advection_2k.py @@ -90,7 +90,7 @@ class GPUParticleAdvection2k(GPUParticleAdvection): ## Particle position particle_position = Field(self.advectedFields.topology.domain, "Particle_Position", - vector=False) + isVector=False) self.part_position, dfID = particle_position.discretize( self.advectedFields.topology) GPUScalarField.fromScalarField( @@ -99,7 +99,7 @@ class GPUParticleAdvection2k(GPUParticleAdvection): ## Result scalar particle_scalar = Field(self.advectedFields.topology.domain, "Particle_Scalar", - vector=False) + isVector=False) self.part_scalar, dfId = particle_scalar.discretize( self.advectedFields.topology) GPUScalarField.fromScalarField(