div_ops: Compile with METRIC_3D - #577
Conversation
Modify Div_par_fvv and Div_par_fvv_heating so that they compile with 3D metrics.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #577 +/- ##
==========================================
+ Coverage 57.53% 57.73% +0.19%
==========================================
Files 98 97 -1
Lines 10223 10013 -210
Branches 1466 1443 -23
==========================================
- Hits 5882 5781 -101
+ Misses 3753 3652 -101
+ Partials 588 580 -8 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Dataset.hermes.extract_[12]_tokamak_geometry() calls now result in an
error:
```
Traceback (most recent call last):
File "/home/runner/work/hermes-3/hermes-3/build/tests/integrated/2D-recycling/runtest", line 144, in <module>
ds = ds.hermes.extract_2d_tokamak_geometry()
File "/home/runner/.local/lib/python3.10/site-packages/xhermes/accessors.py", line 172, in extract_2d_tokamak_geometry
raise Exception(
Exception: extract_2d_tokamak_geometry was called twice! Note: this is now done automatically upon loading
```
bshanahan
left a comment
bshanahan
left a comment
There was a problem hiding this comment.
Looks OK to me -- don't think the test failures are related to this PR.
|
The testing coverage is not really helpful, as so far 3D metrics only enables compiling. There will be more tests coming. |
1464e39 to
1759944
Compare
76b29b8 to
2501793
Compare
Include Conduction_Methods to Div_par_K_Grad_par_mod
This is not a compiletime choice any more
ZedThree
left a comment
ZedThree
left a comment
There was a problem hiding this comment.
LGTM! Just tons of small but obvious fixes for 3D metrics
| .withDefault<bool>(true); | ||
|
|
||
| conduction_method = | ||
| options["conduction_method"].withDefault<std::string>(conduction_method); |
There was a problem hiding this comment.
This is possibly now out of sync with BOUT++ and needs to be an enum, but maybe this PR can go in first and then that's a simple update?
There was a problem hiding this comment.
Indeed, I would need to update BOUT++ to the final version that got merged, and then update here.
I will make a PR into this one, then you can decide on the order of merging.
There was a problem hiding this comment.
With boutproject/BOUT-dev#3425 merged, it probably makes sense to first merge this, and then later update to BOUT++ and update this too.
4 participants
Modify Div_par_fvv and Div_par_fvv_heating so that they compile with 3D metrics.
Maybe helps address issue #573
Ready to merge. The patch coverage is below the threshold, but code coverage increases with this PR because a lot of uncovered code is removed (or rather, moved to BOUT-dev).