CFD-based Hydrodynamic Optimization and Design Guidelines for Cylindrical and Bi-lobed Sloshing Tanks Under Multi-DOF Excitation