Skip to content

Commit

Permalink
Merge branch 'rwcarlsen-nodecay' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@scopatz
scopatz committed May 26, 2014
2 parents e301d93 + 43d9940 commit b6ce975
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 17 deletions.
1 change: 0 additions & 1 deletion input/batch_reactor/batch_rxtr_2_cycles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<duration>27</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>0</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/batch_reactor/batch_rxtr_lifetime.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ reasonably for its lifetime. -->
<duration>482</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>0</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/batch_reactor/hwr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>482</duration>
<startmonth>11</startmonth>
<startyear>2007</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/batch_reactor/lwr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>482</duration>
<startmonth>11</startmonth>
<startyear>2007</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/batch_reactor/preferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ commodity. -->
<duration>10</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/enrichment/1_src_enr_rxtr_sink.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>10</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/enrichment/linear_src_enr_rxtr_sink.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>12</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/enrichment/natu_capacitated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>12</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/enrichment/swu_capacitated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>12</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/growthtest/source_sink_linear.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>10</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/minimal-input/source_1_lifetime_sink_1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>10</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/minimal-input/source_1_sink_1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>10</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/minimal-input/source_3_lifetime_sink_1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>10</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/minimal-input/source_3_sink_1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>10</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity>
Expand Down
1 change: 0 additions & 1 deletion input/physor/1_Enrichment_2_Reactor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>4</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>2</decay>
</control>

<commodity> <name>natl_u</name> </commodity>
Expand Down
1 change: 0 additions & 1 deletion input/physor/2_Sources_3_Reactors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>5</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>0</decay>
</control>

<commodity> <name>uox</name> </commodity>
Expand Down
1 change: 0 additions & 1 deletion tests/Inputs/dynamic_capacitated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<duration>4</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
<decay>0</decay>
</control>

<commodity>
Expand Down

0 comments on commit b6ce975

Please sign in to comment.