Commit 0f1e4c12 authored by Ultima's avatar Ultima
Browse files

Implemented multidimensional data on fields.

parent 7f240569
This diff is collapsed.
...@@ -348,7 +348,6 @@ class distributed_data_object(object): ...@@ -348,7 +348,6 @@ class distributed_data_object(object):
## use common datatype for self and other ## use common datatype for self and other
new_dtype = np.dtype(np.find_common_type((self.dtype,), new_dtype = np.dtype(np.find_common_type((self.dtype,),
(temp_data.dtype,))).type (temp_data.dtype,))).type
print new_dtype
temp_d2o = self.copy_empty( temp_d2o = self.copy_empty(
dtype = new_dtype) dtype = new_dtype)
temp_d2o.set_local_data(data=temp_data) temp_d2o.set_local_data(data=temp_data)
......
...@@ -631,7 +631,7 @@ class rg_space(point_space): ...@@ -631,7 +631,7 @@ class rg_space(point_space):
## Check hermitianity/reality ## Check hermitianity/reality
if self.paradict['complexity'] == 0: if self.paradict['complexity'] == 0:
if x.iscomplex().any() == False: if x.iscomplex().any() == True:
about.warnings.cflush(\ about.warnings.cflush(\
"WARNING: Data is not completely real. Imaginary part "+\ "WARNING: Data is not completely real. Imaginary part "+\
"will be discarded!\n") "will be discarded!\n")
...@@ -1314,7 +1314,6 @@ class rg_space(point_space): ...@@ -1314,7 +1314,6 @@ class rg_space(point_space):
## weight ## weight
x = x * self.get_weight(power = power) x = x * self.get_weight(power = power)
return x return x
def get_weight(self, power = 1): def get_weight(self, power = 1):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment