Skip to content

Preserve weighted data across covariance map queries #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antonsoo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve weighted data across covariance map queries #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/eofs/standard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ def eofsAsCovariance(self, neofs=None, pcscaling=1):
# the covariance maps.
data = self._data.reshape((self._records,) + self._originalshape)
if self._weights is not None:
data = data.copy()
with warnings.catch_warnings():
warnings.simplefilter('ignore', RuntimeWarning)
data /= self._weights
Expand Down
8 changes: 8 additions & 0 deletions lib/eofs/tests/test_solution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ def test_eofsAsCovariance(self):
eofs *= sign_adjustments(eofs, reofs)
self.assert_array_almost_equal(eofs, reofs)

@pytest.mark.parametrize('pcscaling', (0, 1, 2))
def test_eofsAsCovariance_repeated(self, pcscaling):
first = self._tomasked(self.solver.eofsAsCovariance(
neofs=self.neofs, pcscaling=pcscaling))
second = self._tomasked(self.solver.eofsAsCovariance(
neofs=self.neofs, pcscaling=pcscaling))
self.assert_array_almost_equal(first, second)

def test_eofsAsCorrelation(self):
# EOFs as correlation between PCs and input field should match the
# reference solution
Expand Down