Fix of mergeconflicts
A bit of cleanup in CBS. Mainly using MomentumBalance instead of AuxMomentumBalance whenever possible (since they have the same numbering) which simplifies code a bit.
Cleanup in SUPG, local scopes for variables and removed unnecessary reimplementations of some functions from EngngModel.
Introduced Velocity and Pressure UnknownNumberingScheme's for CBS algorithm (currently, they make no pratical difference but could make EID redundant)
Extending tr1_2d_cbs to work with EID_MomentumBalance_ConservationEquation, letting the numbering scheme split into velocity and pressures.
Removing need for AuxMomentumBalance by simply storing the temporary uncorrected velocity in the velocityfield.
Made UnknownNumberingScheme keep track of number of equations for CBS algorithm.
Hopefully fixing OOFEG build errors in new XFEM code.
Fixing binary VTKXML export for composites ( but I still need to work out how to use multiple pieces ). At least it compiles now, but probably wont work properly with compites in the mesh when using binary export.
Removed redundant vtkexport code in tr2shell7. Composites not exported for now, but work is in progress.
Fixed typos on previous commit.
Fixing last nights build errors (xfemmanager had been moved into domain)
Made EngngModel::giveNumberOfDomainEquations to use UnknownNumberingScheme instead of EquationID. This one command now covers both prescribed and free numbering. Makes all other "giveNumberOf*Equations" redundant.
Removed redundant equation id from dofs. Dof values are already well defined without this. As a result, EID becomes unnecessary in a lot of functions and checking for correct EID becomes unecessary (no need to hardcode EID_* values in general routines).
Fixed missing equationid to numberingscheme conversion.
Huge commit in which all IR_GIVE_*FIELD now uses the string literals defined in each respective header (making this much more library friendly). This replaces the huge centralized InputFieldType enum.
Fixed #define'd string "null".
Fixing error in global2local methods of interpolation classes on triangles. All three parametric coordinates have to be checked for inside test.
Fixing IMLSolver::initializeFrom to use IR_GIVE_*FIELD macros with string literals.
Fixing documentation of NonLinearStatic refloadmode parameter.