sync on granda
Merge github.com:slayoo/icicle

Conflicts:
	examples/8icmw_case1_1800s_sdm_vs_2dbin/calc.cpp
	examples/8icmw_case1_1800s_sdm_vs_2dbin/plot.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	examples/8icmw_case1/test_todo_plot.cpp
	tests/todo/test_todo_calc.cpp
sync with laptop
sync
sync
corrected automagical timestep
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CMakeLists.txt
	examples/8icmw_case1_1800s_sdm_vs_2dbin/calc.cpp
	examples/8icmw_case1_1800s_sdm_vs_2dbin/plot.cpp
sync + delete harmosc
Merge github.com:trontrytel/icicle

Conflicts:
	examples/8icmw_case1/test_todo_calc.cpp
add chem
Merge github.com:slayoo/icicle

Conflicts:
	CMakeLists.txt
	examples/8icmw_case1_1800s_sdm_vs_2dbin/calc.cpp
	examples/8icmw_case1_1800s_sdm_vs_2dbin/plot.cpp
Merge github.com:trontrytel/icicle

Conflicts:
	CMakeLists.txt
	examples/8icmw_case1_1800s_sdm_vs_2dbin/calc.cpp
	examples/8icmw_case1_1800s_sdm_vs_2dbin/plot.cpp
	examples/CMakeLists.txt
Merge github.com:slayoo/icicle

Conflicts:
	CMakeLists.txt
	examples/8icmw_case1_1800s_sdm_vs_2dbin/calc.cpp
	examples/8icmw_case1_1800s_sdm_vs_2dbin/plot.cpp
	src/opt_eqs.hpp
wip on plotting dry radius size distribution
Merge pull request #185 from trontrytel/master

pull me