Skip to content

Commit

Permalink
Merge pull request #257 from MengnanLi91/main_update_patch
Browse files Browse the repository at this point in the history
Clean up main.C and explicitly register dependent app
  • Loading branch information
smpark7 authored Jan 17, 2024
2 parents 6f75bab + e93da24 commit e5c7bd9
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 21 deletions.
2 changes: 1 addition & 1 deletion moose
Submodule moose updated 2018 files
1 change: 1 addition & 0 deletions src/base/MoltresApp.C
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ void
MoltresApp::registerApps()
{
registerApp(MoltresApp);
ModulesApp::registerApps();
}

/**************************************************************************************************
Expand Down
20 changes: 2 additions & 18 deletions src/main.C
Original file line number Diff line number Diff line change
@@ -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<MooseApp> app = AppFactory::createAppShared("MoltresApp", argc, argv);

// Execute the application
app->run();
Moose::main<MoltresApp>(argc, argv);

return 0;
}
2 changes: 0 additions & 2 deletions unit/src/main.C
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#include <fstream>
#include <string>

PerfLog Moose::perf_log("gtest");

GTEST_API_ int
main(int argc, char ** argv)
{
Expand Down

0 comments on commit e5c7bd9

Please sign in to comment.