Merge pull request #437 from aglenn2/anno

updated metadata
cyclus · Nov 4, 2016 · cbd2741 · cbd2741
2 parents eeba76a + 6144398
commit cbd2741
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/src/sink.h b/src/sink.h
@@ -106,24 +106,30 @@ class Sink : public cyclus::Facility  {
                       "uitype": ["oneormore", "incommodity"]}
   std::vector<std::string> in_commods;
 
-  #pragma cyclus var {"default": "", "tooltip": "requested composition", \
+  #pragma cyclus var {"default": "", \
+                      "tooltip": "requested composition", \
                       "doc": "name of recipe to use for material requests, " \
                              "where the default (empty string) is to accept " \
                              "everything", \
-                       "uilabel": "Input Recipe", \
+                      "uilabel": "Input Recipe", \
                       "uitype": "recipe"}
   std::string recipe_name;
 
   /// max inventory size
   #pragma cyclus var {"default": 1e299, \
                       "tooltip": "sink maximum inventory size", \
                       "uilabel": "Maximum Inventory", \
+                      "uitype": "range", \
+                      "range": [0.0, 1e299], \
                       "doc": "total maximum inventory size of sink facility"}
   double max_inv_size;
 
   /// monthly acceptance capacity
-  #pragma cyclus var {"default": 1e299, "tooltip": "sink capacity", \
+  #pragma cyclus var {"default": 1e299, \ 
+                      "tooltip": "sink capacity", \
                       "uilabel": "Maximum Throughput", \
+                      "uitype": "range", \
+                      "range": [0.0, 1e299], \
                       "doc": "capacity the sink facility can " \
                              "accept at each time step"}
   double capacity;

diff --git a/src/source.h b/src/source.h
@@ -97,6 +97,8 @@ class Source : public cyclus::Facility,
            "quantity.  When it reaches zero, the source cannot provide any " \
            " more material.", \
     "default": 1e299, \
+    "uitype": "range", \
+    "range": [0.0, 1e299], \
     "uilabel": "Initial Inventory", \
     "units": "kg", \
   }
@@ -107,6 +109,8 @@ class Source : public cyclus::Facility,
     "tooltip": "per time step throughput", \
     "units": "kg/(time step)", \
     "uilabel": "Maximum Throughput", \
+    "uitype": "range", \
+    "range": [0.0, 1e299], \
     "doc": "amount of commodity that can be supplied at each time step", \
   }
   double throughput;

diff --git a/src/storage.h b/src/storage.h
@@ -135,7 +135,9 @@ class Storage
   #pragma cyclus var {"default": [],\
                       "doc":"preferences for each of the given commodities, in the same order."\
                       "Defauts to 1 if unspecified",\
-                      "uilabel":"In Commody Preferences"}
+                      "uilabel":"In Commody Preferences", \
+                      "range": [None, [1e-299, 1e299]], \
+                      "uitype":["oneormore", "range"]}
   std::vector<double> in_commod_prefs;
 
   #pragma cyclus var {"tooltip":"output commodity",\
@@ -156,29 +158,35 @@ class Storage
                       "tooltip":"residence time (timesteps)",\
                       "doc":"the minimum holding time for a received commodity (timesteps).",\
                       "units":"time steps",\
-                      "uilabel":"Residence Time"}
+                      "uilabel":"Residence Time", \
+                      "uitype": "range", \
+                      "range": [0, 12000]}
   int residence_time;
 
   #pragma cyclus var {"default": 1e299,\
                      "tooltip":"throughput per timestep (kg)",\
                      "doc":"the max amount that can be moved through the facility per timestep (kg)",\
                      "uilabel":"Throughput",\
+                     "uitype": "range", \
+                     "range": [0.0, 1e299], \
                      "units":"kg"}
   double throughput;
 
   #pragma cyclus var {"default": 1e299,\
                       "tooltip":"maximum inventory size (kg)",\
                       "doc":"the maximum amount of material that can be in all storage buffer stages",\
                       "uilabel":"Maximum Inventory Size",\
+                      "uitype": "range", \
+                      "range": [0.0, 1e299], \
                       "units":"kg"}
   double max_inv_size; 
 
   #pragma cyclus var {"default": False,\
                       "tooltip":"Bool to determine how Storage handles batches",\
                       "doc":"Determines if Storage will divide resource objects. Only controls material "\
-                      "handling within this facility, has no effect on DRE material handling. "\
-                      "If true, batches are handled as discrete quanta, neither split nor combined. "\
-                      "Otherwise, batches may be divided during processing. Default to false (continuous))",\
+                            "handling within this facility, has no effect on DRE material handling. "\
+                            "If true, batches are handled as discrete quanta, neither split nor combined. "\
+                            "Otherwise, batches may be divided during processing. Default to false (continuous))",\
                       "uilabel":"Batch Handling"}
   bool discrete_handling;