Remove/replace many mentions of Jenkins
[alexxy/gromacs.git] / src / programs / legacymodules.cpp
index 10a6f64c342d2a66b6357c371aede70f1c737840..b145559efc49cc0b18cd7cc7f6fef0b4a831c256 100644 (file)
@@ -1,7 +1,8 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2016 by the GROMACS development team.
+ * Copyright (c) 2017,2018,2019,2020,2021, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
 #include "gromacs/commandline/cmdlinemodulemanager.h"
 #include "gromacs/commandline/cmdlineoptionsmodule.h"
 #include "gromacs/gmxana/gmx_ana.h"
+#include "gromacs/gmxpreprocess/editconf.h"
 #include "gromacs/gmxpreprocess/genconf.h"
+#include "gromacs/gmxpreprocess/genion.h"
+#include "gromacs/gmxpreprocess/genrestr.h"
 #include "gromacs/gmxpreprocess/grompp.h"
-#include "gromacs/gmxpreprocess/insert-molecules.h"
+#include "gromacs/gmxpreprocess/insert_molecules.h"
 #include "gromacs/gmxpreprocess/pdb2gmx.h"
 #include "gromacs/gmxpreprocess/solvate.h"
 #include "gromacs/gmxpreprocess/x2top.h"
 #include "gromacs/tools/check.h"
 #include "gromacs/tools/convert_tpr.h"
 #include "gromacs/tools/dump.h"
+#include "gromacs/tools/eneconv.h"
+#include "gromacs/tools/make_ndx.h"
+#include "gromacs/tools/mk_angndx.h"
+#include "gromacs/tools/pme_error.h"
+#include "gromacs/tools/report_methods.h"
+#include "gromacs/tools/trjcat.h"
+#include "gromacs/tools/trjconv.h"
+#include "gromacs/tools/tune_pme.h"
 
 #include "mdrun/mdrun_main.h"
+#include "mdrun/nonbonded_bench.h"
 #include "view/view.h"
 
 namespace
@@ -71,50 +84,41 @@ namespace
  */
 class ObsoleteToolModule : public gmx::ICommandLineModule
 {
-    public:
-        //! Creates an obsolete tool module for a tool with the given name.
-        explicit ObsoleteToolModule(const char *name)
-            : name_(name)
-        {
-        }
+public:
+    //! Creates an obsolete tool module for a tool with the given name.
+    explicit ObsoleteToolModule(const char* name) : name_(name) {}
 
-        virtual const char *name() const
-        {
-            return name_;
-        }
-        virtual const char *shortDescription() const
-        {
-            return NULL;
-        }
+    const char* name() const override { return name_; }
+    const char* shortDescription() const override { return nullptr; }
 
-        virtual void init(gmx::CommandLineModuleSettings * /*settings*/)
-        {
-        }
-        virtual int run(int /*argc*/, char * /*argv*/[])
-        {
-            printMessage();
-            return 0;
-        }
-        virtual void writeHelp(const gmx::CommandLineHelpContext & /*context*/) const
-        {
-            printMessage();
-        }
+    void init(gmx::CommandLineModuleSettings* /*settings*/) override {}
+    int  run(int /*argc*/, char* /*argv*/[]) override
+    {
+        printMessage();
+        return 0;
+    }
+    void writeHelp(const gmx::CommandLineHelpContext& /*context*/) const override
+    {
+        printMessage();
+    }
 
-    private:
-        void printMessage() const
-        {
-            std::fprintf(stderr,
-                         "This tool is no longer present in GROMACS. Please see\n"
-                         "  http://jenkins.gromacs.org/job/Documentation_Nightly_master/javadoc/user-guide/cmdline.html#command-changes\n"
-                         "for ideas how to perform the same tasks with the "
-                         "new tools.\n");
-        }
+private:
+    static void printMessage()
+    {
+        std::fprintf(stderr,
+                     "This tool is no longer present in GROMACS. Please see\n"
+                     "  "
+                     "https://manual.gromacs.org/current/user-guide/"
+                     "cmdline.html#command-changes-between-versions\n"
+                     "for ideas how to perform the same tasks with the "
+                     "new tools.\n");
+    }
 
-        const char             *name_;
+    const char* name_;
 };
 
 //! Initializer for a module that defaults to nice level zero.
