Merge pull request #351 from simphony/order-supported-parameters

Sort the attributes so we don't get a random order diff every time

scripts/generate.py

@@ -319,7 +319,7 @@ def supported_parameters(self):
         # They are not CUBA attributes and therefore not supported
         # parameter
         def get_cuba_attribute():
-            for attr in self.all_attributes:
+            for attr in sorted(self.all_attributes):
                 if attr not in EXCLUDE_SUPPORTED_PARAMETERS:
                     yield 'CUBA.'+attr.upper()
 

simphony/cuds/meta/atom.py

@@ -53,7 +53,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.MASS, CUBA.POSITION)
+        return (CUBA.MASS, CUBA.POSITION, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/atomistic.py

@@ -39,7 +39,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.DESCRIPTION, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/base_centered_monoclinic_lattice.py

@@ -58,8 +58,8 @@ def size(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.ORIGIN, CUBA.LATTICE_PARAMETER, CUBA.DESCRIPTION,
-                CUBA.UUID, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.LATTICE_PARAMETER, CUBA.NAME,
+                CUBA.ORIGIN, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/base_centered_orthorhombic_lattice.py

@@ -58,8 +58,8 @@ def size(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.ORIGIN, CUBA.LATTICE_PARAMETER, CUBA.DESCRIPTION,
-                CUBA.UUID, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.LATTICE_PARAMETER, CUBA.NAME,
+                CUBA.ORIGIN, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/basis.py

@@ -56,7 +56,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.VECTOR, CUBA.DESCRIPTION, CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID, CUBA.VECTOR)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/berendsen.py

@@ -87,8 +87,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.TEMPERATURE, CUBA.COUPLING_TIME,
-                CUBA.DESCRIPTION, CUBA.MATERIAL, CUBA.NAME)
+        return (CUBA.COUPLING_TIME, CUBA.DESCRIPTION, CUBA.MATERIAL, CUBA.NAME,
+                CUBA.TEMPERATURE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/bird_carreau_model.py

@@ -110,9 +110,9 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.INITIAL_VISCOSITY, CUBA.UUID,
-                CUBA.POWER_LAW_INDEX, CUBA.LINEAR_CONSTANT,
-                CUBA.MAXIMUM_VISCOSITY, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.INITIAL_VISCOSITY, CUBA.LINEAR_CONSTANT,
+                CUBA.MAXIMUM_VISCOSITY, CUBA.NAME, CUBA.POWER_LAW_INDEX,
+                CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/body_centered_cubic_lattice.py

@@ -58,8 +58,8 @@ def size(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.ORIGIN, CUBA.LATTICE_PARAMETER, CUBA.DESCRIPTION,
-                CUBA.UUID, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.LATTICE_PARAMETER, CUBA.NAME,
+                CUBA.ORIGIN, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/body_centered_orthorhombic_lattice.py

@@ -58,8 +58,8 @@ def size(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.ORIGIN, CUBA.LATTICE_PARAMETER, CUBA.DESCRIPTION,
-                CUBA.UUID, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.LATTICE_PARAMETER, CUBA.NAME,
+                CUBA.ORIGIN, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/body_centered_tetragonal_lattice.py

@@ -58,8 +58,8 @@ def size(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.ORIGIN, CUBA.LATTICE_PARAMETER, CUBA.DESCRIPTION,
-                CUBA.UUID, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.LATTICE_PARAMETER, CUBA.NAME,
+                CUBA.ORIGIN, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/bond.py

@@ -54,7 +54,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.PARTICLE)
+        return (CUBA.PARTICLE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/boundary.py

@@ -56,7 +56,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.UUID, CUBA.CONDITION, CUBA.NAME)
+        return (CUBA.CONDITION, CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/box.py

@@ -72,8 +72,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.VECTOR, CUBA.DESCRIPTION, CUBA.UUID, CUBA.CONDITION,
-                CUBA.NAME)
+        return (CUBA.CONDITION, CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID,
+                CUBA.VECTOR)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/bravais_lattice.py

@@ -85,8 +85,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.ORIGIN, CUBA.LATTICE_PARAMETER, CUBA.DESCRIPTION,
-                CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.LATTICE_PARAMETER, CUBA.NAME,
+                CUBA.ORIGIN, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/cell.py

@@ -38,7 +38,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.POINT)
+        return (CUBA.POINT, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/cfd.py

@@ -186,10 +186,10 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.TURBULENCE_MODEL, CUBA.COMPRESSIBILITY_MODEL,
-                CUBA.DESCRIPTION, CUBA.GRAVITY_MODEL, CUBA.RHEOLOGY_MODEL,
-                CUBA.THERMAL_MODEL, CUBA.ELECTROSTATIC_MODEL,
-                CUBA.MULTIPHASE_MODEL, CUBA.NAME)
+        return (CUBA.COMPRESSIBILITY_MODEL, CUBA.DESCRIPTION,
+                CUBA.ELECTROSTATIC_MODEL, CUBA.GRAVITY_MODEL,
+                CUBA.MULTIPHASE_MODEL, CUBA.NAME, CUBA.RHEOLOGY_MODEL,
+                CUBA.THERMAL_MODEL, CUBA.TURBULENCE_MODEL, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/compressibility_model.py

@@ -51,7 +51,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/computational_method.py

@@ -45,7 +45,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.PHYSICS_EQUATION, CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.PHYSICS_EQUATION, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/computational_model.py

@@ -39,7 +39,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.DESCRIPTION, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/condition.py

@@ -39,7 +39,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.DESCRIPTION, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/constant_electrostatic_field_model.py

@@ -66,8 +66,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.UUID, CUBA.ELECTROSTATIC_FIELD,
-                CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.ELECTROSTATIC_FIELD, CUBA.NAME,
+                CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/continuum.py

@@ -39,7 +39,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.DESCRIPTION, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/coulomb.py

@@ -84,8 +84,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.DIELECTRIC_CONSTANT,
-                CUBA.CUTOFF_DISTANCE, CUBA.MATERIAL, CUBA.UUID, CUBA.NAME)
+        return (CUBA.CUTOFF_DISTANCE, CUBA.DESCRIPTION,
+                CUBA.DIELECTRIC_CONSTANT, CUBA.MATERIAL, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/coulomb_friction_force.py

@@ -70,8 +70,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.FRICTION_COEFFICIENT, CUBA.DESCRIPTION, CUBA.MATERIAL,
-                CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.FRICTION_COEFFICIENT, CUBA.MATERIAL,
+                CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/cross_power_law_model.py

@@ -110,9 +110,9 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.INITIAL_VISCOSITY, CUBA.UUID,
-                CUBA.POWER_LAW_INDEX, CUBA.LINEAR_CONSTANT,
-                CUBA.MAXIMUM_VISCOSITY, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.INITIAL_VISCOSITY, CUBA.LINEAR_CONSTANT,
+                CUBA.MAXIMUM_VISCOSITY, CUBA.NAME, CUBA.POWER_LAW_INDEX,
+                CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/cubic_lattice.py

@@ -58,8 +58,8 @@ def size(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.ORIGIN, CUBA.LATTICE_PARAMETER, CUBA.DESCRIPTION,
-                CUBA.UUID, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.LATTICE_PARAMETER, CUBA.NAME,
+                CUBA.ORIGIN, CUBA.PRIMITIVE_CELL, CUBA.SIZE, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/cuds_component.py

@@ -64,7 +64,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.DESCRIPTION, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/data_set.py

@@ -45,7 +45,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/dem.py

@@ -45,7 +45,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.PHYSICS_EQUATION, CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.PHYSICS_EQUATION, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/dirichlet.py

@@ -78,8 +78,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.VARIABLE, CUBA.MATERIAL, CUBA.UUID,
-                CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.MATERIAL, CUBA.NAME, CUBA.UUID,
+                CUBA.VARIABLE)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/dissipation_force.py

@@ -70,8 +70,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.RESTITUTION_COEFFICIENT, CUBA.DESCRIPTION,
-                CUBA.MATERIAL, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.MATERIAL, CUBA.NAME,
+                CUBA.RESTITUTION_COEFFICIENT, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/edge.py

@@ -38,7 +38,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.POINT)
+        return (CUBA.POINT, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/electronic.py

@@ -39,7 +39,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.DESCRIPTION, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/electrostatic_model.py

@@ -51,7 +51,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.UUID, CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.NAME, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/empty.py

@@ -78,8 +78,8 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.DESCRIPTION, CUBA.VARIABLE, CUBA.MATERIAL, CUBA.UUID,
-                CUBA.NAME)
+        return (CUBA.DESCRIPTION, CUBA.MATERIAL, CUBA.NAME, CUBA.UUID,
+                CUBA.VARIABLE)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/engine.py

@@ -44,7 +44,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.VERSION, CUBA.UUID, CUBA.ENGINE_FEATURE)
+        return (CUBA.ENGINE_FEATURE, CUBA.UUID, CUBA.VERSION)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/engine_feature.py

@@ -49,7 +49,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.PHYSICS_EQUATION, CUBA.UUID, CUBA.COMPUTATIONAL_METHOD)
+        return (CUBA.COMPUTATIONAL_METHOD, CUBA.PHYSICS_EQUATION, CUBA.UUID)
 
     @classmethod
     def parents(cls):

simphony/cuds/meta/face.py

@@ -38,7 +38,7 @@ def uid(self):
 
     @classmethod
     def supported_parameters(cls):
-        return (CUBA.UUID, CUBA.POINT)
+        return (CUBA.POINT, CUBA.UUID)
 
     @classmethod
     def parents(cls):