Skip to content
This repository has been archived by the owner on Aug 15, 2023. It is now read-only.

odw.Model #110

Merged
merged 27 commits into from
Mar 2, 2022
Merged

odw.Model #110

merged 27 commits into from
Mar 2, 2022

Conversation

RemDelaporteMathurin
Copy link
Member

As discussed in #107 this PR introduces a new odw.Model class inheriting from openmc.Model.

Since this class stores the geometry, materials, tallies and settings, it makes sense to do all the communication between them in there.

@RemDelaporteMathurin RemDelaporteMathurin marked this pull request as ready for review February 15, 2022 14:34
@RemDelaporteMathurin
Copy link
Member Author

@shimwell maybe we should hold this off until the CI is back on?
If I accidentally introduced some bugs here, it will be a nightmare to debug because we are completely blind

@RemDelaporteMathurin
Copy link
Member Author

@shimwell I lost track, do we have a repo with the files for the test suite?

@shimwell
Copy link
Member

Sorry I still don't have a repo with the test files

@shimwell
Copy link
Member

Getting closer to having a repo with files to download

The last docker release was able to produce files from example 1

https://github.com/fusion-energy/fusion_neutronics_workflow/releases/tag/develop

@shimwell
Copy link
Member

The h5m files are now being downloaded by the test scripts and the tests are running again. Many are failing but this is something we can work with

@RemDelaporteMathurin
Copy link
Member Author

The h5m files are now being downloaded by the test scripts and the tests are running again. Many are failing but this is something we can work with

Maybe we can work at fixing these tests in develop before merging this. We should try and stop merging PRs when tests don't work :(

@shimwell
Copy link
Member

Yes sure, I meant work on this PR to fix things up.

@shimwell
Copy link
Member

shimwell commented Mar 2, 2022

Down to 18 failing tests 📉

lots of the failing tests are for the same reason

AttributeError: 'RegularMesh2D' object has no attribute 'mesh_resolution'

@RemDelaporteMathurin
Copy link
Member Author

RemDelaporteMathurin commented Mar 2, 2022

Ah yes mesh_resolution is now resolution cause RegularMesh2D inherits from openmc.RegularMesh

Maybe this should be fixed in a seperate PR. I'll try to find some time to do it

@shimwell
Copy link
Member

shimwell commented Mar 2, 2022

@RemDelaporteMathurin I think I've just fixed that bug. Down to just 4 failing tests now

@shimwell
Copy link
Member

shimwell commented Mar 2, 2022

I'm hoping to get this passing all the tests and merged into develop today. Then perhaps we can take a step back and see what parts (if any) of this code are actually useful

@codecov
Copy link

codecov bot commented Mar 2, 2022

Codecov Report

Merging #110 (1b83d44) into develop (77958d8) will decrease coverage by 5.51%.
The diff coverage is 83.61%.

❗ Current head 1b83d44 differs from pull request most recent head 0c3f8bc. Consider uploading reports for the commit 0c3f8bc to get more accurate results

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #110      +/-   ##
===========================================
- Coverage    87.89%   82.38%   -5.52%     
===========================================
  Files            6       14       +8     
  Lines          314      352      +38     
===========================================
+ Hits           276      290      +14     
- Misses          38       62      +24     
Impacted Files Coverage Δ
...c_wrapper/tallies/mesh_tallies/tet_mesh_tallies.py 40.00% <40.00%> (ø)
openmc_dagmc_wrapper/model.py 50.00% <50.00%> (ø)
openmc_dagmc_wrapper/Materials.py 65.71% <66.66%> (-34.29%) ⬇️
openmc_dagmc_wrapper/Geometry.py 72.72% <80.00%> (-7.28%) ⬇️
openmc_dagmc_wrapper/mesh.py 81.08% <81.08%> (ø)
openmc_dagmc_wrapper/tallies/cell_tally.py 95.23% <95.23%> (ø)
openmc_dagmc_wrapper/Tally.py 100.00% <100.00%> (+11.11%) ⬆️
openmc_dagmc_wrapper/__init__.py 100.00% <100.00%> (ø)
openmc_dagmc_wrapper/tallies/__init__.py 100.00% <100.00%> (ø)
...nmc_dagmc_wrapper/tallies/mesh_tallies/__init__.py 100.00% <100.00%> (ø)
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bf0a185...0c3f8bc. Read the comment docs.

@shimwell
Copy link
Member

shimwell commented Mar 2, 2022

@RemDelaporteMathurin the tests are now passing I think this can be merged into the develop branch

@shimwell shimwell merged commit 073641d into develop Mar 2, 2022
@shimwell shimwell deleted the odw_model branch March 2, 2022 16:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants