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.

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

Ciam jl1.0 #13

Merged
merged 38 commits into from
Dec 6, 2019
Merged

Ciam jl1.0 #13

merged 38 commits into from
Dec 6, 2019

Conversation

cledna
Copy link
Collaborator

@cledna cledna commented Nov 26, 2019

Base version of CIAM updated to be compatible with Julia 1.0 and Mimi framework

Catherine Ledna added 30 commits July 31, 2018 13:22
…than Addicott and Hannah Hauptman of Yale"

This reverts commit 61f9174327048b38cd255c3fdf9d8f052c989a44.
…{Any,N} by coercing everything to {Float64,N}. Also changed adaptoptions to adaptOptions in ciam.
… reflect this. Also created an init text file with names of lsl and subset files, to replace arguments of import_model_data. This function will now look up these values from the text file, which the user can change by editing data/meta/init.txt. Added 2 aux functions, init() and load_subset to help with this.
…een renamed slrcost.jl and is a component of ciam. Some modifications to timestep utilization in slrcost.jl.
…s and variables to comply with updated Mimi.
…have run name as a field, modified import_model_data() to take lslfile,sub arguments passed from init rather than calling init within function.
…er.jl: modified write_ciam to deal with non-time indices. Some other corresponding changes in other files.
…canada as well as variable landdata_canada. Replaced with rgn_ind_canada which serves same functionality.
…d CAN (slrcost.jl, globalparams.csv). 2) Fixes to run structure to allow for setting of parameters (init.txt). 3) Fixes to allow for running of only 10 periods (to 2100)
… to take 10 timesteps. Added comments to ciam.jl
@davidanthoff davidanthoff self-requested a review November 28, 2019 01:34
@davidanthoff davidanthoff merged commit 517b0af into raddleverse:master Dec 6, 2019
@davidanthoff davidanthoff deleted the ciam-jl1.0 branch December 6, 2019 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants