Comments (3)
jbae11
commented on August 16, 2024
So currently the entire PR from the reprocessing branch is in one commit ("attempts to fix conflicts")
Would it be best for me to revert that commit from the arfc/transition-scenarios master branch
and then try to merge from the reprocessing branch?
If not, what'd be the best way to fix this mess?
thanks
from transition-scenarios.
katyhuff
commented on August 16, 2024
I don't think that's true. The following commits, from #36 are present in the master branch of the repository as well:
@jbae11 mox reactor template 43f8e59
@jbae11 added separations in input template b54be29
@jbae11 mox for french pwrs 69cc86f
@jbae11 fixes on input template 00e7972
@jbae11 fixes on input template to have reprocessing a2cccb5
@jbae11 sink takes uox, mox and reprocess waste bcce359
@jbae11 reprocessing eab122b
@jbae11 template change for reprocessing boolean d460b1c
@jbae11 script change for reprocessing boolean f1931f8
@jbae11 error fix with string d8d9610
@jbae11 minor error fix 5ad46da
@jbae11 ipynb for reprocessing 8e88fd7
@jbae11 ipynb changes wr.main -> wr.run 4a2b715
@jbae11 add function run for easy ipynb execution 8ae4780
@jbae11 reprocessing comparison ipynb ea96528
@jbae11 added isotope vs time 6f35143
@jbae11 fixed only cursor af5a6c9
@jbae11 fixed for cursor 3756681
@jbae11 fixed plot_power(cur) 38b0208
@jbae11 isotope vs time f3295e8
@jbae11 analysis update 2385920
@jbae11 isotope mass vs time - enable pyne.nucname again! 4cb3eb7
@jbae11 updated documentation c2b12a1
@jbae11 reenabled nucname 2861ae4
@jbae11 mox_fuel_recipe to iaea benchmark composition 076f57c
@jbae11 decay = lazy 11e6c13
@jbae11 added fr fuel composition 30a1d7e
@jbae11 spent uox composition to 52gWd/t at discharge from oecd-nea-SOAR-final bb332be
@jbae11 updated readme 836843d
@jbae11 fixed cursor error 1a7dfd3
@jbae11 legend size reconfig e3d65d0
@jbae11 updated ipynb 6e0bd73
@jbae11 moudlar influx and outflux function d1ba0a5
@jbae11 documentation ecbc1ea
@jbae11 major script fixes eb093b0
@jbae11 template fixes c61ee50
@jbae11 fixed day calculation 07f12b5
@jbae11 fixed DUnited Kingdomovony c5711cf
@jbae11 filters research reactors < 100MWe 78126f2
@jbae11 Reprocessing -> reprocessing 14a504e
@jbae11 source -> enrichment -> reactor -> separations -> fuelfab 549a5ca
@jbae11 pep8 bba061b
@jbae11 updated .gitignore 69cca8a
@jbae11 edited gitignore 7a5a977
Let's talk it out in person.
from transition-scenarios.
jbae11
commented on August 16, 2024
#37 Merged.
from transition-scenarios.
Related Issues (20)
- refactor non-d3ploy eg01-eg23 transition scenario HOT 1
- refactor non-d3ploy eg01-eg24 transition scenario HOT 1
- refactor non-d3ploy eg01-eg29 transition scenario HOT 1
- refactor non-d3ploy eg01-eg30 transition scenario HOT 1
- only one type of reactor is being deployed (eg01-eg30) HOT 2
- Circle-CI build error HOT 3
- Add a GH actions workflow for running unit tests for the `scripts` functions HOT 1
- CircleCI workflow is failing HOT 2
- Update `get_transactions` to bypass using the `Materials` metric HOT 1
- Feedback on deployment scheme HOT 15
- Clarify names for OAT analysis
- Change import commands HOT 2
- Initalize Narrative Docs HOT 1
- update the scenario_specification.md file in the input folder
- Publish release once HALEU transitions are complete HOT 2
- Add narrative to the docs
- Add docs examples
- Add Test Docs HOT 1
- Functionalize and document create_cyclus_input.py
- Add tests for waste_calcs HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from transition-scenarios.