-void initSettingsNoNice(gmx::CommandLineModuleSettings *settings)
+void initSettingsNoNice(gmx::CommandLineModuleSettingssettings)
 {
     settings->setDefaultNiceLevel(0);
 }
@@ -127,9 +131,10 @@ void initSettingsNoNice(gmx::CommandLineModuleSettings *settings)
  * \param[in] name             Name for the new module.
  * \param[in] shortDescription One-line description for the new module.
  */
-void registerModule(gmx::CommandLineModuleManager                *manager,
-                    gmx::CommandLineModuleManager::CMainFunction  mainFunction,
-                    const char *name, const char *shortDescription)
+void registerModule(gmx::CommandLineModuleManager*               manager,
+                    gmx::CommandLineModuleManager::CMainFunction mainFunction,
+                    const char*                                  name,
+                    const char*                                  shortDescription)
 {
     manager->addModuleCMain(name, shortDescription, mainFunction);
 }
@@ -143,12 +148,12 @@ void registerModule(gmx::CommandLineModuleManager                *manager,
  * \param[in] name             Name for the new module.
  * \param[in] shortDescription One-line description for the new module.
  */
-void registerModuleNoNice(gmx::CommandLineModuleManager                *manager,
-                          gmx::CommandLineModuleManager::CMainFunction  mainFunction,
-                          const char *name, const char *shortDescription)
+void registerModuleNoNice(gmx::CommandLineModuleManager*               manager,
+                          gmx::CommandLineModuleManager::CMainFunction mainFunction,
+                          const char*                                  name,
+                          const char*                                  shortDescription)
 {
-    manager->addModuleCMainWithSettings(name, shortDescription, mainFunction,
-                                        &initSettingsNoNice);
+    manager->addModuleCMainWithSettings(name, shortDescription, mainFunction, &initSettingsNoNice);
 }
 
 /*! \brief
@@ -157,8 +162,7 @@ void registerModuleNoNice(gmx::CommandLineModuleManager                *manager,
  * \param[in] manager          Module manager to which to register the module.
  * \param[in] name             Name for the obsolete tool.
  */
-void registerObsoleteTool(gmx::CommandLineModuleManager *manager,
-                          const char                    *name)
+void registerObsoleteTool(gmx::CommandLineModuleManager* manager, const char* name)
 {
     gmx::CommandLineModulePointer module(new ObsoleteToolModule(name));
     manager->addModule(std::move(module));
@@ -166,201 +170,229 @@ void registerObsoleteTool(gmx::CommandLineModuleManager *manager,
 
 } // namespace
 
-void registerLegacyModules(gmx::CommandLineModuleManager *manager)
+void registerLegacyModules(gmx::CommandLineModuleManagermanager)
 {
-    // Modules from this directory (were in src/kernel/).
-    registerModule(manager, &gmx_check, "check",
-                   "Check and compare files");
-    registerModule(manager, &gmx_dump, "dump",
-                   "Make binary files human readable");
-    registerModule(manager, &gmx_grompp, "grompp",
-                   "Make a run input file");
-    registerModule(manager, &gmx_pdb2gmx, "pdb2gmx",
-                   "Convert coordinate files to topology and FF-compliant coordinate files");
-    registerModule(manager, &gmx_convert_tpr, "convert-tpr",
-                   "Make a modifed run-input file");
+    registerModule(manager, &gmx_check, "check", "Check and compare files");
+    gmx::ICommandLineOptionsModule::registerModuleFactory(
+            manager, gmx::DumpInfo::name, gmx::DumpInfo::shortDescription, &gmx::DumpInfo::create);
+    registerModule(manager, &gmx_grompp, "grompp", "Make a run input file");
+    gmx::ICommandLineOptionsModule::registerModuleFactory(manager,
+                                                          gmx::ConvertTprInfo::name,
+                                                          gmx::ConvertTprInfo::shortDescription,
+                                                          &gmx::ConvertTprInfo::create);
     registerObsoleteTool(manager, "tpbconv");
-    registerModule(manager, &gmx_x2top, "x2top",
-                   "Generate a primitive topology from coordinates");
+    registerModule(manager, &gmx_x2top, "x2top", "Generate a primitive topology from coordinates");
+
+    registerModuleNoNice(
+            manager,
+            &gmx::gmx_mdrun,
+            "mdrun",
+            "Perform a simulation, do a normal mode analysis or an energy minimization");
+
+    gmx::ICommandLineOptionsModule::registerModuleFactory(manager,
+                                                          gmx::NonbondedBenchmarkInfo::name,
+                                                          gmx::NonbondedBenchmarkInfo::shortDescription,
+                                                          &gmx::NonbondedBenchmarkInfo::create);
 
-    registerModuleNoNice(manager, &gmx_mdrun, "mdrun",
-                         "Perform a simulation, do a normal mode analysis or an energy minimization");
+    gmx::ICommandLineOptionsModule::registerModuleFactory(manager,
+                                                          gmx::InsertMoleculesInfo::name(),
+                                                          gmx::InsertMoleculesInfo::shortDescription(),
+                                                          &gmx::InsertMoleculesInfo::create);
+
+    gmx::ICommandLineOptionsModule::registerModuleFactory(manager,
+                                                          gmx::ReportMethodsInfo::name,
+                                                          gmx::ReportMethodsInfo::shortDescription,
+                                                          &gmx::ReportMethodsInfo::create);
 
     gmx::ICommandLineOptionsModule::registerModuleFactory(
-            manager, gmx::InsertMoleculesInfo::name,
-            gmx::InsertMoleculesInfo::shortDescription,
-            &gmx::InsertMoleculesInfo::create);
+            manager, gmx::pdb2gmxInfo::name, gmx::pdb2gmxInfo::shortDescription, &gmx::pdb2gmxInfo::create);
 
     // Modules from gmx_ana.h.
-    registerModule(manager, &gmx_do_dssp, "do_dssp",
+    registerModule(manager,
+                   &gmx_do_dssp,
+                   "do_dssp",
                    "Assign secondary structure and calculate solvent accessible surface area");
-    registerModule(manager, &gmx_editconf, "editconf",
-                   "Convert and manipulates structure files");
-    registerModule(manager, &gmx_eneconv, "eneconv",
-                   "Convert energy files");
-    registerModule(manager, &gmx_solvate, "solvate",
-                   "Solvate a system");
+    registerModule(manager, &gmx_editconf, "editconf", "Convert and manipulates structure files");
+    registerModule(manager, &gmx_eneconv, "eneconv", "Convert energy files");
+    registerModule(manager, &gmx_solvate, "solvate", "Solvate a system");
     registerObsoleteTool(manager, "genbox");
-    registerModule(manager, &gmx_genconf, "genconf",
-                   "Multiply a conformation in 'random' orientations");
-    registerModule(manager, &gmx_genion, "genion",
+    registerModule(
+            manager, &gmx_genconf, "genconf", "Multiply a conformation in 'random' orientations");
+    registerModule(manager,
+                   &gmx_genion,
+                   "genion",
                    "Generate monoatomic ions on energetically favorable positions");
-    registerModule(manager, &gmx_genpr, "genrestr",
+    registerModule(manager,
+                   &gmx_genrestr,
+                   "genrestr",
                    "Generate position restraints or distance restraints for index groups");
-    registerModule(manager, &gmx_make_edi, "make_edi",
+    registerModule(manager,
+                   &gmx_make_edi,
+                   "make_edi",
                    "Generate input files for essential dynamics sampling");
-    registerModule(manager, &gmx_make_ndx, "make_ndx",
-                   "Make index files");
-    registerModule(manager, &gmx_mk_angndx, "mk_angndx",
-                   "Generate index files for 'gmx angle'");
-    registerModule(manager, &gmx_trjcat, "trjcat",
-                   "Concatenate trajectory files");
-    registerModule(manager, &gmx_trjconv, "trjconv",
-                   "Convert and manipulates trajectory files");
-    registerModule(manager, &gmx_trjorder, "trjorder",
+    registerModule(manager, &gmx_make_ndx, "make_ndx", "Make index files");
+    registerModule(manager, &gmx_mk_angndx, "mk_angndx", "Generate index files for 'gmx angle'");
+    registerModule(manager, &gmx_trjcat, "trjcat", "Concatenate trajectory files");
+    registerModule(manager, &gmx_trjconv, "trjconv", "Convert and manipulates trajectory files");
+    registerModule(manager,
+                   &gmx_trjorder,
+                   "trjorder",
                    "Order molecules according to their distance to a group");
-    registerModule(manager, &gmx_xpm2ps, "xpm2ps",
-                   "Convert XPM (XPixelMap) matrices to postscript or XPM");
+    registerModule(
+            manager, &gmx_xpm2ps, "xpm2ps", "Convert XPM (XPixelMap) matrices to postscript or XPM");
 
-    registerModule(manager, &gmx_anadock, "anadock",
-                   "Cluster structures from Autodock runs");
-    registerModule(manager, &gmx_anaeig, "anaeig",
-                   "Analyze eigenvectors/normal modes");
-    registerModule(manager, &gmx_analyze, "analyze",
-                   "Analyze data sets");
-    registerModule(manager, &gmx_g_angle, "angle",
+    registerModule(manager, &gmx_anaeig, "anaeig", "Analyze eigenvectors/normal modes");
+    registerModule(manager, &gmx_analyze, "analyze", "Analyze data sets");
+    registerModule(manager,
+                   &gmx_g_angle,
+                   "angle",
                    "Calculate distributions and correlations for angles and dihedrals");
-    registerModule(manager, &gmx_bar, "bar",
+    registerModule(
+            manager, &gmx_awh, "awh", "Extract data from an accelerated weight histogram (AWH) run");
+    registerModule(manager,
+                   &gmx_bar,
+                   "bar",
                    "Calculate free energy difference estimates through Bennett's acceptance ratio");
     registerObsoleteTool(manager, "bond");
     registerObsoleteTool(manager, "dist");
     registerObsoleteTool(manager, "sas");
     registerObsoleteTool(manager, "sgangle");
 
-    registerModule(manager, &gmx_bundle, "bundle",
-                   "Analyze bundles of axes, e.g., helices");
-    registerModule(manager, &gmx_chi, "chi",
+    registerModule(manager, &gmx_bundle, "bundle", "Analyze bundles of axes, e.g., helices");
+    registerModule(manager,
+                   &gmx_chi,
+                   "chi",
                    "Calculate everything you want to know about chi and other dihedrals");
-    registerModule(manager, &gmx_cluster, "cluster",
-                   "Cluster structures");
-    registerModule(manager, &gmx_clustsize, "clustsize",
-                   "Calculate size distributions of atomic clusters");
-    registerModule(manager, &gmx_confrms, "confrms",
-                   "Fit two structures and calculates the RMSD");
-    registerModule(manager, &gmx_covar, "covar",
-                   "Calculate and diagonalize the covariance matrix");
-    registerModule(manager, &gmx_current, "current",
+    registerModule(manager, &gmx_cluster, "cluster", "Cluster structures");
+    registerModule(
+            manager, &gmx_clustsize, "clustsize", "Calculate size distributions of atomic clusters");
+    registerModule(manager, &gmx_confrms, "confrms", "Fit two structures and calculates the RMSD");
+    registerModule(manager, &gmx_covar, "covar", "Calculate and diagonalize the covariance matrix");
+    registerModule(manager,
+                   &gmx_current,
+                   "current",
                    "Calculate dielectric constants and current autocorrelation function");
-    registerModule(manager, &gmx_density, "density",
-                   "Calculate the density of the system");
-    registerModule(manager, &gmx_densmap, "densmap",
-                   "Calculate 2D planar or axial-radial density maps");
-    registerModule(manager, &gmx_densorder, "densorder",
-                   "Calculate surface fluctuations");
-    registerModule(manager, &gmx_dielectric, "dielectric",
+    registerModule(manager, &gmx_density, "density", "Calculate the density of the system");
+    registerModule(
+            manager, &gmx_densmap, "densmap", "Calculate 2D planar or axial-radial density maps");
+    registerModule(manager, &gmx_densorder, "densorder", "Calculate surface fluctuations");
+    registerModule(manager,
+                   &gmx_dielectric,
+                   "dielectric",
                    "Calculate frequency dependent dielectric constants");
-    registerModule(manager, &gmx_dipoles, "dipoles",
-                   "Compute the total dipole plus fluctuations");
-    registerModule(manager, &gmx_disre, "disre",
-                   "Analyze distance restraints");
-    registerModule(manager, &gmx_dos, "dos",
-                   "Analyze density of states and properties based on that");
-    registerModule(manager, &gmx_dyecoupl, "dyecoupl",
-                   "Extract dye dynamics from trajectories");
-    registerModule(manager, &gmx_dyndom, "dyndom",
-                   "Interpolate and extrapolate structure rotations");
-    registerModule(manager, &gmx_enemat, "enemat",
-                   "Extract an energy matrix from an energy file");
-    registerModule(manager, &gmx_energy, "energy",
-                   "Writes energies to xvg files and display averages");
-    registerModule(manager, &gmx_filter, "filter",
+    registerModule(manager, &gmx_dipoles, "dipoles", "Compute the total dipole plus fluctuations");
+    registerModule(manager, &gmx_disre, "disre", "Analyze distance restraints");
+    registerModule(
+            manager, &gmx_dos, "dos", "Analyze density of states and properties based on that");
+    registerModule(manager, &gmx_dyecoupl, "dyecoupl", "Extract dye dynamics from trajectories");
+    registerModule(manager, &gmx_enemat, "enemat", "Extract an energy matrix from an energy file");
+    registerModule(
+            manager, &gmx_energy, "energy", "Writes energies to xvg files and display averages");
+    registerModule(manager,
+                   &gmx_filter,
+                   "filter",
                    "Frequency filter trajectories, useful for making smooth movies");
-    registerModule(manager, &gmx_gyrate, "gyrate",
-                   "Calculate the radius of gyration");
-    registerModule(manager, &gmx_h2order, "h2order",
-                   "Compute the orientation of water molecules");
-    registerModule(manager, &gmx_hbond, "hbond",
-                   "Compute and analyze hydrogen bonds");
-    registerModule(manager, &gmx_helix, "helix",
-                   "Calculate basic properties of alpha helices");
-    registerModule(manager, &gmx_helixorient, "helixorient",
+    registerModule(manager, &gmx_gyrate, "gyrate", "Calculate the radius of gyration");
+    registerModule(manager, &gmx_h2order, "h2order", "Compute the orientation of water molecules");
+    registerModule(manager, &gmx_hbond, "hbond", "Compute and analyze hydrogen bonds");
+    registerModule(manager, &gmx_helix, "helix", "Calculate basic properties of alpha helices");
+    registerModule(manager,
+                   &gmx_helixorient,
+                   "helixorient",
                    "Calculate local pitch/bending/rotation/orientation inside helices");
-    registerModule(manager, &gmx_hydorder, "hydorder",
+    registerModule(manager,
+                   &gmx_hydorder,
+                   "hydorder",
                    "Compute tetrahedrality parameters around a given atom");
-    registerModule(manager, &gmx_lie, "lie",
-                   "Estimate free energy from linear combinations");
-    registerModule(manager, &gmx_mdmat, "mdmat",
-                   "Calculate residue contact maps");
-    registerModule(manager, &gmx_mindist, "mindist",
-                   "Calculate the minimum distance between two groups");
-    registerModule(manager, &gmx_morph, "morph",
-                   "Interpolate linearly between conformations");
-    registerModule(manager, &gmx_msd, "msd",
-                   "Calculates mean square displacements");
-    registerModule(manager, &gmx_nmeig, "nmeig",
-                   "Diagonalize the Hessian for normal mode analysis");
-    registerModule(manager, &gmx_nmens, "nmens",
+    registerModule(manager, &gmx_lie, "lie", "Estimate free energy from linear combinations");
+    registerModule(manager, &gmx_mdmat, "mdmat", "Calculate residue contact maps");
+    registerModule(
+            manager, &gmx_mindist, "mindist", "Calculate the minimum distance between two groups");
+    registerModule(manager, &gmx_nmeig, "nmeig", "Diagonalize the Hessian for normal mode analysis");
+    registerModule(manager,
+                   &gmx_nmens,
+                   "nmens",
                    "Generate an ensemble of structures from the normal modes");
-    registerModule(manager, &gmx_nmtraj, "nmtraj",
+    registerModule(manager,
+                   &gmx_nmr,
+                   "nmr",
+                   "Analyze nuclear magnetic resonance properties from an energy file");
+    registerModule(manager,
+                   &gmx_nmtraj,
+                   "nmtraj",
                    "Generate a virtual oscillating trajectory from an eigenvector");
-    registerModule(manager, &gmx_order, "order",
-                   "Compute the order parameter per atom for carbon tails");
-    registerModule(manager, &gmx_pme_error, "pme_error",
+    registerModule(
+            manager, &gmx_order, "order", "Compute the order parameter per atom for carbon tails");
+    registerModule(manager,
+                   &gmx_pme_error,
+                   "pme_error",
                    "Estimate the error of using PME with a given input file");
-    registerModule(manager, &gmx_polystat, "polystat",
-                   "Calculate static properties of polymers");
-    registerModule(manager, &gmx_potential, "potential",
+    registerModule(manager, &gmx_polystat, "polystat", "Calculate static properties of polymers");
+    registerModule(manager,
+                   &gmx_potential,
+                   "potential",
                    "Calculate the electrostatic potential across the box");
-    registerModule(manager, &gmx_principal, "principal",
+    registerModule(manager,
+                   &gmx_principal,
+                   "principal",
                    "Calculate principal axes of inertia for a group of atoms");
-    registerModule(manager, &gmx_rama, "rama",
-                   "Compute Ramachandran plots");
-    registerModule(manager, &gmx_rms, "rms",
+    registerModule(manager, &gmx_rama, "rama", "Compute Ramachandran plots");
+    registerModule(manager,
+                   &gmx_rms,
+                   "rms",
                    "Calculate RMSDs with a reference structure and RMSD matrices");
-    registerModule(manager, &gmx_rmsdist, "rmsdist",
+    registerModule(manager,
+                   &gmx_rmsdist,
+                   "rmsdist",
                    "Calculate atom pair distances averaged with power -2, -3 or -6");
-    registerModule(manager, &gmx_rmsf, "rmsf",
-                   "Calculate atomic fluctuations");
-    registerModule(manager, &gmx_rotacf, "rotacf",
+    registerModule(manager, &gmx_rmsf, "rmsf", "Calculate atomic fluctuations");
+    registerModule(manager,
+                   &gmx_rotacf,
+                   "rotacf",
                    "Calculate the rotational correlation function for molecules");
-    registerModule(manager, &gmx_rotmat, "rotmat",
+    registerModule(manager,
+                   &gmx_rotmat,
+                   "rotmat",
                    "Plot the rotation matrix for fitting to a reference structure");
-    registerModule(manager, &gmx_saltbr, "saltbr",
-                   "Compute salt bridges");
-    registerModule(manager, &gmx_sans, "sans",
-                   "Compute small angle neutron scattering spectra");
-    registerModule(manager, &gmx_saxs, "saxs",
-                   "Compute small angle X-ray scattering spectra");
-    registerModule(manager, &gmx_sham, "sham",
-                   "Compute free energies or other histograms from histograms");
-    registerModule(manager, &gmx_sigeps, "sigeps",
+    registerModule(manager, &gmx_saltbr, "saltbr", "Compute salt bridges");
+    registerModule(manager, &gmx_sans, "sans", "Compute small angle neutron scattering spectra");
+    registerModule(manager, &gmx_saxs, "saxs", "Compute small angle X-ray scattering spectra");
+    registerModule(
+            manager, &gmx_sham, "sham", "Compute free energies or other histograms from histograms");
+    registerModule(manager,
+                   &gmx_sigeps,
+                   "sigeps",
                    "Convert c6/12 or c6/cn combinations to and from sigma/epsilon");
-    registerModule(manager, &gmx_sorient, "sorient",
-                   "Analyze solvent orientation around solutes");
-    registerModule(manager, &gmx_spatial, "spatial",
-                   "Calculate the spatial distribution function");
-    registerModule(manager, &gmx_spol, "spol",
+    registerModule(manager, &gmx_sorient, "sorient", "Analyze solvent orientation around solutes");
+    registerModule(manager, &gmx_spatial, "spatial", "Calculate the spatial distribution function");
+    registerModule(manager,
+                   &gmx_spol,
+                   "spol",
                    "Analyze solvent dipole orientation and polarization around solutes");
-    registerModule(manager, &gmx_tcaf, "tcaf",
-                   "Calculate viscosities of liquids");
-    registerModule(manager, &gmx_traj, "traj",
+    registerModule(manager, &gmx_tcaf, "tcaf", "Calculate viscosities of liquids");
+    registerModule(manager,
+                   &gmx_traj,
+                   "traj",
                    "Plot x, v, f, box, temperature and rotational energy from trajectories");
-    registerModule(manager, &gmx_tune_pme, "tune_pme",
+    registerModule(manager,
+                   &gmx_tune_pme,
+                   "tune_pme",
                    "Time mdrun as a function of PME ranks to optimize settings");
-    registerModule(manager, &gmx_vanhove, "vanhove",
+    registerModule(manager,
+                   &gmx_vanhove,
+                   "vanhove",
                    "Compute Van Hove displacement and correlation functions");
-    registerModule(manager, &gmx_velacc, "velacc",
-                   "Calculate velocity autocorrelation functions");
-    registerModule(manager, &gmx_wham, "wham",
+    registerModule(manager, &gmx_velacc, "velacc", "Calculate velocity autocorrelation functions");
+    registerModule(manager,
+                   &gmx_wham,
+                   "wham",
                    "Perform weighted histogram analysis after umbrella sampling");
-    registerModule(manager, &gmx_wheel, "wheel",
-                   "Plot helical wheels");
-    registerModuleNoNice(manager, &gmx_view, "view",
-                         "View a trajectory on an X-Windows terminal");
+    registerModule(manager, &gmx_wheel, "wheel", "Plot helical wheels");
+    registerModuleNoNice(manager, &gmx_view, "view", "View a trajectory on an X-Windows terminal");
 
     {
         gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Generating topologies and coordinates");
+                manager->addModuleGroup("Generating topologies and coordinates");
         group.addModuleWithDescription("editconf", "Edit the box and write subgroups");
         group.addModule("x2top");
         group.addModule("solvate");
@@ -371,28 +403,25 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("pdb2gmx");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Running a simulation");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Running a simulation");
         group.addModule("grompp");
         group.addModule("mdrun");
         group.addModule("convert-tpr");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Viewing trajectories");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Viewing trajectories");
         group.addModule("nmtraj");
         group.addModule("view");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Processing energies");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Processing energies");
         group.addModule("enemat");
         group.addModule("energy");
-        group.addModuleWithDescription("mdrun", "(Re)calculate energies for trajectory frames with -rerun");
+        group.addModuleWithDescription("mdrun",
+                                       "(Re)calculate energies for trajectory frames with -rerun");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Converting files");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Converting files");
         group.addModule("editconf");
         group.addModule("eneconv");
         group.addModule("sigeps");
@@ -401,13 +430,11 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("xpm2ps");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Tools");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Tools");
         group.addModule("analyze");
-        group.addModule("dyndom");
+        group.addModule("awh");
         group.addModule("filter");
         group.addModule("lie");
-        group.addModule("morph");
         group.addModule("pme_error");
         group.addModule("sham");
         group.addModule("spatial");
@@ -420,10 +447,10 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("mk_angndx");
         group.addModule("trjorder");
         group.addModule("xpm2ps");
+        group.addModule("report-methods");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Distances between structures");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Distances between structures");
         group.addModule("cluster");
         group.addModule("confrms");
         group.addModule("rms");
@@ -431,7 +458,7 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
     }
     {
         gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Distances in structures over time");
+                manager->addModuleGroup("Distances in structures over time");
         group.addModule("mindist");
         group.addModule("mdmat");
         group.addModule("polystat");
@@ -439,9 +466,8 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
     }
     {
         gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Mass distribution properties over time");
+                manager->addModuleGroup("Mass distribution properties over time");
         group.addModule("gyrate");
-        group.addModule("msd");
         group.addModule("polystat");
         group.addModule("rdf");
         group.addModule("rotacf");
@@ -453,14 +479,12 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
     }
     {
         gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Analyzing bonded interactions");
+                manager->addModuleGroup("Analyzing bonded interactions");
         group.addModule("angle");
         group.addModule("mk_angndx");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Structural properties");
-        group.addModule("anadock");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Structural properties");
         group.addModule("bundle");
         group.addModule("clustsize");
         group.addModule("disre");
@@ -473,8 +497,7 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("spol");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Kinetic properties");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Kinetic properties");
         group.addModule("bar");
         group.addModule("current");
         group.addModule("dos");
@@ -486,8 +509,7 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("velacc");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Electrostatic properties");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Electrostatic properties");
         group.addModule("current");
         group.addModule("dielectric");
         group.addModule("dipoles");
@@ -496,8 +518,7 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("genion");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Protein-specific analysis");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Protein-specific analysis");
         group.addModule("do_dssp");
         group.addModule("chi");
         group.addModule("helix");
@@ -506,8 +527,7 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("wheel");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Interfaces");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Interfaces");
         group.addModule("bundle");
         group.addModule("density");
         group.addModule("densmap");
@@ -518,20 +538,19 @@ void registerLegacyModules(gmx::CommandLineModuleManager *manager)
         group.addModule("potential");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Covariance analysis");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Covariance analysis");
         group.addModuleWithDescription("anaeig", "Analyze the eigenvectors");
         group.addModule("covar");
         group.addModule("make_edi");
     }
     {
-        gmx::CommandLineModuleGroup group =
-            manager->addModuleGroup("Normal modes");
+        gmx::CommandLineModuleGroup group = manager->addModuleGroup("Normal modes");
         group.addModuleWithDescription("anaeig", "Analyze the normal modes");
         group.addModule("nmeig");
         group.addModule("nmtraj");
         group.addModule("nmens");
         group.addModule("grompp");
-        group.addModuleWithDescription("mdrun", "Find a potential energy minimum and calculate the Hessian");
+        group.addModuleWithDescription("mdrun",
+                                       "Find a potential energy minimum and calculate the Hessian");
     }
 }