Fix initialization of a CALCSModel object
This fixes a bug when a user wants to have a second config file or string with the CALCS parameters. Currently the initialization does not recognize the second config file or string parameter to create the calcs
attribute. These small changes fixes the problem so that the second parameter will supersede any configuration section of the first argument.