From ddddda0c96c49e3af336bdd743151688b809231c Mon Sep 17 00:00:00 2001 From: MengnanLi91 <118846840+MengnanLi91@users.noreply.github.com> Date: Fri, 12 Jan 2024 18:15:17 -0700 Subject: [PATCH 1/2] Clean up main.C and explicitly register dependent app #257 --- src/base/MoltresApp.C | 1 + src/main.C | 20 ++------------------ unit/src/main.C | 2 -- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/base/MoltresApp.C b/src/base/MoltresApp.C index 1f2b9656b0..d54d5e3882 100644 --- a/src/base/MoltresApp.C +++ b/src/base/MoltresApp.C @@ -43,6 +43,7 @@ void MoltresApp::registerApps() { registerApp(MoltresApp); + ModulesApp::registerApps(); } /************************************************************************************************** diff --git a/src/main.C b/src/main.C index fe9ceb0b2e..ca8abee91a 100644 --- a/src/main.C +++ b/src/main.C @@ -1,27 +1,11 @@ #include "MoltresApp.h" -#include "MooseInit.h" -#include "Moose.h" -#include "MooseApp.h" -#include "AppFactory.h" - -// Create a performance log -PerfLog Moose::perf_log("Moltres"); +#include "MooseMain.h" // Begin the main program. int main(int argc, char * argv[]) { - // Initialize MPI, solvers and MOOSE - MooseInit init(argc, argv); - - // Register this application's MooseApp and any it depends on - MoltresApp::registerApps(); - - // This creates dynamic memory that we're responsible for deleting - std::shared_ptr app = AppFactory::createAppShared("MoltresApp", argc, argv); - - // Execute the application - app->run(); + Moose::main(argc, argv); return 0; } diff --git a/unit/src/main.C b/unit/src/main.C index ea5804c221..4d1e2076b3 100644 --- a/unit/src/main.C +++ b/unit/src/main.C @@ -20,8 +20,6 @@ #include #include -PerfLog Moose::perf_log("gtest"); - GTEST_API_ int main(int argc, char ** argv) { From e93da243b1f39d7c0b54b533e53d5a1b42397c84 Mon Sep 17 00:00:00 2001 From: MengnanLi91 <118846840+MengnanLi91@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:10:53 -0700 Subject: [PATCH 2/2] Update moose submodule to latest --- moose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moose b/moose index ad48d3922a..e9f5f109e6 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit ad48d3922ad92b90bc809a35310db6a9b8e67ad5 +Subproject commit e9f5f109e610453316f89158ccedd8f0f4747199