Revert "Update scorpio"

[xylar]

This reverts commit dfcffe1.

We should not have updated an external submodule directly in Omega in #325 (my mistake!). Instead, we need to bring in changes like this scorpio update via merging E3SM/master into Omega/develop. I will follow up immediately with such a merge.

Checklist

• Testing
  • Add a comment to the PR titled Testing with the following:
    • Which machines CTest unit tests
      have been run on and indicate that are all passing.
    • The Polaris omega_pr test suite
      has passed, using the Polaris e3sm_submodules/Omega baseline
    • Document machine(s), compiler(s), and the build path(s) used for -p for both the baseline (Polaris e3sm_submodules/Omega) and the PR build
    • Indicate "All tests passed" or document failing tests
    • Document testing used to verify the changes including any tests that are added/modified/impacted.
    • Performance related PRs: Please include a relevant PACE experiment link documenting performance before and after.

[xylar]

This is required before #361 to avoid conflicts and to keep things clear.

[xylar]

Testing

Tested together with #361. See #361 (comment).