diff --git a/CanonicalDescription/test1/README.md b/CanonicalDescription/test1/README.md
index 8f6a6ab..05e77e9 100644
--- a/CanonicalDescription/test1/README.md
+++ b/CanonicalDescription/test1/README.md
@@ -10,18 +10,18 @@ Definition
Reactor :
* Type: LWR,
* **Fuel**: UOX 3.25%w enriched uranium,
-* **Mass**: 82 tons (Oxyde Metal),
+* **Mass**: 82 tons (Oxide Metal),
* **Thermal Power**: 2875e6 W -- **Efficiency**: 34%,
-* **Discharge burn-up** : 43.03 GWd/t -- Full Cycle length 3y,
+* **Discharge burn-up** : 43.03 GWd/tonne -- Full Cycle length 3y,
* **Capacity factor**: 1,
* **Suggested recipes**:
* **Fresh UOX** :
* 235U : 3.25%w
* 238U : 96.75%w
* 16O : 13.44%w \
- * the %w are normalize to the quantity of uranium... but because the reactor fuel mass is given in oxyde metal, one provides also the corresponding oxygen quantity
+ * the %w are normalize to the quantity of uranium... but because the reactor fuel mass is given in Oxide metal, one provides also the corresponding oxygen quantity
- * **Used UOX** @43.03 GWd/t (atomic):
+ * **Used UOX** @43.03 GWd/tonne (atomic):
* 234U : 0.00026%
* 235U : 0.52485%
* 236U : 0.41405%
diff --git a/CanonicalDescription/test1/pb1.json b/CanonicalDescription/test1/pb1.json
index cb6d4f6..1fe410d 100644
--- a/CanonicalDescription/test1/pb1.json
+++ b/CanonicalDescription/test1/pb1.json
@@ -11,7 +11,7 @@
{"attributes": {"recipe": false},
"constraints": [],
"metadata": {
- "suggestedComposition": [
+ "suggested_composition": [
["U234", 0.00026],
["U235", 0.52485],
["U236", 0.41405],
@@ -38,29 +38,29 @@
"lwr_reactor": {
"metadata": {"type": "reactor"},
"attributes": {
- "thermalPower": ["float", "GWt"],
+ "thermal_power": ["float", "GWt"],
"efficiency": ["float", "percent"],
- "cycleLength": ["int", "EFPD"],
- "capacityFactor": ["float", "percent"],
+ "cycle_length": ["int", "EFPD"],
+ "capacity_factor": ["float", "percent"],
"lifetime": ["int", "year"],
"fuels": ["nea_pwr_uox"],
"batches": ["int", "", ["pwr_uox"]],
- "coreLoading": ["float", "tHM", ["pwr_uox"]],
+ "core_Loading": ["float", "tHM", ["pwr_uox"]],
"burnup": ["float", "GWd/tHM", ["pwr_uox"]],
- "storageTime": ["int", "year", ["pwr_uox"]],
- "coolingTime": ["int", "year", ["pwr_uox"]]
+ "storage_time": ["int", "year", ["pwr_uox"]],
+ "cooling_time": ["int", "year", ["pwr_uox"]]
},
"constraints": [
- ["thermalPower", 2.8387],
+ ["thermal_power", 2.8387],
["efficiency", 34.0],
- ["cycleLength", 365.25],
- ["capacityFactor", 100],
+ ["cycle+length", 365.25],
+ ["capacity_factor", 100],
["lifetime", 120],
["batches", 3, "pwr_uox"],
- ["coreLoading", 82, "pwr_uox"],
+ ["core_Loading", 82, "pwr_uox"],
["burnup", 43.03, "pwr_uox"],
- ["storageTime", 0, "pwr_uox"],
- ["coolingTime", 0, "pwr_uox"]],
+ ["storage_time", 0, "pwr_uox"],
+ ["cooling_time", 0, "pwr_uox"]],
"inputs": ["pwr_uox"],
"outputs": ["spent_pwr_uox"]
},
@@ -75,10 +75,10 @@
}
},
- "fuelCycle": {
+ "fuel_cycle": {
"attributes": {
"grid": "year",
- "initialConditions": {
+ "initial_conditions": {
"lwr_reactor_power": 1,
"repository": 1
},
diff --git a/CanonicalDescription/test2/README.md b/CanonicalDescription/test2/README.md
new file mode 100644
index 0000000..11a7d3b
--- /dev/null
+++ b/CanonicalDescription/test2/README.md
@@ -0,0 +1,46 @@
+Tests 2 : Two reactors over 120 years
+=============================================
+
+120 year simulation, 2 reactors, fixed fuel recipe, 120 years operation to be defined: reactor power, fuel burnup and associated recipes, (re)fueling strategy
+
+Definition
+----------------
+120 year simulation, 2 reactors, fixed fuel recipe, 120 years operation
+
+Reactor :
+* Type: LWR,
+* **Fuel**: UOX 3.25%w enriched uranium,
+* **Mass**: 82 tons (Oxide Metal),
+* **Thermal Power**: 2875e6 W -- **Efficiency**: 34%,
+* **Discharge burn-up** : 43.03 GWd/tonne -- Full Cycle length 3y,
+* **Capacity factor**: 1,
+* **Suggested recipes**:
+ * **Fresh UOX** :
+ * 235U : 3.25%w
+ * 238U : 96.75%w
+ * 16O : 13.44%w \
+ * the %w are normalize to the quantity of uranium... but because the reactor fuel mass is given in Oxide metal, one provides also the corresponding oxygen quantity
+
+ * **Used UOX** @43.03 GWd/tonne (atomic):
+ * 234U : 0.00026%
+ * 235U : 0.52485%
+ * 236U : 0.41405%
+ * 238U : 89.33000%
+ * 238Pu : 0.02294%
+ * 239Pu : 0.54288%
+ * 240Pu : 0.24718%
+ * 241Pu : 0.15922%
+ * 242Pu : 0.08248%
+ * 241Am : 0.00399%
+ * 242Am* : 0.00008%
+ * 243Am : 0.01890%
+ * 242Cm : 0.00208%
+ * 243Cm : 0.00005%
+ * 244Cm : 0.00771%
+ * 245Cm : 0.00049%
+ * 237Np : 0.05255%
+ * 16O : 191.34628%
+
+Output
+----------
+TBD
diff --git a/CanonicalDescription/test2/pb2.json b/CanonicalDescription/test2/pb2.json
index 2c63c08..6c7ac4b 100644
--- a/CanonicalDescription/test2/pb2.json
+++ b/CanonicalDescription/test2/pb2.json
@@ -1,2 +1,93 @@
{
+ "materials": {
+ "pwr_uox": {"attributes": {"recipe": true},
+ "constraints": [
+ ["U235", 3.25],
+ ["U238", 96.75],
+ ["O16", 13.44]],
+ "metadata": {}
+ },
+ "spent_pwr_uox":
+ {"attributes": {"recipe": false},
+ "constraints": [],
+ "metadata": {
+ "suggested_composition": [
+ ["U234", 0.00026],
+ ["U235", 0.52485],
+ ["U236", 0.41405],
+ ["U238", 89.33000],
+ ["PU238", 0.02294],
+ ["PU239", 0.54288],
+ ["PU240", 0.24718],
+ ["PU241", 0.15922],
+ ["PU242", 0.08248],
+ ["AM241", 0.00339],
+ ["AM242m", 0.00008],
+ ["AM243", 0.01890],
+ ["CM242", 0.00208],
+ ["CM243", 0.00005],
+ ["CM244", 0.00771],
+ ["CM245", 0.00049],
+ ["NP237", 0.05255],
+ ["O16", 191.34628]]
+ }
+ }
+ },
+
+ "facilities": {
+ "lwr_reactor": {
+ "metadata": {"type": "reactor"},
+ "attributes": {
+ "thermal_power": ["float", "GWt"],
+ "efficiency": ["float", "percent"],
+ "cycle_length": ["int", "EFPD"],
+ "capacity_factor": ["float", "percent"],
+ "lifetime": ["int", "year"],
+ "fuels": ["nea_pwr_uox"],
+ "batches": ["int", "", ["pwr_uox"]],
+ "core_Loading": ["float", "tHM", ["pwr_uox"]],
+ "burnup": ["float", "GWd/tHM", ["pwr_uox"]],
+ "storage_time": ["int", "year", ["pwr_uox"]],
+ "cooling_time": ["int", "year", ["pwr_uox"]]
+ },
+ "constraints": [
+ ["thermal_power", 2.8387],
+ ["efficiency", 34.0],
+ ["cycle+length", 365.25],
+ ["capacity_factor", 100],
+ ["lifetime", 120],
+ ["batches", 3, "pwr_uox"],
+ ["core_Loading", 82, "pwr_uox"],
+ ["burnup", 43.03, "pwr_uox"],
+ ["storage_time", 0, "pwr_uox"],
+ ["cooling_time", 0, "pwr_uox"]],
+ "inputs": ["pwr_uox"],
+ "outputs": ["spent_pwr_uox"]
+ },
+
+ "repository": {
+ "metadata": {
+ "type":"repository"
+ },
+ "attributes": {},
+ "constraints": [],
+ "inputs": ["spent_pwr_uox"]
+ }
+ },
+
+ "fuel_cycle": {
+ "attributes": {
+ "grid": "year",
+ "initial_conditions": {
+ "lwr_reactor_power": 2,
+ "repository": 1
+ },
+ "demands": {}
+ },
+ "constraints": {
+ "grid": [0, 120],
+ "demands": {}
+ }
+ }
+
}