Eq analysis tools update #3692

geograham · 2024-11-12T14:54:11Z

Closes

#3376

Description

Further additions/updates for the eq analysis feature branch.

See examples/equilibria/anaylsis_toolbox_examples.ex.py for how to use.

Checklist

I confirm that I have completed the following checks:

Tests run locally and pass pytest tests --reactor
Code quality checks run locally and pass pre-commit run --from-ref develop --to-ref HEAD
Documentation built locally and checked sphinx-build -W documentation/source documentation/build

sonarqubecloud · 2024-12-03T14:37:30Z

Quality Gate failed

Failed conditions
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

codecov · 2025-01-16T18:05:13Z

Codecov Report

Attention: Patch coverage is 23.61111% with 275 lines in your changes missing coverage. Please review.

Project coverage is 74.26%. Comparing base (76f1400) to head (ddc8225).

Files with missing lines	Patch %	Lines
bluemira/equilibria/analysis.py	0.00%	209 Missing ⚠️
bluemira/equilibria/plotting.py	15.71%	59 Missing ⚠️
bluemira/equilibria/solve.py	66.66%	5 Missing ⚠️
bluemira/equilibria/physics.py	66.66%	2 Missing ⚠️

Additional details and impacted files

@@                      Coverage Diff                      @@
##           feature/eq_analysis_tools    #3692      +/-   ##
=============================================================
- Coverage                      75.20%   74.26%   -0.94%     
=============================================================
  Files                            232      232              
  Lines                          27708    27998     +290     
=============================================================
- Hits                           20838    20793      -45     
- Misses                          6870     7205     +335

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

je-cook

Thanks for this, I've done an initial run through as this is getting quite large. Could we get some tests the make the plots you've added?

examples/equilibria/eudemo_2017.ex.py

examples/equilibria/anaylsis_toolbox_examples.ex.py

bluemira/equilibria/solve.py

bluemira/equilibria/find_legs.py

je-cook · 2025-01-23T14:43:56Z

This should solve all the conflicts easily git rebase --onto feature/eq_analysis_tools bd84305. After that I will reset the feature branch to this point so that all your new things are contained within this PR, unless you think otherwise?:

je-cook

On the whole really cool. I've been through it all once and run the two examples. We can have a hat about any of this that seems no necessarily straight forward.

I've commented on the example for when I would like the style adjusted or added to, it was easier than tracking it down in the code...

examples/equilibria/anaylsis_toolbox_examples.ex.py

je-cook · 2025-01-23T15:15:29Z

examples/equilibria/eudemo_2017.ex.py

@@ -300,17 +306,25 @@

 sof = deepcopy(reference_eq)

