add missing #ifdef, breaking compilation without LINSOLV + better volume computation