Added final tests from Amanda for calcrib and calc_rs
Set structure elements equal to the variable names at end of atmos subroutine
Fixed merging issues