Merge pull request #403 from simphony/update-to-metadata-post-0.6.0

Update against simphony-metadata post CFD keys additions
simphony · Mar 13, 2017 · e3de466 · e3de466
2 parents a3b607e + 23d861d
commit e3de466
Show file tree

Hide file tree

Showing 38 changed files with 1,359 additions and 309 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -3,4 +3,5 @@
 exclude = doc/*
 
 [build_meta]
-repotag=0.6.0
+# Post 0.6.0. Addition of CFD metadata
+repotag=1b64cc80045cf99ffa3594342b44098c1c09be8d
diff --git a/simphony/core/cuba.py b/simphony/core/cuba.py
@@ -16,6 +16,7 @@ class CUBA(Enum):
     BASE_CENTERED_ORTHORHOMBIC_LATTICE = "BASE_CENTERED_ORTHORHOMBIC_LATTICE"
     BASIS = "BASIS"
     BERENDSEN = "BERENDSEN"
+    BINGHAM_PLASTIC_MODEL = "BINGHAM_PLASTIC_MODEL"
     BIRD_CARREAU_MODEL = "BIRD_CARREAU_MODEL"
     BODY_CENTERED_CUBIC_LATTICE = "BODY_CENTERED_CUBIC_LATTICE"
     BODY_CENTERED_ORTHORHOMBIC_LATTICE = "BODY_CENTERED_ORTHORHOMBIC_LATTICE"
@@ -105,6 +106,7 @@ class CUBA(Enum):
     INCOMPRESSIBLE_FLUID_MODEL = "INCOMPRESSIBLE_FLUID_MODEL"
     INDEX = "INDEX"
     INITIAL_VISCOSITY = "INITIAL_VISCOSITY"
+    INLET_OUTLET = "INLET_OUTLET"
     INTEGRATION_STEP = "INTEGRATION_STEP"
     INTEGRATION_TIME = "INTEGRATION_TIME"
     INTERATOMIC_POTENTIAL = "INTERATOMIC_POTENTIAL"
@@ -120,15 +122,19 @@ class CUBA(Enum):
     LATTICE_VECTORS = "LATTICE_VECTORS"
     LENNARD_JONES_6_12 = "LENNARD_JONES_6_12"
     LINEAR_CONSTANT = "LINEAR_CONSTANT"
+    MAGNITUDE = "MAGNITUDE"
     MAJOR = "MAJOR"
     MASS = "MASS"
     MATERIAL = "MATERIAL"
     MATERIAL_RELATION = "MATERIAL_RELATION"
     MATERIAL_TYPE = "MATERIAL_TYPE"
+    MAXIMUM_COURANT_NUMBER = "MAXIMUM_COURANT_NUMBER"
     MAXIMUM_VISCOSITY = "MAXIMUM_VISCOSITY"
     MESH = "MESH"
     MESH_ELEMENT = "MESH_ELEMENT"
     MESOSCOPIC = "MESOSCOPIC"
+    MESOSCOPIC_RELATIVE_VELOCITY_MODEL = "MESOSCOPIC_RELATIVE_VELOCITY_MODEL"
+    MESOSCOPIC_STRESS_MODEL = "MESOSCOPIC_STRESS_MODEL"
     MINIMUM_VISCOSITY = "MINIMUM_VISCOSITY"
     MINOR = "MINOR"
     MIXTURE_MODEL = "MIXTURE_MODEL"
@@ -146,6 +152,7 @@ class CUBA(Enum):
     NODE = "NODE"
     NONE = "NONE"
     NOSE_HOOVER = "NOSE_HOOVER"
+    NUMBER_OF_CORES = "NUMBER_OF_CORES"
     NUMBER_OF_POINTS = "NUMBER_OF_POINTS"
     NUMBER_OF_TIME_STEPS = "NUMBER_OF_TIME_STEPS"
     OCCUPANCY = "OCCUPANCY"
@@ -172,6 +179,7 @@ class CUBA(Enum):
     RADIUS = "RADIUS"
     REFERENCE_DENSITY = "REFERENCE_DENSITY"
     RELATIVE_VELOCITY = "RELATIVE_VELOCITY"
+    RELATIVE_VELOCITY_MODEL = "RELATIVE_VELOCITY_MODEL"
     RELAXATION_TIME = "RELAXATION_TIME"
     RESTITUTION_COEFFICIENT = "RESTITUTION_COEFFICIENT"
     RHEOLOGY_MODEL = "RHEOLOGY_MODEL"
@@ -183,18 +191,24 @@ class CUBA(Enum):
     SHAPE_LENGTH_UC = "SHAPE_LENGTH_UC"
     SHAPE_RADIUS = "SHAPE_RADIUS"
     SHAPE_SIDE = "SHAPE_SIDE"
+    SHEAR_STRESS_POWER_LAW_SLIP_VELOCITY = "SHEAR_STRESS_POWER_LAW_SLIP_VELOCITY"  # noqa
+    SIMPLE_RELATIVE_VELOCITY_MODEL = "SIMPLE_RELATIVE_VELOCITY_MODEL"
     SIMULATION_DOMAIN_DIMENSIONS = "SIMULATION_DOMAIN_DIMENSIONS"
     SIMULATION_DOMAIN_ORIGIN = "SIMULATION_DOMAIN_ORIGIN"
     SINGLE_PHASE_MODEL = "SINGLE_PHASE_MODEL"
     SIZE = "SIZE"
     SJKR_COHESION_FORCE = "SJKR_COHESION_FORCE"
+    SLIP_VELOCITY = "SLIP_VELOCITY"
     SMOOTHING_LENGTH = "SMOOTHING_LENGTH"
     SOFTWARE_TOOL = "SOFTWARE_TOOL"
     SOLVER_PARAMETER = "SOLVER_PARAMETER"
     SPH = "SPH"
     SPHERICITY = "SPHERICITY"
+    STANDARD_STRESS_MODEL = "STANDARD_STRESS_MODEL"
     STATUS = "STATUS"
+    STEADY_STATE = "STEADY_STATE"
     STRAIN_TENSOR = "STRAIN_TENSOR"
+    STRESS_MODEL = "STRESS_MODEL"
     STRESS_TENSOR = "STRESS_TENSOR"
     SURFACE_TENSION = "SURFACE_TENSION"
     SURFACE_TENSION_RELATION = "SURFACE_TENSION_RELATION"
@@ -221,5 +235,6 @@ class CUBA(Enum):
     VOLUME = "VOLUME"
     VOLUME_FRACTION = "VOLUME_FRACTION"
     VOLUME_FRACTION_GRADIENT = "VOLUME_FRACTION_GRADIENT"
+    WETTING_ANGLE = "WETTING_ANGLE"
     YOUNG_MODULUS = "YOUNG_MODULUS"
     ZETA_POTENTIAL = "ZETA_POTENTIAL"