Initial Release #1

dean-krueger · 2024-03-01T22:33:03Z

No description provided.

NybergWISC

Looks good to me overall. There are a few definitions that we should check with people who know more about fusion systems generally and comments/tooltips to clean up but great job getting version 0 up and running so quickly!

src/reactor.h

src/reactor.cc

nuclearkatie

Noted a few administrative things like defaults and extra comments left in the code, and made a few suggestions about how to use uitypes to restrict the values your users can submit

src/reactor.h

src/reactor.cc

gonuke

Here's a first pass. Definitely should have been talking about the meat of your modeling choices, but maybe you've been doing that with others?

README.rst

src/reactor.h

src/reactor.cc

src/reactor.h

gonuke · 2024-03-07T03:05:56Z

src/reactor.h

+/// Place a description of the detailed behavior of the agent. Consider
+/// describing the behavior at the tick and tock as well as the behavior
+/// upon sending and receiving materials and messages.
+class Reactor : public cyclus::Facility  {


You may want to call this a FusionPowerPlant just to be clear that it's different from a fission Reactor

gonuke

A bunch of comments on code readability here.

src/reactor.cc

src/reactor.h

…nted code

Co-authored-by: Katie Mummah <[email protected]>

gonuke · 2024-03-15T03:17:05Z

Putting this before your ascii art will make it format correctly, I think:

.. code-block:: bash

It might also work to put a triple back tick before/after: ```

README.rst

src/reactor.cc

…iate changes to unit tests, cleaned up

…e commented code

gonuke

A number of additional tips... you're reinventing the wheel in a few places

src/reactor.cc

src/reactor.h

src/reactor.cc

gonuke

More thoughts

src/reactor.cc

Co-authored-by: Paul Wilson <[email protected]>

gonuke

one simplifying suggestion for a conditional

src/reactor.cc

…lify

…h matquery

…ixed Li7 bug

gonuke

Definitely looking cleaner and more readable! A few more quick comments while you are in the middle of edits.

src/reactor.cc

gonuke

continued march towards a simpler chemistry math - all-in on moles

gonuke · 2024-04-28T19:07:08Z

src/reactor.cc

+  cyclus::Facility::EnterNotify();
+
+  fuel_usage_mass = (burn_rate * (fusion_power / MW_to_GW) / seconds_per_year * context()->dt());
+  fuel_usage_atoms = fuel_usage_mass / tritium_atomic_mass;


since you've switched to moles, why not make this moles instead of atoms, and all of your atomic masses can be molar masses....

gonuke

Now that the code is more readable, we should revisit your modeling choices and function names.

gonuke · 2024-04-28T19:17:30Z

src/reactor.cc

+#include "reactor.h"
+
+#include "boost/shared_ptr.hpp"
+


consider including some of these to reduce the need to fully specify the namespace of frequently used cyclus classes:

using cyclus::Material; using cyclus::Composition; using cyclus::toolkit::ResBuf; using cyclus::toolkit::MatVec; using cyclus::KeyError; using cyclus::ValueError; using cyclus::Request; using cyclus::CompMap;

gonuke · 2024-04-28T19:18:30Z

src/reactor.cc

+  fuel_usage_atoms = fuel_usage_mass / tritium_atomic_mass;
+  blanket_turnover = blanket_size * blanket_turnover_rate;
+
+  fuel_startup_policy


We should discuss all these policies at a fuel cycle meeting with @nuclearkatie present. My hunch is that there is an easier way to accomplish what you want.

gonuke · 2024-04-28T19:19:48Z

src/reactor.cc

+  if (!tritium_storage.empty() && sufficient_tritium_for_operation) {
+    double surplus = std::max(
+      tritium_storage.quantity() - reserve_inventory, 0.0);
+
+    if (surplus > 0.0) {
+
+      tritium_excess.Push(tritium_storage.Pop(surplus));
+      CombineInventory(tritium_excess);
+
+      RecordOperationalInfo(
+          "Tritium Moved",
+          std::to_string(surplus) + "kg of T moved from storage to excess");
+    }
+  }


Maybe put this in a function called StoreExcessTritium() for readability.

Similarly, the next block could be StoreBlanketTritium() or something like that??

gonuke · 2024-04-28T19:23:27Z

src/reactor.cc

+    blanket_mat = cyclus::Material::Create(this, new_mass,
+                    cyclus::Composition::CreateFromAtom(depleted_comp));


This is cyclus-dangerous since your old material just vaporizes and you create a new one from nothing here with a different id

I had a bad feeling that this was illegal, but it seemed like the most straightforward way to get this to work. I'll come up with a different way to do this.

We should look at what the RecipeReator does in Cycamore. I may be overly cautious here, but it seems like it will be hard to do any material accountability if materials just cease to exist

I actually figured out a way to just not do this and have everything still work. Fairly certain this version isn't cyclus-dangerous, but I'll leave discussing it in the fuel cycle meeting notes for today, and maybe we can have a broader discussion about the finer points of not doing this (I think I get the broad strokes of what isn't allowed for the most part, especially after you pointed this out)

gonuke · 2024-04-28T19:24:28Z

src/reactor.cc

+  DepleteBlanket(atoms_burned/avagadros_number * TBR);
+  cyclus::Material::Ptr mat = blanket.Pop();


The last thing that DepleteBlanket() does is push a material onto the buffer and then the first thing you do here is pop it off the buffer again. Maybe DepleteBlanket() should just return the material ptr?

nuclearkatie · 2024-04-30T21:47:01Z

src/reactor.cc

+  cyclus::compmath::Normalize(&c, 1);
+
+  if (tritium_storage.quantity() < startup_inventory){
+    throw cyclus::ValueError(


Do you actually want this to throw a ValueError and break the simulation, or just not start up at this point?

Make a copy of Dean’s branch

Add github action to test build

dean-krueger and others added 7 commits March 1, 2024 16:25

Starting point based on cyclus_fusion

800dfc0

Fixed Lithium over extraction crashing code, simplified OperateReactor

64fc99e

Added some unit tests, fixed some bugs

7a281f1

added unit tests and fixed the formatting mistake of last week

56d94b5

Added schedule buy, reworked EnterNotify() to match new cyclus

eefc5fd

added EnterNotify() unit tests

97289fd

Formatted all code except reactor.h, tested correctly with no breaks

faad810

dean-krueger marked this pull request as ready for review March 3, 2024 18:20

NybergWISC reviewed Mar 6, 2024

View reviewed changes

nuclearkatie reviewed Mar 6, 2024

View reviewed changes

gonuke requested changes Mar 7, 2024

View reviewed changes

gonuke requested changes Mar 9, 2024

View reviewed changes

kroogs3 and others added 11 commits March 14, 2024 16:23

made Li7_contribution a cyclus var, set default to 0.03, delted comme…

4065e4a

…nted code

fixed default language at begining of header

a3dbbc5

changed default note to describe agent

0256d9c

Added UI Type to Fusion Power

dcd1b01

Co-authored-by: Katie Mummah <[email protected]>

added uitypes to variables, changed buy_frequency from double to int

cace768

added combobox to refuel_mode as suggested

534d171

deleted commented code from reactor.h

530240e

changed README from default Hello, Cyclus! Still a placeholder

dc6a0ba

Tried to fix readme formatting for website

a64a881

Second attempt at fixing readme file formatting

5e88457

removed ascii art from readme

30ba796

gonuke requested changes Mar 15, 2024

View reviewed changes

README.rst Show resolved Hide resolved

src/reactor.cc Outdated Show resolved Hide resolved

dean-krueger added 5 commits April 7, 2024 18:39

changed internal inventories to better match Abdou 2021, made appropr…

97c2dec

…iate changes to unit tests, cleaned up

added test case for 0% and 100% Li7_contribution, cleaned up some mor…

1aa8ee1

…e commented code

simplified the way spent blanket material is popped for disposal

ddb2bbc

added blanket_turnover variable to only calculate that value once

30fd9de

new attempt at fixing README. Deleted README.md (redundant)

8ed0747

dean-krueger requested a review from NybergWISC April 15, 2024 01:40

gonuke requested changes Apr 15, 2024

View reviewed changes

src/reactor.cc Outdated Show resolved Hide resolved

src/reactor.cc Outdated Show resolved Hide resolved

dean-krueger and others added 9 commits April 21, 2024 13:58

simplified removal of surplus from storage with pop(qty)

c428ea2

added buffer for spent lithium, and record it in the inventories table

cfa03de

changed GetComp to compmath::AlmostEq() with a 1e-7 threshold

3920d35

remove extra parentheses in if statement

d0e5f3e

Co-authored-by: Paul Wilson <[email protected]>

changed the startup if/else block to be more readable

c536e38

trying to resolve changes after a pull, doing what git said to do...

a889a86

last commit was just the conflicting files bit, this one should fix it

994096d

changed the conditional behavior of blanket cycling

2e84bc0

changed atomic masses source from wolfram to pyne

032ec4d

gonuke requested changes Apr 21, 2024

View reviewed changes

src/reactor.cc Outdated Show resolved Hide resolved

changed number of seconds in a year to match cyclus

14deba4

gonuke reviewed Apr 26, 2024

View reviewed changes

src/reactor.cc Outdated Show resolved Hide resolved

dean-krueger added 6 commits April 27, 2024 10:14

removed unused str method, moved conditional in blanket cycle to simp…

fe6dff0

…lify

changed sequestered_tritium from a resbuf to a materail

34a83f1

removed several instances of compmap c --> normalize and replaced wit…

5b8e2a4

…h matquery

removed GetComp() function and modified relevant unit tests

beb87c2

changed DepleteBlanket from mass to atom basis, simplified greatly, f…

71564a0

…ixed Li7 bug

cleaned up comments and commented code

3f7bcc9

gonuke requested changes Apr 28, 2024

View reviewed changes

src/reactor.cc Outdated Show resolved Hide resolved

src/reactor.cc Outdated Show resolved Hide resolved

src/reactor.cc Outdated Show resolved Hide resolved

changed atom to mole basis in depleteblanket, cleaned up code some more

a887c77

gonuke requested changes Apr 28, 2024

View reviewed changes

dean-krueger added 2 commits April 30, 2024 13:50

fixed cyclus-dangerous method of depleting blanket

431b3d4

removed uncaught std::cout statement

75ad3d0

nuclearkatie reviewed Apr 30, 2024

View reviewed changes

gonuke added a commit that referenced this pull request Oct 26, 2024

Merge pull request #1 from dean-krueger/enter-notify

ebd331f

Make a copy of Dean’s branch

gonuke pushed a commit that referenced this pull request Oct 26, 2024

Merge pull request #1 from gonuke/enter-notify

721fd0d

Add github action to test build

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial Release #1

Initial Release #1

dean-krueger commented Mar 1, 2024

NybergWISC left a comment

nuclearkatie left a comment

gonuke left a comment

gonuke Mar 7, 2024

gonuke left a comment

gonuke commented Mar 15, 2024 •

edited

Loading

gonuke left a comment

gonuke left a comment

gonuke left a comment

gonuke left a comment

gonuke left a comment

gonuke Apr 28, 2024

gonuke left a comment

gonuke Apr 28, 2024

gonuke Apr 28, 2024

gonuke Apr 28, 2024

gonuke Apr 28, 2024

gonuke Apr 28, 2024

dean-krueger Apr 29, 2024

gonuke Apr 29, 2024

dean-krueger Apr 30, 2024

gonuke Apr 28, 2024

nuclearkatie Apr 30, 2024

		blanket_mat = cyclus::Material::Create(this, new_mass,
		cyclus::Composition::CreateFromAtom(depleted_comp));

		DepleteBlanket(atoms_burned/avagadros_number * TBR);
		cyclus::Material::Ptr mat = blanket.Pop();

		#include "reactor.h"

		#include "boost/shared_ptr.hpp"

Initial Release #1

Are you sure you want to change the base?

Initial Release #1

Conversation

dean-krueger commented Mar 1, 2024

NybergWISC left a comment

Choose a reason for hiding this comment

nuclearkatie left a comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

gonuke commented Mar 15, 2024 • edited Loading

gonuke left a comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gonuke commented Mar 15, 2024 •

edited

Loading