+diag_ops = EqDiagnosticOptions(
+    psi_diff=False, split_psi_plots=False, reference_eq=reference_eq


split_psi_plots is a bool here but this fails when running the notebook on plotting L742

je-cook · 2025-01-23T15:17:39Z

tests/equilibria/test_analysis.py

+        assert isinstance(ax4, Axes)
+
+    @pytest.mark.parametrize(
+        "legs_to_plot", [DivLegsToPlot.ALL, DivLegsToPlot.UP, DivLegsToPlot.LW]


ALL and UP fail for me locally

ALL: AssertionError: assert 2 == 4
UP: One of your chosen equilibria does not have upper_inner legs.

bluemira/equilibria/analysis.py

je-cook · 2025-01-23T15:49:48Z

bluemira/equilibria/analysis.py

+        summary_dict = [self._eq.analyse_plasma()]
+        pd.set_option("display.float_format", "{:.2f}".format)
+        dataframe = pd.DataFrame(summary_dict).T
+        dataframe.columns = [self.eq_name]


we could possibly use tabulate if this is the main use of pandas, let me know and I'll find a snippet

bluemira/equilibria/analysis.py

* 🎨 Small cleanup * 🚧 Initial structure

* Create equilibrium comparison plotter class - compare equilibrium object with reference equilibrium - split psi plotting - plotting percentage difference between current and reference equilibrium - plot reference lcfs * work on plots before work to update plot instead of producing new plots * make subplots have the same axes limits * remove unused argument in call to EquilibriumComparisonPlotter class in _minimal_current * Add xz_plot_setup to plot_tools.py * working on updating plot * remove blank line after docstring * trying to update colorbar (from stackexchange) * colorbar updating instead of multiple colorbars * add # noqa: BLE001 to Exception * update typing * pre-commit changes * fix from github comment * 🚨 Few missing imports --------- Co-authored-by: james <[email protected]>

Co-authored-by: je-cook <[email protected]>

sonarqubecloud · 2025-01-29T13:16:46Z

Quality Gate passed

Issues
18 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
1.5% Duplication on New Code

See analysis details on SonarQube Cloud

geograham requested review from a team as code owners November 12, 2024 14:54

je-cook force-pushed the feature/eq_analysis_tools branch 2 times, most recently from 24325a3 to f6db784 Compare November 18, 2024 12:51

je-cook force-pushed the feature/eq_analysis_tools branch from f6db784 to 53d9294 Compare December 2, 2024 12:01

geograham requested a review from a team as a code owner December 3, 2024 11:19

geograham force-pushed the eq_analysis_tools_update branch from cce55ed to 69db0c3 Compare December 3, 2024 14:36

je-cook force-pushed the feature/eq_analysis_tools branch from 53d9294 to 64deb3e Compare December 6, 2024 09:25

geograham force-pushed the feature/eq_analysis_tools branch 2 times, most recently from c652c17 to 76f1400 Compare January 16, 2025 15:17

geograham force-pushed the eq_analysis_tools_update branch from 69db0c3 to ddc8225 Compare January 16, 2025 16:14

je-cook reviewed Jan 17, 2025

View reviewed changes

geograham force-pushed the eq_analysis_tools_update branch from ddc8225 to 730d865 Compare January 22, 2025 15:11

geograham requested review from a team as code owners January 22, 2025 15:11

geograham force-pushed the feature/eq_analysis_tools branch from 76f1400 to bd84305 Compare January 22, 2025 15:14

je-cook self-assigned this Jan 23, 2025

je-cook added enhancement New feature or request equilibria Tasks relating to the equilibria module labels Jan 23, 2025

je-cook requested changes Jan 23, 2025

View reviewed changes

je-cook and others added 2 commits January 24, 2025 12:29

Equilibria analysis (Fusion-Power-Plant-Framework#3298)

1ffb92e

* 🎨 Small cleanup * 🚧 Initial structure

Georgina Graham and others added 21 commits January 24, 2025 12:29

Add eq analysis options

54cdf5b

corrections

f46ec43

Corrections and Examples

ca9640a

convert exmple type

3ce9232

Updates after further use

a144ab0

corrections

440e55c

additions and title correction

937581e

Expand anaylsis functions

eb62fa8

doc string

9c2b398

add toroidal and poloidal field plot Fusion-Power-Plant-Framework#3376

6660972

Add Picard Diagnostic Class

d2b00f2

qpsi_positive update and self.ax correction

bb0d6d6

tidy and tests

71ea315

add missed 'raise's

f1be378

address comments

f5ad720

Update bluemira/equilibria/find_legs.py

616426f

Co-authored-by: je-cook <[email protected]>

more tests

3b5aaa8

Update examples/equilibria/anaylsis_toolbox_examples.ex.py

b2431fa

Co-authored-by: je-cook <[email protected]>

Update examples/equilibria/anaylsis_toolbox_examples.ex.py

968aae0

Co-authored-by: je-cook <[email protected]>

Update examples/equilibria/anaylsis_toolbox_examples.ex.py

2a4aa19

Co-authored-by: je-cook <[email protected]>

Update bluemira/equilibria/analysis.py

750f145

Co-authored-by: je-cook <[email protected]>

geograham force-pushed the eq_analysis_tools_update branch from 67f3b20 to 750f145 Compare January 24, 2025 12:31

geograham force-pushed the feature/eq_analysis_tools branch from bd84305 to e7e9bea Compare January 24, 2025 12:31

geograham added 3 commits January 29, 2025 11:27

Address github comments

02fe587

remove indent

b17b471

address further comments

7d9a242

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Eq analysis tools update #3692

Eq analysis tools update #3692

geograham commented Nov 12, 2024 •

edited

Loading

sonarqubecloud bot commented Dec 3, 2024

codecov bot commented Jan 16, 2025

je-cook left a comment

je-cook commented Jan 23, 2025

je-cook left a comment

je-cook Jan 23, 2025

je-cook Jan 23, 2025

je-cook Jan 23, 2025

sonarqubecloud bot commented Jan 29, 2025

Eq analysis tools update #3692

Are you sure you want to change the base?

Eq analysis tools update #3692

Conversation

geograham commented Nov 12, 2024 • edited Loading

Closes

Description

Checklist

sonarqubecloud bot commented Dec 3, 2024

Quality Gate failed

codecov bot commented Jan 16, 2025

Codecov Report

je-cook left a comment

Choose a reason for hiding this comment

je-cook commented Jan 23, 2025

je-cook left a comment

Choose a reason for hiding this comment

je-cook Jan 23, 2025

Choose a reason for hiding this comment

je-cook Jan 23, 2025

Choose a reason for hiding this comment

je-cook Jan 23, 2025

Choose a reason for hiding this comment

sonarqubecloud bot commented Jan 29, 2025

Quality Gate passed

geograham commented Nov 12, 2024 •

edited

Loading