Fix weights in nested noise (#320)

* Convert grid index to km

* Add test for nested noise

Author: dnerini

pysteps/noise/fftgenerators.py

@@ -691,7 +691,9 @@ def initialize_nonparam_2d_nested_filter(field, gridres=1.0, **kwargs):
                     x0 = (
                         Idxinext[n, 1] - Idxinext[n, 0]
                     ) / 2.0  # TODO: consider y dimension, too
-                    merge_weights = 1 / (1 + np.exp(-k * (1 / freq_grid - x0)))
+                    merge_weights = 1 / (
+                        1 + np.exp(-k * (1 / freq_grid - x0 * gridres))
+                    )
                     newfilter *= 1 - merge_weights
 
                     # perform the weighted average of previous and new fourier filters

pysteps/tests/test_noise_fftgenerators.py

@@ -51,3 +51,16 @@ def test_noise_nonparam_2d_ssft_filter():
 
     assert isinstance(out, np.ndarray)
     assert out.shape == PRECIP.shape
+
+
+def test_noise_nonparam_2d_nested_filter():
+
+    fft_filter = fftgenerators.initialize_nonparam_2d_nested_filter(PRECIP)
+
+    assert isinstance(fft_filter, dict)
+    assert all([key in fft_filter for key in ["field", "input_shape"]])
+
+    out = fftgenerators.generate_noise_2d_ssft_filter(fft_filter)
+
+    assert isinstance(out, np.ndarray)
+    assert out.shape == PRECIP.shape