Fix verifyExpansion with derivedShape solvent

[AidanMcDonald]

What is the change?

blockConverter._verifyExpansion() was throwing an error when the solvent was a derivedShape Component because isEncapsulatedBy requires the "other" component to have an "od" Parameter. I believe this check doesn't make sense for a derivedShape Component, so I added a simple check to skip the isEncapsulatedBy call in this case.

Why is the change being made?

This change is necessary for using the openmc plugin. Openmc cannot handle helix components so the openmc input writer uses MultipleComponentMerger, in which this bug arose.

---

Checklist

• This PR has only one purpose or idea.
• Tests have been added/updated to verify that the new/changed code works.
• The code style follows good practices.
• The commit message(s) follow good practices.
• The release notes (location doc/release/0.X.rst) are up-to-date with any important changes.
• The documentation is still up-to-date in the doc folder.
• If any requirements were affected, mention it in the release notes.
• The dependencies are still up-to-date in pyproject.toml.

[CLAassistant]

All committers have signed the CLA.

[john-science]

Perhaps we could just replace this line with:

armicontrib-*

As a little future-proofing.

[john-science]

Adding a unit test to prove the idea would be nice.