Refactoring cf-plot to remove duplication and add more pythonic internal structure, include contour animation#123

Open

bnlawrence wants to merge 76 commits into

NCAS-CMS:mainfrom

bnlawrence:main

Commits on May 14, 2026

Starting the refactor
Bryan Lawrence
committed
Continuing structural refactor, still using legacy to do the work though
Bryan Lawrence
committed
Migrated contour related tests into integration and unit tests in the pytest framework
Bryan Lawrence
committed
interim commit while doing real function migration
Bryan Lawrence
committed
Moved away from relying on legacy to -notimplementederror- so we can work through the backlog correctly
Bryan Lawrence
committed
Clarity around viewports and hooks for animation
Bryan Lawrence
committed
Near complete coverage now of the contouring using new code, includes fix for non-float rotated poles
Bryan Lawrence
committed
Cleaning up project setup and testing environment
Bryan Lawrence
committed
Fixed orca handling, including adding extra testing paths
Bryan Lawrence
committed
Now really trying to extract old cfplot dependencies from contour
Bryan Lawrence
committed
refactor concept
Bryan Lawrence
committed
Interim step migrating utility functions out of cfplot
Bryan Lawrence
committed
Fixing AI getting itself in a pickle
Bryan Lawrence
committed
More interim cfplot inclusions
Bryan Lawrence
committed
More interim migration
Bryan Lawrence
committed
Moving plotvars
Bryan Lawrence
committed

Commits on May 15, 2026

Sync reference images and add missing contour datasets
Bryan Lawrence
committed
Moved reference image location
Bryan Lawrence
committed
Fix file save path suffix detection in refactored contour renderer
Bryan Lawrence
committed
Fix field ordering in Examples 6 and 9 using identity-based fixture lookup
Bryan Lawrence
committed
Fixed remaining identity risks in tests
Bryan Lawrence
committed
Ignore and untrack generated test images
Bryan Lawrence
committed
Continuing to decouple cfplot.py from contour.py
Bryan Lawrence
committed
Starting to create stateful contouring support modules
Bryan Lawrence
committed
Migrate gopen/gclose to contour runtime and test view flag
Bryan Lawrence
committed
Extract map setup into MapRuntime class, remove all cfplot imports from contour
Bryan Lawrence
committed
Addressing the plot mismatch issues
Bryan Lawrence
committed
Interim commit while examining example 4
Bryan Lawrence
committed
Iterating towards satisfactory stereographic rendering
Bryan Lawrence
committed
Acceptable example 4 performance
Bryan Lawrence
committed
Steady progress, up to, but not including 19 (of the ones which are contour only)
Bryan Lawrence
committed
Up to 21 working now, starting to find some mis-labelled reference images from my main -> branch pull
Bryan Lawrence
committed
Now working through test 22
Bryan Lawrence
committed

Commits on May 16, 2026

All the map tests extracted in first pass now pass, including some with vectors, surprisingly
Bryan Lawrence
committed
Removing semantic leakage between map and layout runtime
Bryan Lawrence
committed
Making further progress on refactoring, and inconsistent defaults between options
Bryan Lawrence
committed
New code now owns setvars and implements grid=False/True interaction with setvars properly
Bryan Lawrence
committed
All but one skipped test pass. Note that we don't yet have the full test suite, only the contour related ones
Bryan Lawrence
committed
Dealt with another couple of issue with rotated pole via CANARI example
Bryan Lawrence
committed
refactor(l1): move map title helpers into map_runtime
Bryan Lawrence
committed

Commits on May 17, 2026

refactor(l2-part1): extract map features helper to centralize ocean/land/lake decoration
Bryan Lawrence
committed
refactor(l2): complete - rotated_runtime module with centralized map features
Bryan Lawrence
committed
refactor(l4): consolidate _add_cyclic into utility.py
Bryan Lawrence
committed
refactor(l3+l7): colourbar_labels as canonical impl; maybe_autosave to layout_runtime
Bryan Lawrence
committed

Commits on May 18, 2026

refactor(l9): remove dead lonlat arg and enforce integration image mismatches as failures
Bryan Lawrence
committed
refactor(l6): extract xy tick logic and refresh contour references
Bryan Lawrence
committed
docs: mark L6 tick extraction as completed
Bryan Lawrence
committed

Commits on May 20, 2026

merge: main into integration branch (prefer refactor26 architecture)
Bryan Lawrence
committed
interim commit as we bring things together
Bryan Lawrence
committed

Commits on May 21, 2026

Tests run now, though many are skipped because the reference images are not valid and/or in-place
Bryan Lawrence
committed
Still iterating towards retiring cfplot.py
Bryan Lawrence
committed
interim commit
Bryan Lawrence
committed
Interim commit
Bryan Lawrence
committed
interim commit
Bryan Lawrence
committed
Near complete merge, with no dependency now on cfplot, I think
Bryan Lawrence
committed

Commits on May 22, 2026

Further iteration towards converged plotvar state
Bryan Lawrence
committed
Finally renamed cfplot.py out of the way
Bryan Lawrence
committed

Commits on May 23, 2026

Removed depdency on old utils folder
Bryan Lawrence
committed
interim commit
Bryan Lawrence
committed
Removed internal parameters package
Bryan Lawrence
committed
Continuing to rationalise state and colour
Bryan Lawrence
committed
more redudant code cleanup, calculate, and graphic gone
Bryan Lawrence
committed
Carried out a comprehensive clean out of duplicated functionality
Bryan Lawrence
committed
misisng tests
Bryan Lawrence
committed

Commits on May 24, 2026

Dev documentation as of today
Bryan Lawrence
committed

Commits on May 27, 2026

cleaning up pvars, maybe
Bryan Lawrence
committed
Clarifying version
Bryan Lawrence
committed
Bug fix for part of https://github.com/NCAS-CMS/xconv2/issues/35
Bryan Lawrence
committed
Missing unit tests
Bryan Lawrence
committed
Tests for the bug fix for orthographic projections
Bryan Lawrence
committed
Merge branch 'main-into-refactor26' into main-refactor26-pvars
Bryan Lawrence
committed
Includes existing lfric plotting functionality
Bryan Lawrence
committed

Commits on May 28, 2026

clarity in testing
Bryan Lawrence
committed
Include the planned animation support
Bryan Lawrence
committed
Merge branch 'main-refactor26-pvars'
Bryan Lawrence
committed
Testing and packaging fixes following copilot review
Bryan Lawrence
committed