Merge pull request #38 from lrennels/patch-1

Compatibility Bumps
anthofflab · May 5, 2021 · e5b6fd4 · e5b6fd4
2 parents 818a145 + ed17f9c
commit e5b6fd4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -16,7 +16,7 @@ julia = "1.4"
 NLsolve = "4.1"
 Mimi = "1"
 CSVFiles = "0.13, 0.14, 0.15, 0.16, 1"
-DataFrames = "0.19, 0.20, 0.21, 0.22"
+DataFrames = "0.19, 0.20, 0.21, 0.22, 1.0"
 
 [targets]
 test = ["Test"]
diff --git a/src/MimiFAIR.jl b/src/MimiFAIR.jl
@@ -113,7 +113,7 @@ function get_model(;rcp_scenario::String="RCP85", start_year::Int=1765, end_year
 
     # ---- Other Well-Mixed Greenhouse Gas Cycles ---- #
     set_param!(m, :other_ghg_cycles, :τ_other_ghg, gas_data[findall((in)(other_ghg_names), gas_data.gas), :lifetimes])    
-    set_param!(m, :other_ghg_cycles, :emiss_other_ghg, convert(Matrix, rcp_emissions[!,Symbol.(other_ghg_names)]))
+    set_param!(m, :other_ghg_cycles, :emiss_other_ghg, Matrix(rcp_emissions[!,Symbol.(other_ghg_names)]))
     set_param!(m, :other_ghg_cycles, :emiss2conc_other_ghg, conversions[findall((in)(other_ghg_names), conversions.gases), :emiss2conc])
 
     # ---- Methane Radiative Forcing ---- #