Skip to content
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

Jump to bottom

More dev updates #81

Merged
merged 70 commits into from
Apr 18, 2022
Merged

More dev updates #81

merged 70 commits into from
Apr 18, 2022

Conversation

claireh93
Copy link
Member

Most recent updates from main:

  • Simple SDM layers.
  • Doc fixes.

claireh93 and others added 30 commits August 9, 2021 14:57
@claireh93
Add interface to SimpleSDMLayers to download simple climate data.
4664fdc
@claireh93
Add function to create AbioticEnvironment from BioClim data.
61a93d1
@claireh93
Add SimpleSDMLayers.
c2b2d36
@claireh93
Add example using SimpleSDMLayers.
bd3ae2b
@claireh93
Update tests.
1b41852
@claireh93
Update ClimatePref read functions and tests.
2665146
@claireh93
Fix out of memory error in tests.
61eb8d9
@claireh93
Merge branch 'main' into claireh93/simple-sdm-layers
d47962b 
# Conflicts:
#	src/ClimatePref/Conversion.jl
@claireh93
Remove CHELSA tests - too much memory for testing suite!
b052e47
@claireh93 @richardreeve
Update src/ClimatePref/ClimatePref.jl
1621bd3 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update test/test_SimpleSDMInterface.jl
25f2965 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update examples/Worldclim_africa.jl
c9126d7 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update examples/Worldclim_africa.jl
3315563 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/ClimatePref/ReadData.jl
5e701da 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/ClimatePref/ReadData.jl
4e5c904 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/ClimatePref/ReadData.jl
1bee731 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/ClimatePref/ReadData.jl
0520bfd 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93
A few final things.
61f40a8
@claireh93
Merge branch 'claireh93/simple-sdm-layers' of https://github.com/boyd…
a8120c4 
…orr/EcoSISTEM.jl into claireh93/simple-sdm-layers
@claireh93 @richardreeve
Update test/test_Energy.jl
f91d778 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update test/test_Energy.jl
0be3e67 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update test/test_Energy.jl
885cac4 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update test/test_AbioticEnv.jl
37f26fe 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/Energy.jl
2c08517 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/Energy.jl
a869c54 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/Energy.jl
dae88ff 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/ClimatePref/SimpleSDMInterface.jl
d5352fb 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/ClimatePref/ReadData.jl
0c8a659 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/AbioticEnv.jl
26aa5c0 
Co-authored-by: Richard Reeve <[email protected]>
@claireh93 @richardreeve
Update src/AbioticEnv.jl
f889714 
Co-authored-by: Richard Reeve <[email protected]>
richardreeve
richardreeve reviewed Sep 20, 2021
View reviewed changes
Copy link
Member

@richardreeve richardreeve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think all of these problems are also in main, so maybe best to do them there, or to do them here and cherry pick them back into main?

src/ClimatePref/ReadData.jl Outdated Show resolved Hide resolved
src/ClimatePref/ReadData.jl Outdated Show resolved Hide resolved
src/ClimatePref/ReadData.jl Outdated Show resolved Hide resolved
src/ClimatePref/ReadData.jl Outdated Show resolved Hide resolved
src/ClimatePref/ReadData.jl Outdated Show resolved Hide resolved
src/ClimatePref/ReadData.jl Outdated Show resolved Hide resolved
@claireh93
Copy link
Member Author

Cool, thanks @richardreeve, I'll cherry pick these through to main once tests have passed.

@claireh93
Copy link
Member Author

@richardreeve and these ones too! Thanks

@claireh93 claireh93 merged commit f6734ee into dev Apr 18, 2022
@claireh93 claireh93 deleted the claireh93/dev-updates-again branch April 18, 2022 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardreeve richardreeve richardreeve left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@claireh93 @coveralls @richardreeve