diff --git a/scripts/generate.py b/scripts/generate.py index ee296494..61fe617b 100644 --- a/scripts/generate.py +++ b/scripts/generate.py @@ -646,7 +646,7 @@ def populate_data(self, contents): self.methods.append(''' @property def data(self): - return DataContainer(self._data) + return self._data ''') self.methods.append(''' diff --git a/setup.cfg b/setup.cfg index 2f0be436..ea5cfcc3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,4 +4,3 @@ exclude = doc/* [build_meta] repotag=555be66fc307899a5a9bcd8fe91760f58c487115 - diff --git a/setup.py b/setup.py index f1019434..66ff92cd 100644 --- a/setup.py +++ b/setup.py @@ -87,7 +87,7 @@ def run(self): "cuba.yml") if not (os.path.exists(cuba_yml) and os.path.exists(metadata_yml)): - print (textwrap.dedent(""" + print(textwrap.dedent(""" Cannot open simphony-metadata YAML files. Please specify an appropriate path to the simphony-metadata git repository in setup.cfg. @@ -122,7 +122,7 @@ def run(self): check_call(cmd_args + ["simphony/core/keywords.py"]) check_call(cmd_args + ["--recursive", "simphony/cuds/meta/"]) except OSError: - print (textwrap.dedent(""" + print(textwrap.dedent(""" Failed to run yapf. Make sure it is installed in your python environment, by running @@ -143,6 +143,8 @@ def write_version_py(filename=None): fh.write(ver % VERSION) finally: fh.close() + + write_version_py() # main setup configuration class diff --git a/simphony/cuds/meta/atom.py b/simphony/cuds/meta/atom.py index ddd9b6dd..3f432005 100644 --- a/simphony/cuds/meta/atom.py +++ b/simphony/cuds/meta/atom.py @@ -39,7 +39,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/atomistic.py b/simphony/cuds/meta/atomistic.py index bcdf9f79..8aae8ef4 100644 --- a/simphony/cuds/meta/atomistic.py +++ b/simphony/cuds/meta/atomistic.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/base_centered_monoclinic_lattice.py b/simphony/cuds/meta/base_centered_monoclinic_lattice.py index 85c4d194..aca7ecd9 100644 --- a/simphony/cuds/meta/base_centered_monoclinic_lattice.py +++ b/simphony/cuds/meta/base_centered_monoclinic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/base_centered_orthorhombic_lattice.py b/simphony/cuds/meta/base_centered_orthorhombic_lattice.py index f4e3d07a..334a26bc 100644 --- a/simphony/cuds/meta/base_centered_orthorhombic_lattice.py +++ b/simphony/cuds/meta/base_centered_orthorhombic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/basis.py b/simphony/cuds/meta/basis.py index f1017694..f058e91a 100644 --- a/simphony/cuds/meta/basis.py +++ b/simphony/cuds/meta/basis.py @@ -42,7 +42,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/berendsen.py b/simphony/cuds/meta/berendsen.py index 59ed1930..e855c48b 100644 --- a/simphony/cuds/meta/berendsen.py +++ b/simphony/cuds/meta/berendsen.py @@ -73,7 +73,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/bird_carreau_model.py b/simphony/cuds/meta/bird_carreau_model.py index 842adc30..8c05f757 100644 --- a/simphony/cuds/meta/bird_carreau_model.py +++ b/simphony/cuds/meta/bird_carreau_model.py @@ -96,7 +96,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/body_centered_cubic_lattice.py b/simphony/cuds/meta/body_centered_cubic_lattice.py index 942b7164..ea2227e0 100644 --- a/simphony/cuds/meta/body_centered_cubic_lattice.py +++ b/simphony/cuds/meta/body_centered_cubic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/body_centered_orthorhombic_lattice.py b/simphony/cuds/meta/body_centered_orthorhombic_lattice.py index 1885b5ba..783c7632 100644 --- a/simphony/cuds/meta/body_centered_orthorhombic_lattice.py +++ b/simphony/cuds/meta/body_centered_orthorhombic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/body_centered_tetragonal_lattice.py b/simphony/cuds/meta/body_centered_tetragonal_lattice.py index a9ea3ddc..b1986259 100644 --- a/simphony/cuds/meta/body_centered_tetragonal_lattice.py +++ b/simphony/cuds/meta/body_centered_tetragonal_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/bond.py b/simphony/cuds/meta/bond.py index 83d42f8c..80d5dc4e 100644 --- a/simphony/cuds/meta/bond.py +++ b/simphony/cuds/meta/bond.py @@ -40,7 +40,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/boundary.py b/simphony/cuds/meta/boundary.py index 40336e27..d059a3e2 100644 --- a/simphony/cuds/meta/boundary.py +++ b/simphony/cuds/meta/boundary.py @@ -42,7 +42,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/box.py b/simphony/cuds/meta/box.py index bf69318e..10b74f17 100644 --- a/simphony/cuds/meta/box.py +++ b/simphony/cuds/meta/box.py @@ -58,7 +58,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/bravais_lattice.py b/simphony/cuds/meta/bravais_lattice.py index feacfb57..843e9de5 100644 --- a/simphony/cuds/meta/bravais_lattice.py +++ b/simphony/cuds/meta/bravais_lattice.py @@ -96,7 +96,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/cell.py b/simphony/cuds/meta/cell.py index f8ef5ea8..028ab30f 100644 --- a/simphony/cuds/meta/cell.py +++ b/simphony/cuds/meta/cell.py @@ -24,7 +24,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/cfd.py b/simphony/cuds/meta/cfd.py index 66b787b2..7769192c 100644 --- a/simphony/cuds/meta/cfd.py +++ b/simphony/cuds/meta/cfd.py @@ -172,7 +172,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/compressibility_model.py b/simphony/cuds/meta/compressibility_model.py index 3b43b2e4..85a23f04 100644 --- a/simphony/cuds/meta/compressibility_model.py +++ b/simphony/cuds/meta/compressibility_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/computational_method.py b/simphony/cuds/meta/computational_method.py index 1e95e547..5db26913 100644 --- a/simphony/cuds/meta/computational_method.py +++ b/simphony/cuds/meta/computational_method.py @@ -31,7 +31,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/computational_model.py b/simphony/cuds/meta/computational_model.py index 95a89855..a1ca73d3 100644 --- a/simphony/cuds/meta/computational_model.py +++ b/simphony/cuds/meta/computational_model.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/condition.py b/simphony/cuds/meta/condition.py index c9c44804..d3d2525c 100644 --- a/simphony/cuds/meta/condition.py +++ b/simphony/cuds/meta/condition.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/constant_electrostatic_field_model.py b/simphony/cuds/meta/constant_electrostatic_field_model.py index 8e70696e..efcbdbb5 100644 --- a/simphony/cuds/meta/constant_electrostatic_field_model.py +++ b/simphony/cuds/meta/constant_electrostatic_field_model.py @@ -52,7 +52,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/continuum.py b/simphony/cuds/meta/continuum.py index a18bda51..c82ae3e5 100644 --- a/simphony/cuds/meta/continuum.py +++ b/simphony/cuds/meta/continuum.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/coulomb.py b/simphony/cuds/meta/coulomb.py index a02a8b64..a04b68e9 100644 --- a/simphony/cuds/meta/coulomb.py +++ b/simphony/cuds/meta/coulomb.py @@ -70,7 +70,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/coulomb_friction_force.py b/simphony/cuds/meta/coulomb_friction_force.py index b225f6db..a161b964 100644 --- a/simphony/cuds/meta/coulomb_friction_force.py +++ b/simphony/cuds/meta/coulomb_friction_force.py @@ -56,7 +56,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/cross_power_law_model.py b/simphony/cuds/meta/cross_power_law_model.py index 9a221415..1e7f4e60 100644 --- a/simphony/cuds/meta/cross_power_law_model.py +++ b/simphony/cuds/meta/cross_power_law_model.py @@ -96,7 +96,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/cubic_lattice.py b/simphony/cuds/meta/cubic_lattice.py index f4cca1f0..e0b10d44 100644 --- a/simphony/cuds/meta/cubic_lattice.py +++ b/simphony/cuds/meta/cubic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/cuds_component.py b/simphony/cuds/meta/cuds_component.py index ed6c2553..8c025ab0 100644 --- a/simphony/cuds/meta/cuds_component.py +++ b/simphony/cuds/meta/cuds_component.py @@ -50,7 +50,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/cuds_item.py b/simphony/cuds/meta/cuds_item.py index 7c32a24e..e895833d 100644 --- a/simphony/cuds/meta/cuds_item.py +++ b/simphony/cuds/meta/cuds_item.py @@ -22,7 +22,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/data_set.py b/simphony/cuds/meta/data_set.py index 7d4d507a..751b547c 100644 --- a/simphony/cuds/meta/data_set.py +++ b/simphony/cuds/meta/data_set.py @@ -31,7 +31,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/dem.py b/simphony/cuds/meta/dem.py index cb9398d5..ad8ccd78 100644 --- a/simphony/cuds/meta/dem.py +++ b/simphony/cuds/meta/dem.py @@ -31,7 +31,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/dirichlet.py b/simphony/cuds/meta/dirichlet.py index 019d829c..38e4335a 100644 --- a/simphony/cuds/meta/dirichlet.py +++ b/simphony/cuds/meta/dirichlet.py @@ -64,7 +64,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/dissipation_force.py b/simphony/cuds/meta/dissipation_force.py index d0f503c5..076b9dcf 100644 --- a/simphony/cuds/meta/dissipation_force.py +++ b/simphony/cuds/meta/dissipation_force.py @@ -56,7 +56,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/edge.py b/simphony/cuds/meta/edge.py index 3f3755ea..b8209006 100644 --- a/simphony/cuds/meta/edge.py +++ b/simphony/cuds/meta/edge.py @@ -24,7 +24,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/electronic.py b/simphony/cuds/meta/electronic.py index 3ef6576a..d554054f 100644 --- a/simphony/cuds/meta/electronic.py +++ b/simphony/cuds/meta/electronic.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/electrostatic_model.py b/simphony/cuds/meta/electrostatic_model.py index 96c6951c..9dd5085b 100644 --- a/simphony/cuds/meta/electrostatic_model.py +++ b/simphony/cuds/meta/electrostatic_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/empty.py b/simphony/cuds/meta/empty.py index d8b1357d..a15d6cbf 100644 --- a/simphony/cuds/meta/empty.py +++ b/simphony/cuds/meta/empty.py @@ -64,7 +64,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/engine.py b/simphony/cuds/meta/engine.py index 5184d652..de0f3c3d 100644 --- a/simphony/cuds/meta/engine.py +++ b/simphony/cuds/meta/engine.py @@ -30,7 +30,7 @@ def engine_feature(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/engine_feature.py b/simphony/cuds/meta/engine_feature.py index 1c003907..4d929784 100644 --- a/simphony/cuds/meta/engine_feature.py +++ b/simphony/cuds/meta/engine_feature.py @@ -35,7 +35,7 @@ def computational_method(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/face.py b/simphony/cuds/meta/face.py index 00950f14..c9785fa2 100644 --- a/simphony/cuds/meta/face.py +++ b/simphony/cuds/meta/face.py @@ -24,7 +24,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/face_centered_cubic_lattice.py b/simphony/cuds/meta/face_centered_cubic_lattice.py index 8e1960ef..5e1b81fd 100644 --- a/simphony/cuds/meta/face_centered_cubic_lattice.py +++ b/simphony/cuds/meta/face_centered_cubic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/face_centered_orthorhombic_lattice.py b/simphony/cuds/meta/face_centered_orthorhombic_lattice.py index 83a1b1bf..863fcc8b 100644 --- a/simphony/cuds/meta/face_centered_orthorhombic_lattice.py +++ b/simphony/cuds/meta/face_centered_orthorhombic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/fem.py b/simphony/cuds/meta/fem.py index 27d88936..d15d620f 100644 --- a/simphony/cuds/meta/fem.py +++ b/simphony/cuds/meta/fem.py @@ -31,7 +31,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/free.py b/simphony/cuds/meta/free.py index 4cc2c3f3..9cb91b86 100644 --- a/simphony/cuds/meta/free.py +++ b/simphony/cuds/meta/free.py @@ -33,7 +33,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/free_surface_model.py b/simphony/cuds/meta/free_surface_model.py index 12d8dc6f..6d8cd0fa 100644 --- a/simphony/cuds/meta/free_surface_model.py +++ b/simphony/cuds/meta/free_surface_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/fvm.py b/simphony/cuds/meta/fvm.py index 7ba09a37..886a54c8 100644 --- a/simphony/cuds/meta/fvm.py +++ b/simphony/cuds/meta/fvm.py @@ -31,7 +31,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/granular_dynamics.py b/simphony/cuds/meta/granular_dynamics.py index 4e024434..6d7a13d5 100644 --- a/simphony/cuds/meta/granular_dynamics.py +++ b/simphony/cuds/meta/granular_dynamics.py @@ -40,7 +40,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/gravity_model.py b/simphony/cuds/meta/gravity_model.py index e4916a11..782e57a3 100644 --- a/simphony/cuds/meta/gravity_model.py +++ b/simphony/cuds/meta/gravity_model.py @@ -52,7 +52,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/herschel_bulkley_model.py b/simphony/cuds/meta/herschel_bulkley_model.py index f4a73c90..3a0959b0 100644 --- a/simphony/cuds/meta/herschel_bulkley_model.py +++ b/simphony/cuds/meta/herschel_bulkley_model.py @@ -96,7 +96,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/hexagonal_lattice.py b/simphony/cuds/meta/hexagonal_lattice.py index daa6dbf0..fc9302a3 100644 --- a/simphony/cuds/meta/hexagonal_lattice.py +++ b/simphony/cuds/meta/hexagonal_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/incompressible_fluid_model.py b/simphony/cuds/meta/incompressible_fluid_model.py index 1169fc3c..44bfaea0 100644 --- a/simphony/cuds/meta/incompressible_fluid_model.py +++ b/simphony/cuds/meta/incompressible_fluid_model.py @@ -39,7 +39,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/integration_step.py b/simphony/cuds/meta/integration_step.py index 9d920b12..62ec2568 100644 --- a/simphony/cuds/meta/integration_step.py +++ b/simphony/cuds/meta/integration_step.py @@ -67,7 +67,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/integration_time.py b/simphony/cuds/meta/integration_time.py index 041fe22c..6a5f9b64 100644 --- a/simphony/cuds/meta/integration_time.py +++ b/simphony/cuds/meta/integration_time.py @@ -70,7 +70,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/interatomic_potential.py b/simphony/cuds/meta/interatomic_potential.py index 31e2fa50..e5858199 100644 --- a/simphony/cuds/meta/interatomic_potential.py +++ b/simphony/cuds/meta/interatomic_potential.py @@ -38,7 +38,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/isothermal_model.py b/simphony/cuds/meta/isothermal_model.py index 527efea1..884360b8 100644 --- a/simphony/cuds/meta/isothermal_model.py +++ b/simphony/cuds/meta/isothermal_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/ks_dft.py b/simphony/cuds/meta/ks_dft.py index 8cc0240f..f0969821 100644 --- a/simphony/cuds/meta/ks_dft.py +++ b/simphony/cuds/meta/ks_dft.py @@ -40,7 +40,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/laminar_flow_model.py b/simphony/cuds/meta/laminar_flow_model.py index 89f8a100..a6a283ac 100644 --- a/simphony/cuds/meta/laminar_flow_model.py +++ b/simphony/cuds/meta/laminar_flow_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/lattice.py b/simphony/cuds/meta/lattice.py index f2d833a9..d30ede9d 100644 --- a/simphony/cuds/meta/lattice.py +++ b/simphony/cuds/meta/lattice.py @@ -31,7 +31,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/lennard_jones_6_12.py b/simphony/cuds/meta/lennard_jones_6_12.py index 9ff441a4..ed2ede8e 100644 --- a/simphony/cuds/meta/lennard_jones_6_12.py +++ b/simphony/cuds/meta/lennard_jones_6_12.py @@ -84,7 +84,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/material.py b/simphony/cuds/meta/material.py index b240ae3e..7a307361 100644 --- a/simphony/cuds/meta/material.py +++ b/simphony/cuds/meta/material.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/material_relation.py b/simphony/cuds/meta/material_relation.py index 2342319b..54b58bd4 100644 --- a/simphony/cuds/meta/material_relation.py +++ b/simphony/cuds/meta/material_relation.py @@ -54,7 +54,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/mesh.py b/simphony/cuds/meta/mesh.py index a03c67aa..b0214617 100644 --- a/simphony/cuds/meta/mesh.py +++ b/simphony/cuds/meta/mesh.py @@ -96,7 +96,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/mesh_element.py b/simphony/cuds/meta/mesh_element.py index 23243eb4..935af2d9 100644 --- a/simphony/cuds/meta/mesh_element.py +++ b/simphony/cuds/meta/mesh_element.py @@ -40,7 +40,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/mesoscopic.py b/simphony/cuds/meta/mesoscopic.py index d0a2df3b..1da94eb6 100644 --- a/simphony/cuds/meta/mesoscopic.py +++ b/simphony/cuds/meta/mesoscopic.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/mixture_model.py b/simphony/cuds/meta/mixture_model.py index 1230cd90..8d3337db 100644 --- a/simphony/cuds/meta/mixture_model.py +++ b/simphony/cuds/meta/mixture_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/model_equation.py b/simphony/cuds/meta/model_equation.py index 0cf615b0..21c98bc0 100644 --- a/simphony/cuds/meta/model_equation.py +++ b/simphony/cuds/meta/model_equation.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/molecular_dynamics.py b/simphony/cuds/meta/molecular_dynamics.py index 9dc52d88..b1bc868a 100644 --- a/simphony/cuds/meta/molecular_dynamics.py +++ b/simphony/cuds/meta/molecular_dynamics.py @@ -40,7 +40,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/molecular_statics.py b/simphony/cuds/meta/molecular_statics.py index ff424f5c..b8bc6f7f 100644 --- a/simphony/cuds/meta/molecular_statics.py +++ b/simphony/cuds/meta/molecular_statics.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/monoclinic_lattice.py b/simphony/cuds/meta/monoclinic_lattice.py index 1f96d1c2..95602dd9 100644 --- a/simphony/cuds/meta/monoclinic_lattice.py +++ b/simphony/cuds/meta/monoclinic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/multiphase_model.py b/simphony/cuds/meta/multiphase_model.py index 17ebe014..6343ddc0 100644 --- a/simphony/cuds/meta/multiphase_model.py +++ b/simphony/cuds/meta/multiphase_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/neumann.py b/simphony/cuds/meta/neumann.py index a4f32151..1ab66c30 100644 --- a/simphony/cuds/meta/neumann.py +++ b/simphony/cuds/meta/neumann.py @@ -64,7 +64,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/newtonian_fluid_model.py b/simphony/cuds/meta/newtonian_fluid_model.py index b1db3f98..c4e62be1 100644 --- a/simphony/cuds/meta/newtonian_fluid_model.py +++ b/simphony/cuds/meta/newtonian_fluid_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/node.py b/simphony/cuds/meta/node.py index 36d22b4e..282d388b 100644 --- a/simphony/cuds/meta/node.py +++ b/simphony/cuds/meta/node.py @@ -39,7 +39,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/nose_hoover.py b/simphony/cuds/meta/nose_hoover.py index 2916e22e..f4a2e5a2 100644 --- a/simphony/cuds/meta/nose_hoover.py +++ b/simphony/cuds/meta/nose_hoover.py @@ -73,7 +73,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/origin.py b/simphony/cuds/meta/origin.py index 8cb4cc76..82d0778f 100644 --- a/simphony/cuds/meta/origin.py +++ b/simphony/cuds/meta/origin.py @@ -40,7 +40,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/orthorhombic_lattice.py b/simphony/cuds/meta/orthorhombic_lattice.py index 76b5ffb7..f1aeafa7 100644 --- a/simphony/cuds/meta/orthorhombic_lattice.py +++ b/simphony/cuds/meta/orthorhombic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/pair_potential.py b/simphony/cuds/meta/pair_potential.py index 4718f6ea..66a19ae1 100644 --- a/simphony/cuds/meta/pair_potential.py +++ b/simphony/cuds/meta/pair_potential.py @@ -54,7 +54,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/particle.py b/simphony/cuds/meta/particle.py index 1da5ca01..d268469a 100644 --- a/simphony/cuds/meta/particle.py +++ b/simphony/cuds/meta/particle.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/particles.py b/simphony/cuds/meta/particles.py index 48357597..8895a1d0 100644 --- a/simphony/cuds/meta/particles.py +++ b/simphony/cuds/meta/particles.py @@ -64,7 +64,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/periodic.py b/simphony/cuds/meta/periodic.py index 395fe9b1..388cfeda 100644 --- a/simphony/cuds/meta/periodic.py +++ b/simphony/cuds/meta/periodic.py @@ -33,7 +33,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/physics_equation.py b/simphony/cuds/meta/physics_equation.py index ff51a344..b6b7a908 100644 --- a/simphony/cuds/meta/physics_equation.py +++ b/simphony/cuds/meta/physics_equation.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/point.py b/simphony/cuds/meta/point.py index 1e81bc3c..6d1fb1ad 100644 --- a/simphony/cuds/meta/point.py +++ b/simphony/cuds/meta/point.py @@ -38,7 +38,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/power_law_viscosity_model.py b/simphony/cuds/meta/power_law_viscosity_model.py index f5c1b711..61037807 100644 --- a/simphony/cuds/meta/power_law_viscosity_model.py +++ b/simphony/cuds/meta/power_law_viscosity_model.py @@ -96,7 +96,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/primitive_cell.py b/simphony/cuds/meta/primitive_cell.py index 85b892e5..f4465381 100644 --- a/simphony/cuds/meta/primitive_cell.py +++ b/simphony/cuds/meta/primitive_cell.py @@ -41,7 +41,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/rheology_model.py b/simphony/cuds/meta/rheology_model.py index 2008689b..df446ead 100644 --- a/simphony/cuds/meta/rheology_model.py +++ b/simphony/cuds/meta/rheology_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/rhombohedral_lattice.py b/simphony/cuds/meta/rhombohedral_lattice.py index 09f6b8e8..db2cbcdc 100644 --- a/simphony/cuds/meta/rhombohedral_lattice.py +++ b/simphony/cuds/meta/rhombohedral_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/single_phase_model.py b/simphony/cuds/meta/single_phase_model.py index 514083ab..06095f67 100644 --- a/simphony/cuds/meta/single_phase_model.py +++ b/simphony/cuds/meta/single_phase_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/sjkr_cohesion_force.py b/simphony/cuds/meta/sjkr_cohesion_force.py index e73fe537..34e25a85 100644 --- a/simphony/cuds/meta/sjkr_cohesion_force.py +++ b/simphony/cuds/meta/sjkr_cohesion_force.py @@ -56,7 +56,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/software_tool.py b/simphony/cuds/meta/software_tool.py index 41b481e2..63bcb71e 100644 --- a/simphony/cuds/meta/software_tool.py +++ b/simphony/cuds/meta/software_tool.py @@ -38,7 +38,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/solver_parameter.py b/simphony/cuds/meta/solver_parameter.py index a31c2f88..8a68cf88 100644 --- a/simphony/cuds/meta/solver_parameter.py +++ b/simphony/cuds/meta/solver_parameter.py @@ -25,7 +25,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/sph.py b/simphony/cuds/meta/sph.py index 7dac654c..0003fff2 100644 --- a/simphony/cuds/meta/sph.py +++ b/simphony/cuds/meta/sph.py @@ -31,7 +31,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/surface_tension_relation.py b/simphony/cuds/meta/surface_tension_relation.py index 2484be01..c8894e72 100644 --- a/simphony/cuds/meta/surface_tension_relation.py +++ b/simphony/cuds/meta/surface_tension_relation.py @@ -68,7 +68,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/temperature_rescaling.py b/simphony/cuds/meta/temperature_rescaling.py index 312f02c5..93e39559 100644 --- a/simphony/cuds/meta/temperature_rescaling.py +++ b/simphony/cuds/meta/temperature_rescaling.py @@ -73,7 +73,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/tetragonal_lattice.py b/simphony/cuds/meta/tetragonal_lattice.py index 05b07258..5d8a6e03 100644 --- a/simphony/cuds/meta/tetragonal_lattice.py +++ b/simphony/cuds/meta/tetragonal_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/thermal_model.py b/simphony/cuds/meta/thermal_model.py index f2df6e0a..82fea203 100644 --- a/simphony/cuds/meta/thermal_model.py +++ b/simphony/cuds/meta/thermal_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/thermostat.py b/simphony/cuds/meta/thermostat.py index 32c2aeb0..d7de9b08 100644 --- a/simphony/cuds/meta/thermostat.py +++ b/simphony/cuds/meta/thermostat.py @@ -38,7 +38,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/triclinic_lattice.py b/simphony/cuds/meta/triclinic_lattice.py index 5875d19c..8a3aa659 100644 --- a/simphony/cuds/meta/triclinic_lattice.py +++ b/simphony/cuds/meta/triclinic_lattice.py @@ -43,7 +43,7 @@ def models(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/turbulence_model.py b/simphony/cuds/meta/turbulence_model.py index 68047842..b70e655f 100644 --- a/simphony/cuds/meta/turbulence_model.py +++ b/simphony/cuds/meta/turbulence_model.py @@ -37,7 +37,7 @@ def variables(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/verlet.py b/simphony/cuds/meta/verlet.py index 600d3fa2..f9e27bc2 100644 --- a/simphony/cuds/meta/verlet.py +++ b/simphony/cuds/meta/verlet.py @@ -31,7 +31,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/cuds/meta/version.py b/simphony/cuds/meta/version.py index 00d8acfc..7268c76c 100644 --- a/simphony/cuds/meta/version.py +++ b/simphony/cuds/meta/version.py @@ -76,7 +76,7 @@ def definition(self): @property def data(self): - return DataContainer(self._data) + return self._data @data.setter def data(self, new_data): diff --git a/simphony/io/tests/test_h5_lattice.py b/simphony/io/tests/test_h5_lattice.py index d43e70a1..55fb38e1 100644 --- a/simphony/io/tests/test_h5_lattice.py +++ b/simphony/io/tests/test_h5_lattice.py @@ -186,5 +186,6 @@ def test_version(self): with self.assertRaises(ValueError): H5Lattice(handle.get_node("/" + group_name)) + if __name__ == '__main__': unittest.main()