Bugfix 1.2.1 #75
Merged
Bugfix 1.2.1 #75
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Back to work after 1.2.0
LSchueler
reviewed
Apr 8, 2020
| @@ -325,6 +333,9 @@ def correlation(self, r): | |||
| r = np.array(np.abs(r), dtype=np.double) | |||
| return np.exp(-np.power(r / self.len_scale, self.alpha)) | |||
|
|
|||
| def calc_integral_scale(self): # noqa: D102 | |||
| return self.len_scale * sps.gamma(1.0 + 1.0 / self.alpha) | |||
LSchueler
reviewed
Apr 8, 2020
| @@ -77,7 +77,7 @@ cdef inline void normalization_cressie( | |||
| if counts[i] == 0: | |||
| counts[i] = 1 | |||
| variogram[i] = ( | |||
| (1./counts[i] * variogram[i])**4 / | |||
| 0.5 * (1./counts[i] * variogram[i])**4 / | |||
|
@LSchueler should we as well change these lines to use GSTools/gstools/field/summator.pyx Line 213 in a01da8e GSTools/gstools/field/summator.pyx Line 248 in a01da8e to get rid of the openmp bug on windows and macOS? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ModuleNotFoundErrornot present in py35.prangefromIncomprRandMethsummators to prevent errors on Win and macOS