Merge pull request #272 from simphony/int-number-of-time-steps

set dtype of NUMBER_OF_TIME_STEPS to be Int
simphony · Jan 19, 2016 · 353a0a8 · 353a0a8
2 parents a951cc5 + 80969ab
commit 353a0a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/doc/source/cuba.rst b/doc/source/cuba.rst
@@ -52,7 +52,7 @@ DebyeLength                 Electrostatic effects of particles in solution
 SmoothingLength             Half of kernel cut-off for all splines                                                ['SPH']                                            SMOOTHING_LENGTH                     46  [1]      double
 LatticeSpacing              Distance between adjacent lattice nodes                                               ['LBM']                                            LATTICE_SPACING                      47  [1]      double
 TimeStep                    Length of a discrete time step                                                        ['DEM', 'FEM', 'FVM', 'LBM']                       TIME_STEP                            48  [1]      double
-NumberOfTimeSteps           Number of discrete time steps                                                         ['DEM', 'FEM', 'FVM', 'LBM']                       NUMBER_OF_TIME_STEPS                 49  [1]      double
+NumberOfTimeSteps           Number of discrete time steps                                                         ['DEM', 'FEM', 'FVM', 'LBM']                       NUMBER_OF_TIME_STEPS                 49  [1]      integer
 Force                       Force                                                                                 ['DEM', 'LBM', 'SPH']                              FORCE                                50  [3]      double
 Torque                      Torque                                                                                ['DEM']                                            TORQUE                               51  [3]      double
 Density                     Density                                                                               ['DEM', 'FEM', 'FVM', 'LBM', 'SPH']                DENSITY                              52  [1]      double

diff --git a/simphony/core/cuba.yml b/simphony/core/cuba.yml
@@ -347,7 +347,7 @@
   name: NumberOfTimeSteps
   number: 49
   shape: [1]
-  type: double
+  type: integer
 - description: Force
   domain: [DEM, LBM, SPH]
   key: FORCE

diff --git a/simphony/core/keywords.py b/simphony/core/keywords.py
@@ -410,7 +410,7 @@
         key='NUMBER_OF_TIME_STEPS',
         number=49,
         shape=[1],
-        dtype=numpy.float64),
+        dtype=numpy.int32),
     'FORCE': Keyword(
         name='Force',
         description='Force',  # noqa