Hierarchical dia and mixed dia/fig bond graphs now working.