From f46c46f0155c20b109b14d6c15e8ffe00c468573 Mon Sep 17 00:00:00 2001 From: aglenn2 <12aglenn34@gmail.com> Date: Wed, 9 Nov 2016 20:29:20 -0500 Subject: [PATCH 1/5] updated metadata --- src/enrichment.h | 6 +++++- src/fuel_fab.h | 3 +++ src/mixer.h | 4 ++++ src/separations.h | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/enrichment.h b/src/enrichment.h index 243eb6703d..fd88ea9a82 100644 --- a/src/enrichment.h +++ b/src/enrichment.h @@ -314,7 +314,9 @@ class Enrichment : public cyclus::Facility { #pragma cyclus var { \ "default": 1e299, "tooltip": "max inventory of feed material (kg)", \ - "uilabel": "Maximum Feed Inventory", \ + "uilabel": "Maximum Feed Inventory", \ + "uitype": "range", \ + "range": [0.0, 1e299], \ \ "doc": "maximum total inventory of natural uranium in " \ "the enrichment facility (kg)" \ } @@ -350,6 +352,8 @@ class Enrichment : public cyclus::Facility { "default": 1e299, \ "tooltip": "SWU capacity (kgSWU/month)", \ "uilabel": "SWU Capacity", \ + "uitype": "range", \ + "range": [0.0, 1e299], \ "doc": "separative work unit (SWU) capacity of enrichment " \ "facility (kgSWU/timestep) " \ } diff --git a/src/fuel_fab.h b/src/fuel_fab.h index 9fe257f5ce..a30ddf8ff8 100644 --- a/src/fuel_fab.h +++ b/src/fuel_fab.h @@ -232,6 +232,9 @@ class FuelFab : public cyclus::Facility { "doc": "Maximum number of kg of fuel material that can be supplied per time step.", \ "uilabel": "Maximum Throughput", \ "units": "kg", \ + "default": 1e299 \ + "uitype": "range", \ + "range": [0.0, 1e299], \ } double throughput; diff --git a/src/mixer.h b/src/mixer.h index 3ab2d35d61..2180b034af 100644 --- a/src/mixer.h +++ b/src/mixer.h @@ -84,6 +84,8 @@ class Mixer : public cyclus::Facility { " available.", \ "uilabel": "Maximum Leftover Inventory", \ "default": 1e299, \ + "uitype": "range", \ + "range": [0.0, 1e299], \ "units": "kg", \ } double out_buf_size; @@ -95,6 +97,8 @@ class Mixer : public cyclus::Facility { "default": 1e299, \ "doc": "Maximum number of kg of fuel material that can be mixed per time step.", \ "uilabel": "Maximum Throughput", \ + "uitype": "range", \ + "range": [0.0, 1e299], \ "units": "kg", \ } double throughput; diff --git a/src/separations.h b/src/separations.h index aa0184c646..b226dc9c82 100644 --- a/src/separations.h +++ b/src/separations.h @@ -145,6 +145,9 @@ class Separations : public cyclus::Facility { "doc" : "Maximum quantity of feed material that can be processed per time "\ "step.", \ "uilabel": "Maximum Separations Throughput", \ + "default": 1e299, \ + "uitype": "range", \ + "range": [0.0, 1e299], \ "units": "kg/(time step)", \ } double throughput; @@ -166,6 +169,8 @@ class Separations : public cyclus::Facility { "available.", \ "uilabel": "Maximum Leftover Inventory", \ "default": 1e299, \ + "uitype": "range", \ + "range": [0.0, 1e299], \ "units": "kg", \ } double leftoverbuf_size; From 01bd60f4e4bbc87a322c0f0202a56fed33f4ea0c Mon Sep 17 00:00:00 2001 From: aglenn2 <12aglenn34@gmail.com> Date: Wed, 9 Nov 2016 20:40:04 -0500 Subject: [PATCH 2/5] fixed error in fuel_fab.h --- src/fuel_fab.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fuel_fab.h b/src/fuel_fab.h index a30ddf8ff8..5f8cdc3ced 100644 --- a/src/fuel_fab.h +++ b/src/fuel_fab.h @@ -232,7 +232,7 @@ class FuelFab : public cyclus::Facility { "doc": "Maximum number of kg of fuel material that can be supplied per time step.", \ "uilabel": "Maximum Throughput", \ "units": "kg", \ - "default": 1e299 \ + "default": 1e299, \ "uitype": "range", \ "range": [0.0, 1e299], \ } From b4c1767d3f4bf3494bb45293b07e3c3d6a09dd10 Mon Sep 17 00:00:00 2001 From: aglenn2 <12aglenn34@gmail.com> Date: Wed, 9 Nov 2016 20:47:29 -0500 Subject: [PATCH 3/5] fixed error in enrichment.h --- src/enrichment.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/enrichment.h b/src/enrichment.h index fd88ea9a82..6ce48de32b 100644 --- a/src/enrichment.h +++ b/src/enrichment.h @@ -316,7 +316,7 @@ class Enrichment : public cyclus::Facility { "default": 1e299, "tooltip": "max inventory of feed material (kg)", \ "uilabel": "Maximum Feed Inventory", \ "uitype": "range", \ - "range": [0.0, 1e299], \ \ + "range": [0.0, 1e299], \ "doc": "maximum total inventory of natural uranium in " \ "the enrichment facility (kg)" \ } From 7fd37d5b3d42afb77f8cbc3939e87a6d0b397977 Mon Sep 17 00:00:00 2001 From: aglenn2 <12aglenn34@gmail.com> Date: Fri, 11 Nov 2016 08:48:45 -0500 Subject: [PATCH 4/5] updated metadata --- src/enrichment.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/enrichment.h b/src/enrichment.h index 6ce48de32b..52a32aa620 100644 --- a/src/enrichment.h +++ b/src/enrichment.h @@ -325,7 +325,7 @@ class Enrichment : public cyclus::Facility { #pragma cyclus var { \ "default": 1.0, \ "tooltip": "maximum allowed enrichment fraction", \ - "doc": "maximum allowed weight fraction of U235 in product",\ + "doc": "maximum allowed weight fraction of U235 in product", \ "uilabel": "Maximum Allowed Enrichment", \ "schema": '' \ ' ' \ From d09c55f5d9e85477399c63193e3b2f3b030efeca Mon Sep 17 00:00:00 2001 From: aglenn2 <12aglenn34@gmail.com> Date: Fri, 11 Nov 2016 10:14:33 -0500 Subject: [PATCH 5/5] fixed spacing issue in enrichment.h --- src/enrichment.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/enrichment.h b/src/enrichment.h index 52a32aa620..b6767afb4c 100644 --- a/src/enrichment.h +++ b/src/enrichment.h @@ -316,7 +316,7 @@ class Enrichment : public cyclus::Facility { "default": 1e299, "tooltip": "max inventory of feed material (kg)", \ "uilabel": "Maximum Feed Inventory", \ "uitype": "range", \ - "range": [0.0, 1e299], \ + "range": [0.0, 1e299], \ "doc": "maximum total inventory of natural uranium in " \ "the enrichment facility (kg)" \ }